rebase: show a note for updated mq patches
authorMads Kiilerich <mads@kiilerich.com>
Thu, 11 Oct 2012 23:22:02 +0200
changeset 23520 de143427c499
parent 23519 8872d1bf30da
child 23521 f5de2a82b77e
rebase: show a note for updated mq patches It deserves more than a debug message. Show a note like: updating mq patch p0.patch to 5:9ecc820b1737 The message could also refer to "qrefresh" instead. Same same.
hgext/rebase.py
tests/test-rebase-mq-skip.t
--- a/hgext/rebase.py	Wed Dec 10 06:20:35 2014 +0100
+++ b/hgext/rebase.py	Thu Oct 11 23:22:02 2012 +0200
@@ -713,7 +713,8 @@
         for rev in sorted(mqrebase, reverse=True):
             if rev not in skipped:
                 name, isgit = mqrebase[rev]
-                repo.ui.debug('import mq patch %d (%s)\n' % (state[rev], name))
+                repo.ui.note(_('updating mq patch %s to %s:%s\n') %
+                             (name, state[rev], repo[state[rev]]))
                 mq.qimport(repo, (), patchname=name, git=isgit,
                                 rev=[str(state[rev])])
             else:
--- a/tests/test-rebase-mq-skip.t	Wed Dec 10 06:20:35 2014 +0100
+++ b/tests/test-rebase-mq-skip.t	Thu Oct 11 23:22:02 2012 +0200
@@ -49,11 +49,30 @@
 
   $ hg up -q -C qtip
 
-  $ hg rebase
+  $ hg rebase -v
   rebasing 2:13a46ce44f60 "P0" (p0.patch qbase)
+  resolving manifests
+  removing p0
+  getting r1
+  resolving manifests
+  getting p0
+  p0
   rebasing 3:148775c71080 "P1" (p1.patch qtip)
+  resolving manifests
   note: rebase of 3:148775c71080 created no changes to commit
+  rebase merging completed
+  updating mq patch p0.patch to 5:9ecc820b1737
+  $TESTTMP/a/.hg/patches/p0.patch
+  2 changesets found
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob)
+  2 changesets found
+  adding branch
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files
+  rebase completed
+  1 revisions have been skipped
 
   $ hg tglog
   @  3: 'P0' tags: p0.patch qbase qtip tip