Patchwork [04,of,11] rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr

login
register
mail settings
Submitter Mads Kiilerich
Date Feb. 20, 2014, 1:43 a.m.
Message ID <bdf3a193f125c39b99a2.1392860608@localhost.localdomain>
Download mbox | patch
Permalink /patch/3710/
State Accepted
Commit 5936058f6bada78917d4bcd2d42523e0cfa37077
Headers show

Comments

Mads Kiilerich - Feb. 20, 2014, 1:43 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1392423792 -3600
#      Sat Feb 15 01:23:12 2014 +0100
# Node ID bdf3a193f125c39b99a27e2063e75ee797f3327b
# Parent  ac4cb3f845bcc36e783e557a533c309e3828355c
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr

The debug statement is already in a 'for root in roots' so it was probably the
intention to show root instead of roots. Do that.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -790,7 +790,7 @@  def buildstate(repo, dest, rebaseset, co
                 repo.ui.debug('source is a child of destination\n')
                 return None
 
-        repo.ui.debug('rebase onto %d starting from %s\n' % (dest, roots))
+        repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root))
         state.update(dict.fromkeys(rebaseset, nullrev))
         # Rebase tries to turn <dest> into a parent of <root> while
         # preserving the number of parents of rebased changesets:
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -210,7 +210,7 @@  Check that the right ancestors is used w
      summary:     added default.txt
   
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
-  rebase onto 2 starting from [<changectx e31216eec445>]
+  rebase onto 2 starting from e31216eec445
   rebasing: 9:e31216eec445 5/6 changesets (83.33%)
    future parents are 2 and -1
   rebase status stored