From d061110d887fbfaa15e2a6d47543ac96a0be2b6c Mon Sep 17 00:00:00 2001 From: Christian Lawson-Perfect Date: Tue, 18 Mar 2025 15:52:52 +0000 Subject: [PATCH] fix init_jj; add force argument --- thinks/jujutsu.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/thinks/jujutsu.py b/thinks/jujutsu.py index 418a760..bc2eb98 100644 --- a/thinks/jujutsu.py +++ b/thinks/jujutsu.py @@ -26,14 +26,19 @@ class JJController: ) return res - def init_jj(self): + def init_jj(self, force=False): print("Init jj") - if not (self.root / '.jj').exists(): + res = self.run(['jj','git','remote','list']) + if force or not (self.root / '.jj').exists(): self.run(['jj','git','init']) self.ignore_paths(['.make.*']) git_url = settings.GIT_REPO_URL_TEMPLATE.format(name=self.think.slug) self.run(['jj','git','remote','add','origin', git_url]) + def clean_paths(self, paths): + paths = [self.root / p for p in paths] + return [str(p.relative_to(self.root)) for p in paths if p.is_relative_to(self.root)] + @ensure_jj def ignore_paths(self, paths): paths = self.clean_paths(paths)