|
@@ -79,7 +79,7 @@ synced and their revisions won't be found.
|
|
|
metavar='<FORMAT>',
|
|
metavar='<FORMAT>',
|
|
|
help='print the log using a custom git pretty format string')
|
|
help='print the log using a custom git pretty format string')
|
|
|
|
|
|
|
|
- def _printRawDiff(self, diff):
|
|
|
|
|
|
|
+ def _printRawDiff(self, diff, pretty_format=None):
|
|
|
for project in diff['added']:
|
|
for project in diff['added']:
|
|
|
self.printText("A %s %s" % (project.relpath, project.revisionExpr))
|
|
self.printText("A %s %s" % (project.relpath, project.revisionExpr))
|
|
|
self.out.nl()
|
|
self.out.nl()
|
|
@@ -92,7 +92,7 @@ synced and their revisions won't be found.
|
|
|
self.printText("C %s %s %s" % (project.relpath, project.revisionExpr,
|
|
self.printText("C %s %s %s" % (project.relpath, project.revisionExpr,
|
|
|
otherProject.revisionExpr))
|
|
otherProject.revisionExpr))
|
|
|
self.out.nl()
|
|
self.out.nl()
|
|
|
- self._printLogs(project, otherProject, raw=True, color=False)
|
|
|
|
|
|
|
+ self._printLogs(project, otherProject, raw=True, color=False, pretty_format=pretty_format)
|
|
|
|
|
|
|
|
for project, otherProject in diff['unreachable']:
|
|
for project, otherProject in diff['unreachable']:
|
|
|
self.printText("U %s %s %s" % (project.relpath, project.revisionExpr,
|
|
self.printText("U %s %s %s" % (project.relpath, project.revisionExpr,
|
|
@@ -203,6 +203,6 @@ synced and their revisions won't be found.
|
|
|
|
|
|
|
|
diff = manifest1.projectsDiff(manifest2)
|
|
diff = manifest1.projectsDiff(manifest2)
|
|
|
if opt.raw:
|
|
if opt.raw:
|
|
|
- self._printRawDiff(diff)
|
|
|
|
|
|
|
+ self._printRawDiff(diff, pretty_format=opt.pretty_format)
|
|
|
else:
|
|
else:
|
|
|
self._printDiff(diff, color=opt.color, pretty_format=opt.pretty_format)
|
|
self._printDiff(diff, color=opt.color, pretty_format=opt.pretty_format)
|