Patchwork [6,of,6] rebase: show a note for updated mq patches

login
register
mail settings
Submitter Mads Kiilerich
Date Dec. 10, 2014, 5:20 a.m.
Message ID <de143427c499c570d1e9.1418188847@localhost.localdomain>
Download mbox | patch
Permalink /patch/7038/
State Accepted
Commit de143427c499c570d1e996c45b088d2a392296f6
Headers show

Comments

Mads Kiilerich - Dec. 10, 2014, 5:20 a.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1349990522 -7200
#      Thu Oct 11 23:22:02 2012 +0200
# Node ID de143427c499c570d1e996c45b088d2a392296f6
# Parent  8872d1bf30da3bfd16e828709c8d44901b158030
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.
Matt Mackall - Dec. 10, 2014, 8:45 p.m.
On Wed, 2014-12-10 at 06:20 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <mads@kiilerich.com>
> # Date 1349990522 -7200
> #      Thu Oct 11 23:22:02 2012 +0200
> # Node ID de143427c499c570d1e996c45b088d2a392296f6
> # Parent  8872d1bf30da3bfd16e828709c8d44901b158030
> rebase: show a note for updated mq patches

These are queued for default, thanks.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -713,7 +713,8 @@  def updatemq(repo, state, skipped, **opt
         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:
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -49,11 +49,30 @@  already has one local mq patch
 
   $ 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