From 7ecccf6225586b4215aec098ca3372559593c98f Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 29 Mar 2016 14:11:20 +0200 Subject: diffmanifests: support custom git pretty format strings Change-Id: I29f4f1351c421f393328514d145df1a96aed9ee2 --- project.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'project.py') diff --git a/project.py b/project.py index e0bd9c10..1e1a10ae 100644 --- a/project.py +++ b/project.py @@ -2437,7 +2437,7 @@ class Project(object): def _allrefs(self): return self.bare_ref.all - def _getLogs(self, rev1, rev2, oneline=False, color=True): + def _getLogs(self, rev1, rev2, oneline=False, color=True, pretty_format=None): """Get logs between two revisions of this project.""" comp = '..' if rev1: @@ -2448,6 +2448,8 @@ class Project(object): out = DiffColoring(self.config) if out.is_on and color: cmd.append('--color') + if pretty_format is not None: + cmd.append('--pretty=format:%s' % pretty_format) if oneline: cmd.append('--oneline') @@ -2464,14 +2466,17 @@ class Project(object): raise return None - def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True): + def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True, + pretty_format=None): """Get the list of logs from this revision to given revisionId""" logs = {} selfId = self.GetRevisionId(self._allrefs) toId = toProject.GetRevisionId(toProject._allrefs) - logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color) - logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color) + logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color, + pretty_format=pretty_format) + logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color, + pretty_format=pretty_format) return logs class _GitGetByExec(object): -- cgit v1.2.3-54-g00ecf