git-p4: fix error handling in P4Unshelve.renameBranch()
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>
Moritz Baumann committed
Jul 20, 2022 at 18:55 UTC
198551ca54f6ff1c95c9357ccca9ae37298811bf
1 file changed
+2
-5
git-p4.py
+2
-5
@@ -4369,19 +4369,16 @@ class P4Unshelve(Command):
4369
def renameBranch(self, branch_name):
4370
"""Rename the existing branch to branch_name.N ."""
4371
4372
- found = True
4372
for i in range(0, 1000):
4373
backup_branch_name = "{0}.{1}".format(branch_name, i)
4374
if not gitBranchExists(backup_branch_name):
4375
# Copy ref to backup
4376
gitUpdateRef(backup_branch_name, branch_name)
4377
gitDeleteRef(branch_name)
4379
- found = True
4378
print("renamed old unshelve branch to {0}".format(backup_branch_name))
4379
break
4382
-
4383
- if not found:
4384
- sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
4380
+ else:
4381
+ sys.exit("gave up trying to rename existing branch {0}".format(branch_name))
4382
4383
def findLastP4Revision(self, starting_point):
4384
"""Look back from starting_point for the first commit created by git-p4