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