Mercurial > hg > evolve

changeset 1142:296d48e1f55a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: gather evolve output together We stop relying on ui.status being muted when --quiet is used. Instead we use plain write and hide this behind an explicite ui.quiet check. This will help use enforcing this output in the comming --confirm mode.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 08 Aug 2014 23:11:09 -0700
parents b346d7a3d89e
children d830377bf186
files hgext/evolve.py
diffstat 1 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1363,9 +1363,9 @@
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
     target = repo[target]
     if not ui.quiet:
-        repo.ui.status(_('move:'))
+        repo.ui.write(_('move:'))
         displayer.show(orig)
-        repo.ui.status(_('atop:'))
+        repo.ui.write(_('atop:'))
         displayer.show(target)
     if progresscb: progresscb()
     todo = 'hg rebase -r %s -d %s\n' % (orig, target)
@@ -1396,11 +1396,10 @@
                          ' %s being a merge' % prec)
 
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
-    repo.ui.status(_('recreate:'))
     if not ui.quiet:
+        repo.ui.write(_('recreate:'))
         displayer.show(bumped)
-    repo.ui.status(_('atop:'))
-    if not ui.quiet:
+        repo.ui.write(_('atop:'))
         displayer.show(prec)
     if dryrun:
         todo = 'hg rebase --rev %s --dest %s;\n' % (bumped, prec.p1())
@@ -1517,14 +1516,12 @@
                               % {'d': divergent, 'o': other})
 
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
-    ui.status(_('merge:'))
     if not ui.quiet:
+        ui.write(_('merge:'))
         displayer.show(divergent)
-    ui.status(_('with: '))
-    if not ui.quiet:
+        ui.write(_('with: '))
         displayer.show(other)
-    ui.status(_('base: '))
-    if not ui.quiet:
+        ui.write(_('base: '))
         displayer.show(base)
     if dryrun:
         ui.write('hg update -c %s &&\n' % divergent)