fix init_jj; add force argument
This commit is contained in:
parent
fed63118d0
commit
d061110d88
1 changed files with 7 additions and 2 deletions
|
@ -26,14 +26,19 @@ class JJController:
|
||||||
)
|
)
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def init_jj(self):
|
def init_jj(self, force=False):
|
||||||
print("Init jj")
|
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.run(['jj','git','init'])
|
||||||
self.ignore_paths(['.make.*'])
|
self.ignore_paths(['.make.*'])
|
||||||
git_url = settings.GIT_REPO_URL_TEMPLATE.format(name=self.think.slug)
|
git_url = settings.GIT_REPO_URL_TEMPLATE.format(name=self.think.slug)
|
||||||
self.run(['jj','git','remote','add','origin', git_url])
|
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
|
@ensure_jj
|
||||||
def ignore_paths(self, paths):
|
def ignore_paths(self, paths):
|
||||||
paths = self.clean_paths(paths)
|
paths = self.clean_paths(paths)
|
||||||
|
|
Loading…
Reference in a new issue