|
|
@ -178,8 +178,8 @@ class Git:
|
|
|
|
'has_branch': ["log","-n1","remotes/origin/%s"%branch],
|
|
|
|
'has_branch': ["log","-n1","remotes/origin/%s"%branch],
|
|
|
|
# получить ревизию из revs тэгов
|
|
|
|
# получить ревизию из revs тэгов
|
|
|
|
'get_rev_tag': ["fetch","--depth=1","origin",
|
|
|
|
'get_rev_tag': ["fetch","--depth=1","origin",
|
|
|
|
"+refs/heads/*:refs/remotes/origin/*",
|
|
|
|
"+refs/revs/%s:refs/remotes/origin/%s"%
|
|
|
|
"+refs/revs/%s"%revision],
|
|
|
|
(revision,branch)],
|
|
|
|
# переключиться на указанную ревизию указанной веткой
|
|
|
|
# переключиться на указанную ревизию указанной веткой
|
|
|
|
'checkout_revision': ["checkout","-b",branch,revision],
|
|
|
|
'checkout_revision': ["checkout","-b",branch,revision],
|
|
|
|
# переключить на указанную ветку
|
|
|
|
# переключить на указанную ветку
|
|
|
@ -359,9 +359,6 @@ class Git:
|
|
|
|
git_clean = process(self._git,"--git-dir",git_dir,"--work-tree",rpath,
|
|
|
|
git_clean = process(self._git,"--git-dir",git_dir,"--work-tree",rpath,
|
|
|
|
"clean","-fd",stderr=STDOUT)
|
|
|
|
"clean","-fd",stderr=STDOUT)
|
|
|
|
if git_reset.failed() or git_clean.failed():
|
|
|
|
if git_reset.failed() or git_clean.failed():
|
|
|
|
print "ERROR:"
|
|
|
|
|
|
|
|
print git_reset.read()
|
|
|
|
|
|
|
|
print git_clean.read()
|
|
|
|
|
|
|
|
raise GitError(_("Failed to clean {rpath} repository").format(
|
|
|
|
raise GitError(_("Failed to clean {rpath} repository").format(
|
|
|
|
rpath=rpath))
|
|
|
|
rpath=rpath))
|
|
|
|
|
|
|
|
|
|
|
|