undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mb/p4-fixes'

Browse Source 
Fix a few issues in "git p4".

* mb/p4-fixes:
  git-p4: fix error handling in P4Unshelve.renameBranch()
  git-p4: fix typo in P4Submit.applyCommit()
This commit is contained in:
Junio C Hamano 2022-07-27 09:16:54 -07:00
commit 04e340b29b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-p4.py
View File

@ -2226,7 +2226,7 @@ class P4Submit(Command, P4UserMap):
raw=True): raw=True):
if regexp.search(line): if regexp.search(line):
if verbose: if verbose:
print("got keyword match on %s in %s in %s" % (regex.pattern, line, file)) print("got keyword match on %s in %s in %s" % (regexp.pattern, line, file))
kwfiles[file] = regexp kwfiles[file] = regexp
break break
@ -4369,19 +4369,16 @@ class P4Unshelve(Command):
def renameBranch(self, branch_name): def renameBranch(self, branch_name):
"""Rename the existing branch to branch_name.N .""" """Rename the existing branch to branch_name.N ."""
found = True
for i in range(0, 1000): for i in range(0, 1000):
backup_branch_name = "{0}.{1}".format(branch_name, i) backup_branch_name = "{0}.{1}".format(branch_name, i)
if not gitBranchExists(backup_branch_name): if not gitBranchExists(backup_branch_name):
# Copy ref to backup # Copy ref to backup
gitUpdateRef(backup_branch_name, branch_name) gitUpdateRef(backup_branch_name, branch_name)
gitDeleteRef(branch_name) gitDeleteRef(branch_name)
found = True
print("renamed old unshelve branch to {0}".format(backup_branch_name)) print("renamed old unshelve branch to {0}".format(backup_branch_name))
break break
else:
if not found: sys.exit("gave up trying to rename existing branch {0}".format(branch_name))
sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
def findLastP4Revision(self, starting_point): def findLastP4Revision(self, starting_point):
"""Look back from starting_point for the first commit created by git-p4 """Look back from starting_point for the first commit created by git-p4