diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -2437,7 +2437,7 @@ class Project(object): | |||
2437 | def _allrefs(self): | 2437 | def _allrefs(self): |
2438 | return self.bare_ref.all | 2438 | return self.bare_ref.all |
2439 | 2439 | ||
2440 | def _getLogs(self, rev1, rev2, oneline=False, color=True): | 2440 | def _getLogs(self, rev1, rev2, oneline=False, color=True, pretty_format=None): |
2441 | """Get logs between two revisions of this project.""" | 2441 | """Get logs between two revisions of this project.""" |
2442 | comp = '..' | 2442 | comp = '..' |
2443 | if rev1: | 2443 | if rev1: |
@@ -2448,6 +2448,8 @@ class Project(object): | |||
2448 | out = DiffColoring(self.config) | 2448 | out = DiffColoring(self.config) |
2449 | if out.is_on and color: | 2449 | if out.is_on and color: |
2450 | cmd.append('--color') | 2450 | cmd.append('--color') |
2451 | if pretty_format is not None: | ||
2452 | cmd.append('--pretty=format:%s' % pretty_format) | ||
2451 | if oneline: | 2453 | if oneline: |
2452 | cmd.append('--oneline') | 2454 | cmd.append('--oneline') |
2453 | 2455 | ||
@@ -2464,14 +2466,17 @@ class Project(object): | |||
2464 | raise | 2466 | raise |
2465 | return None | 2467 | return None |
2466 | 2468 | ||
2467 | def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True): | 2469 | def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True, |
2470 | pretty_format=None): | ||
2468 | """Get the list of logs from this revision to given revisionId""" | 2471 | """Get the list of logs from this revision to given revisionId""" |
2469 | logs = {} | 2472 | logs = {} |
2470 | selfId = self.GetRevisionId(self._allrefs) | 2473 | selfId = self.GetRevisionId(self._allrefs) |
2471 | toId = toProject.GetRevisionId(toProject._allrefs) | 2474 | toId = toProject.GetRevisionId(toProject._allrefs) |
2472 | 2475 | ||
2473 | logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color) | 2476 | logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color, |
2474 | logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color) | 2477 | pretty_format=pretty_format) |
2478 | logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color, | ||
2479 | pretty_format=pretty_format) | ||
2475 | return logs | 2480 | return logs |
2476 | 2481 | ||
2477 | class _GitGetByExec(object): | 2482 | class _GitGetByExec(object): |