Patchwork D25: rebase: remove messages for nullmerge and revignored (BC)

login
register
mail settings
Submitter phabricator
Date Aug. 16, 2017, 6:08 a.m.
Message ID <8df69b201d594f0d8c9812ba8dba8716@localhost.localdomain>
Download mbox | patch
Permalink /patch/23076/
State Not Applicable
Headers show

Comments

phabricator - Aug. 16, 2017, 6:08 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG437e317d7913: rebase: remove messages for nullmerge and revignored (BC) (authored by quark).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D25?vs=896&id=977

REVISION DETAIL
  https://phab.mercurial-scm.org/D25

AFFECTED FILES
  hgext/rebase.py
  tests/test-rebase-conflicts.t
  tests/test-rebase-obsolete.t
  tests/test-rebase-partial.t

CHANGE DETAILS




To: quark, durin42, #hg-reviewers, martinvonz
Cc: durin42, mercurial-devel

Patch

diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t
--- a/tests/test-rebase-partial.t
+++ b/tests/test-rebase-partial.t
@@ -81,7 +81,6 @@ 
   > A
   > EOF
   already rebased 1:112478962961 "B" (B)
-  not rebasing ignored 2:26805aba1e60 "C" (C)
   rebasing 3:f585351a92f8 "D" (D tip)
   o  4: D
   |
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -450,7 +450,6 @@ 
   $ hg rebase --dest 4 --rev '7+11+9'
   rebasing 9:cf44d2f5a9f4 "D"
   rebasing 7:02de42196ebe "H"
-  not rebasing ignored 10:7c6027df6a99 "B"
   rebasing 11:0d8f238b634c "C" (tip)
   $ hg log -G
   o  14:1e8370e38cca C
@@ -491,8 +490,6 @@ 
   $ hg rebase -d G -r 'B + D + F'
   rebasing 1:112478962961 "B" (B)
   rebasing 2:b18e25de2cf5 "D" (D)
-  not rebasing ignored 4:26805aba1e60 "C" (C)
-  not rebasing ignored 5:4b61ff5c62e2 "E" (E)
   rebasing 6:f15c3adaf214 "F" (F tip)
   abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
   [255]
@@ -546,7 +543,6 @@ 
   $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
   rebasing 3:32af7686d403 "D"
   rebasing 7:02de42196ebe "H"
-  not rebasing ignored 8:53a6a128b2b7 "M"
   rebasing 9:4bde274eefcf "I" (tip)
   $ hg log -G
   @  12:acd174b7ab39 I
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
@@ -235,10 +235,6 @@ 
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
   rebase onto 4bc80088dc6b starting from e31216eec445
   rebase status stored
-  ignoring null merge rebase of 3
-  ignoring null merge rebase of 4
-  ignoring null merge rebase of 6
-  ignoring null merge rebase of 8
   rebasing 9:e31216eec445 "more changes to f1"
    future parents are 2 and -1
   rebase status stored
@@ -413,7 +409,6 @@ 
   continue: hg rebase --continue
   $ hg rebase --continue --config experimental.stabilization=none
   rebasing 1:112478962961 "B" (B)
-  not rebasing ignored 2:26805aba1e60 "C" (C)
   rebasing 3:f585351a92f8 "D" (D)
   warning: orphaned descendants detected, not stripping 112478962961
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -440,9 +440,9 @@ 
                     self.state[rev] = p1
                     ui.debug('next revision set to %s\n' % p1)
             elif self.state[rev] == nullmerge:
-                ui.debug('ignoring null merge rebase of %s\n' % rev)
+                pass
             elif self.state[rev] == revignored:
-                ui.status(_('not rebasing ignored %s\n') % desc)
+                pass
             else:
                 ui.status(_('already rebased %s as %s\n') %
                           (desc, repo[self.state[rev]]))