[Reviewers] [Differential] [Request, 12 lines] D25: rebase: remove messages for nullmerge and revignored (BC)

[quark (Jun Wu)]

quark created this revision.
Herald added a subscriber: reviewers.

REVISION SUMMARY
  These states will be removed to make the code cleaner and more robust.
  Remove their messages first to make review easier.

REPOSITORY
  rHG Mercurial

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

Index: tests/test-rebase-partial.t
===================================================================
--- tests/test-rebase-partial.t
+++ 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
   |
Index: tests/test-rebase-obsolete.t
===================================================================
--- tests/test-rebase-obsolete.t
+++ tests/test-rebase-obsolete.t
@@ -449,7 +449,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
@@ -519,7 +518,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
Index: tests/test-rebase-conflicts.t
===================================================================
--- tests/test-rebase-conflicts.t
+++ tests/test-rebase-conflicts.t
@@ -220,10 +220,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
@@ -398,7 +394,6 @@
   continue: hg rebase --continue
   $ hg rebase --continue --config experimental.evolution=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)
Index: hgext/rebase.py
===================================================================
--- hgext/rebase.py
+++ 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]]))


EMAIL PREFERENCES
  https://phab.mercurial-scm.org/settings/panel/emailpreferences/

To: quark
Cc: reviewers