x/git-upstream
Code Issues Proposed changes

Include node 'name' in commit subject

Browse Source 
Failed test git log graphs are easier to follow when they include the
node 'name' in the commit subject.

Change-Id: I049651847300e5ee65340d1cd26307fd9129f05a
This commit is contained in:
Darragh Bailey
2015-12-17 17:31:14 +00:00
parent 0414e5fef5
commit dcffac3a9c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
git_upstream/tests/base.py
View File

@@ -141,15 +141,18 @@ class GitRepo(fixtures.Fixture):
tmpfile.close() tmpfile.close()
return tmpfile.name return tmpfile.name
def _create_file_commit(self, change_id=None): def _create_file_commit(self, change_id=None, message_prefix=None):
filename = self._create_file() filename = self._create_file()
self.repo.git.add(filename) self.repo.git.add(filename)
message = "Adding %s" % os.path.basename(filename) message = "Adding %s" % os.path.basename(filename)
if message_prefix:
message = "%s %s" % (message_prefix, message)
if change_id: if change_id:
message = message + "\n\nChange-Id: %s" % change_id message = message + "\n\nChange-Id: %s" % change_id
self.repo.git.commit(m=message) self.repo.git.commit(m=message)
def add_commits(self, num=1, ref="HEAD", change_ids=[]): def add_commits(self, num=1, ref="HEAD", change_ids=[],
message_prefix=None):
"""Create the given number of commits using generated files""" """Create the given number of commits using generated files"""
if ref != "HEAD": if ref != "HEAD":
self.repo.git.checkout(ref) self.repo.git.checkout(ref)
@@ -158,7 +161,7 @@ class GitRepo(fixtures.Fixture):
ids = list(change_ids) + [None] * (num - len(change_ids)) ids = list(change_ids) + [None] * (num - len(change_ids))
for x in range(num): for x in range(num):
self._create_file_commit(ids[x]) self._create_file_commit(ids[x], message_prefix=message_prefix)
class BaseTestCase(testtools.TestCase): class BaseTestCase(testtools.TestCase):
@@ -190,7 +193,8 @@ class BaseTestCase(testtools.TestCase):
self.git.cherry_pick(self._graph[p_node]) self.git.cherry_pick(self._graph[p_node])
else: else:
# standard commit # standard commit
self.testrepo.add_commits(1, ref="HEAD") self.testrepo.add_commits(1, ref="HEAD",
message_prefix="[%s]" % node)
def _merge_commit(self, node, parents): def _merge_commit(self, node, parents):
# merge commits # merge commits
@@ -265,7 +269,8 @@ class BaseTestCase(testtools.TestCase):
self.git.symbolic_ref("HEAD", "refs/heads/%s" % node) self.git.symbolic_ref("HEAD", "refs/heads/%s" % node)
self.git.rm(".", r=True, cached=True) self.git.rm(".", r=True, cached=True)
self.git.clean(f=True, d=True, x=True) self.git.clean(f=True, d=True, x=True)
self.testrepo.add_commits(1, ref="HEAD") self.testrepo.add_commits(1, ref="HEAD",
message_prefix="[%s]" % node)
# only explicitly listed branches should exist afterwards # only explicitly listed branches should exist afterwards
self.git.checkout(self.repo.commit()) self.git.checkout(self.repo.commit())
self.git.branch(node, D=True) self.git.branch(node, D=True)