rebase: add basic coloring output
This uses coloring style like we use in grep/forall already.
Change-Id: I317e2e47567a30c513083c48e7c7c40b091bb29a
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/238555
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 346eb9c..dcb8b2a 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -17,9 +17,18 @@
from __future__ import print_function
import sys
+from color import Coloring
from command import Command
from git_command import GitCommand
+
+class RebaseColoring(Coloring):
+ def __init__(self, config):
+ Coloring.__init__(self, config, 'rebase')
+ self.project = self.printer('project', attr='bold')
+ self.fail = self.printer('fail', fg='red')
+
+
class Rebase(Command):
common = True
helpSummary = "Rebase local branches on upstream branch"
@@ -91,6 +100,10 @@
if opt.interactive:
common_args.append('-i')
+ config = self.manifest.manifestProject.config
+ out = RebaseColoring(config)
+ out.redirect(sys.stdout)
+
ret = 0
for project in all_projects:
if ret and opt.fail_fast:
@@ -121,8 +134,10 @@
args.append(upbranch.LocalMerge)
- print('# %s: rebasing %s -> %s'
- % (project.relpath, cb, upbranch.LocalMerge), file=sys.stderr)
+ out.project('project %s: rebasing %s -> %s',
+ project.relpath, cb, upbranch.LocalMerge)
+ out.nl()
+ out.flush()
needs_stash = False
if opt.auto_stash:
@@ -148,5 +163,7 @@
ret += 1
if ret:
- print('error: %i projects had errors' % (ret,), file=sys.stderr)
+ out.fail('%i projects had errors', ret)
+ out.nl()
+
return ret
