opendev/gerrit
Code Issues Proposed changes

TrivialRebase: Correctly handle empty patch-id

Browse Source 
If only one of the patch-ids is empty, it should not be
considered a trivial rebase

Change-Id: Ie5196bc81d4d3bcdd16572ade265f96c086fabed
This commit is contained in:
Orgad Shaneh
2013-04-11 13:41:20 +03:00
parent eecfa12b27
commit f18e1e0d2f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/trivial_rebase.py
View File

@@ -152,7 +152,8 @@ class TrivialRebase:
git_show_process = subprocess.Popen(git_show_cmd, stdout=subprocess.PIPE) git_show_process = subprocess.Popen(git_show_cmd, stdout=subprocess.PIPE)
patch_id_process = subprocess.Popen(patch_id_cmd, stdout=subprocess.PIPE, patch_id_process = subprocess.Popen(patch_id_cmd, stdout=subprocess.PIPE,
stdin=git_show_process.stdout) stdin=git_show_process.stdout)
return patch_id_process.communicate()[0] res = patch_id_process.communicate()[0] or '0'
return res.split()[0]
def SuExec(self, as_user, cmd): def SuExec(self, as_user, cmd):
suexec_cmd = [self.ssh, '-l', "Gerrit Code Review", self.ssh_port_flag, self.port, self.server] suexec_cmd = [self.ssh, '-l', "Gerrit Code Review", self.ssh_port_flag, self.port, self.server]
@@ -180,14 +181,10 @@ class TrivialRebase:
assert prev_revision, "Previous revision not found" assert prev_revision, "Previous revision not found"
prev_patch_id = self.GetPatchId(prev_revision) prev_patch_id = self.GetPatchId(prev_revision)
cur_patch_id = self.GetPatchId(self.commit) cur_patch_id = self.GetPatchId(self.commit)
if not (prev_patch_id and cur_patch_id): if prev_patch_id == '0' and cur_patch_id == '0':
# Merge commit print "commits %s and %s are both empty or merge commits" % (prev_revision, self.commit)
if not prev_patch_id:
print "GetPatchId failed for commit %s" % (prev_revision)
if not cur_patch_id:
print "GetPatchId failed for commit %s" % (self.commit)
return return
if cur_patch_id.split()[0] != prev_patch_id.split()[0]: if cur_patch_id != prev_patch_id:
# patch-ids don't match # patch-ids don't match
return return
# Patch ids match. This is a trivial rebase. # Patch ids match. This is a trivial rebase.