commit 7ecccf6225586b4215aec098ca3372559593c98f
author Sebastian Schuberth <sschuberth@gmail.com> Tue Mar 29 14:11:20 2016 +0200
committer Sebastian Schuberth <sschuberth@gmail.com> Thu Apr 21 18:36:11 2016 +0000
tree 377e571c9efb4513c7c3cac0e6f47c1993cbf54e
parent cee5c771664833e517f47c0a33e520fd967cbe57

diffmanifests: support custom git pretty format strings

Change-Id: I29f4f1351c421f393328514d145df1a96aed9ee2

project.py

diff --git a/project.py b/project.py
index e0bd9c1..1e1a10a 100644
--- a/project.py
+++ b/project.py
@@ -2437,7 +2437,7 @@
   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 @@
       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 @@
           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):