This is an archive of the discontinued Mercurial Phabricator instance.

Differential D25

rebase: remove messages for nullmerge and revignored (BC)
ClosedPublic

Authored by quark on Jul 10 2017, 3:15 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG437e317d7913: rebase: remove messages for nullmerge and revignored (BC)
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Jul 10 2017, 3:15 PM
krbullock edited subscribers, added: mercurial-devel; removed: reviewers.Jul 10 2017, 4:13 PM
durin42 accepted this revision.Jul 14 2017, 3:17 PM
durin42 added a subscriber: durin42.

Once d21 is done, this looks fine.

This revision is now accepted and ready to land.Jul 14 2017, 3:17 PM
quark abandoned this revision.Jul 18 2017, 1:41 PM
quark updated this revision to Diff 774.Aug 11 2017, 5:01 AM
This revision is now accepted and ready to land.Aug 11 2017, 5:01 AM
This revision now requires review to proceed.Aug 11 2017, 5:01 AM
quark updated this revision to Diff 896.Aug 14 2017, 8:10 PM
martinvonz accepted this revision.Aug 16 2017, 1:50 AM
This revision is now accepted and ready to land.Aug 16 2017, 1:50 AM
Closed by commit rHG437e317d7913: rebase: remove messages for nullmerge and revignored (BC) (authored by quark). · Explain WhyAug 16 2017, 2:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 774

hgext/rebase.py

else: else:
if not self.collapsef: if not self.collapsef:
ui.warn(_('note: rebase of %d:%s created no changes ' ui.warn(_('note: rebase of %d:%s created no changes '
'to commit\n') % (rev, ctx)) 'to commit\n') % (rev, ctx))
self.skipped.add(rev) self.skipped.add(rev)
self.state[rev] = p1 self.state[rev] = p1
ui.debug('next revision set to %s\n' % p1) ui.debug('next revision set to %s\n' % p1)
elif self.state[rev] == nullmerge: elif self.state[rev] == nullmerge:
ui.debug('ignoring null merge rebase of %s\n' % rev) pass
elif self.state[rev] == revignored: elif self.state[rev] == revignored:
ui.status(_('not rebasing ignored %s\n') % desc) pass
else: else:
ui.status(_('already rebased %s as %s\n') % ui.status(_('already rebased %s as %s\n') %
(desc, repo[self.state[rev]])) (desc, repo[self.state[rev]]))
ui.progress(_('rebasing'), None) ui.progress(_('rebasing'), None)
ui.note(_('rebase merging completed\n')) ui.note(_('rebase merging completed\n'))
def _finishrebase(self): def _finishrebase(self):

tests/test-rebase-conflicts.t

o changeset: 0:24797d4f68de o changeset: 0:24797d4f68de
user: szhang user: szhang
date: Tue Sep 03 13:55:08 2013 -0400 date: Tue Sep 03 13:55:08 2013 -0400
summary: added default.txt summary: added default.txt
$ hg rebase -s9 -d2 --debug # use debug to really check merge base used $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
rebase onto 4bc80088dc6b starting from e31216eec445 rebase onto 4bc80088dc6b starting from e31216eec445
rebase status stored 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" rebasing 9:e31216eec445 "more changes to f1"
future parents are 2 and -1 future parents are 2 and -1
rebase status stored rebase status stored
update to 2:4bc80088dc6b update to 2:4bc80088dc6b
resolving manifests resolving manifests
branchmerge: False, force: True, partial: False branchmerge: False, force: True, partial: False
ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
f2.txt: other deleted -> r f2.txt: other deleted -> r
[1] [1]
$ echo 4 > B $ echo 4 > B
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue --config experimental.evolution=none $ hg rebase --continue --config experimental.evolution=none
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
not rebasing ignored 2:26805aba1e60 "C" (C)
rebasing 3:f585351a92f8 "D" (D) rebasing 3:f585351a92f8 "D" (D)
warning: orphaned descendants detected, not stripping 112478962961 warning: orphaned descendants detected, not stripping 112478962961
saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
$ rm .hg/localtags $ rm .hg/localtags
$ hg tglog $ hg tglog
o 5:draft 'D' o 5:draft 'D'
| |

tests/test-rebase-obsolete.t

Test multiple root handling Test multiple root handling
------------------------------------ ------------------------------------
$ hg rebase --dest 4 --rev '7+11+9' $ hg rebase --dest 4 --rev '7+11+9'
rebasing 9:cf44d2f5a9f4 "D" rebasing 9:cf44d2f5a9f4 "D"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
not rebasing ignored 10:7c6027df6a99 "B"
rebasing 11:0d8f238b634c "C" (tip) rebasing 11:0d8f238b634c "C" (tip)
$ hg log -G $ hg log -G
o 14:1e8370e38cca C o 14:1e8370e38cca C
| |
@ 13:bfe264faf697 H @ 13:bfe264faf697 H
| |
| o 12:102b4c1d889b D | o 12:102b4c1d889b D
|/ |/
> B D G > B D G
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -d G -r 'B + D + F' $ hg rebase -d G -r 'B + D + F'
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 2:b18e25de2cf5 "D" (D) 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) rebasing 6:f15c3adaf214 "F" (F tip)
abort: cannot find new parents for revision 6 abort: cannot find new parents for revision 6
[255] [255]
$ cd .. $ cd ..
test on rebase dropping a merge test on rebase dropping a merge
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
(actual test) (actual test)
$ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
not rebasing ignored 8:53a6a128b2b7 "M"
rebasing 9:4bde274eefcf "I" (tip) rebasing 9:4bde274eefcf "I" (tip)
$ hg log -G $ hg log -G
@ 12:acd174b7ab39 I @ 12:acd174b7ab39 I
| |
o 11:6c11a6218c97 H o 11:6c11a6218c97 H
| |
| o 10:b5313c85b22e D | o 10:b5313c85b22e D
|/ |/

tests/test-rebase-partial.t

> | > |
> C > C
> | > |
> B > B
> | > |
> A > A
> EOF > EOF
already rebased 1:112478962961 "B" (B) already rebased 1:112478962961 "B" (B)
not rebasing ignored 2:26805aba1e60 "C" (C)
rebasing 3:f585351a92f8 "D" (D tip) rebasing 3:f585351a92f8 "D" (D tip)
o 4: D o 4: D
| |
| x 3: D | x 3: D
| | | |
| o 2: C | o 2: C
|/ |/
o 1: B o 1: B
| |
o 0: A o 0: A