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

git-p4: fix error handling in P4Unshelve.renameBranch()

Browse Source 
The error handling code path is meant to be triggered when the loop does
not exit early via "break". This fails, as the boolean variable "found",
which is used to track whether the loop was exited early, is initialized
incorrectly.

It would be possible to fix this issue by correcting the initialization,
but Python supports a for:-else: control flow construct for this exact
use case (executing code if a loop does not exit early), so it is more
idiomatic to remove the tracking variable entirely.

In addition, the error message no longer refers to a variable that does
not exist.

Signed-off-by: Moritz Baumann <moritz.baumann@sap.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Moritz Baumann 2022-07-20 18:55:30 +00:00 committed by Junio C Hamano
parent c0d2b07460
commit 198551ca54
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-p4.py
View File

@ -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