From patchwork Sun Jul 9 19:14:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5,of,6] rebase: remove messages for nullmerge and revignored (BC) From: Jun Wu X-Patchwork-Id: 22178 Message-Id: <49d1672e7567f2a16c5c.1499627692@x1c> To: Date: Sun, 9 Jul 2017 12:14:52 -0700 # HG changeset patch # User Jun Wu # Date 1499571514 25200 # Sat Jul 08 20:38:34 2017 -0700 # Node ID 49d1672e7567f2a16c5ce9afa64babe08891718f # Parent e633aabf34125ef5d5453c211cee7e63654346d2 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.org/quark-zju/hg-draft -r 49d1672e7567 rebase: remove messages for nullmerge and revignored (BC) These states will be removed to make the code cleaner and more robust. Remove their messages first to make review easier. diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -441,7 +441,7 @@ class rebaseruntime(object): 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') % 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 @@ -221,8 +221,4 @@ Check that the right ancestors is used w 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 @@ -399,5 +395,4 @@ Test rebase with obsstore turned on and $ 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 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,5 +450,4 @@ Test multiple root handling rebasing 9:cf44d2f5a9f4 "D" rebasing 7:02de42196ebe "H" - not rebasing ignored 10:7c6027df6a99 "B" rebasing 11:0d8f238b634c "C" (tip) $ hg log -G @@ -520,5 +519,4 @@ test on rebase dropping a merge rebasing 3:32af7686d403 "D" rebasing 7:02de42196ebe "H" - not rebasing ignored 8:53a6a128b2b7 "M" rebasing 9:4bde274eefcf "I" (tip) $ hg log -G 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 @@ -82,5 +82,4 @@ the hole (B below), not on top of the de > EOF already rebased 1:112478962961 "B" (B) - not rebasing ignored 2:26805aba1e60 "C" (C) rebasing 3:f585351a92f8 "D" (D tip) o 4: D