This is an archive of the discontinued Mercurial Phabricator instance.

Differential D741

rebase: also include other namespaces in changeset description
ClosedPublic

Authored by martinvonz on Sep 20 2017, 1:59 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG4f969b9e0cf5: rebase: also include other namespaces in changeset description
Summary

This makes use of the generic method of listing bookmarks and tags, so
other extensions that add other namespaces will get their names added
too.

This does mean that bookmarks will come before tags, just like we
apparently decided to order them in the "hg log" output. It doesn't
seem like people would be parsing the rebase output anyway. We also
did 79ab5369d55a (rebase: use _ctxdesc in one more place, 2017-08-29)
recently, so now seems like a good time.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 1931

hgext/rebase.py

sourceset = revset.getset(repo, smartset.fullreposet(repo), x) sourceset = revset.getset(repo, smartset.fullreposet(repo), x)
return subset & smartset.baseset([_destrebase(repo, sourceset)]) return subset & smartset.baseset([_destrebase(repo, sourceset)])
def _ctxdesc(ctx): def _ctxdesc(ctx):
"""short description for a context""" """short description for a context"""
desc = '%d:%s "%s"' % (ctx.rev(), ctx, desc = '%d:%s "%s"' % (ctx.rev(), ctx,
ctx.description().split('\n', 1)[0]) ctx.description().split('\n', 1)[0])
repo = ctx.repo() repo = ctx.repo()
names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) names = []
for nsname, ns in repo.names.iteritems():
if nsname == 'branches':
continue
names.extend(ns.names(repo, ctx.node()))
if names: if names:
desc += ' (%s)' % ' '.join(names) desc += ' (%s)' % ' '.join(names)
return desc return desc
class rebaseruntime(object): class rebaseruntime(object):
"""This class is a container for rebase runtime state""" """This class is a container for rebase runtime state"""
def __init__(self, repo, ui, opts=None): def __init__(self, repo, ui, opts=None):
if opts is None: if opts is None:

tests/test-bookmarks-rebase.t

$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
* two 3:2ae46b1d99a7 * two 3:2ae46b1d99a7
rebase rebase
$ hg rebase -s two -d one $ hg rebase -s two -d one
rebasing 3:2ae46b1d99a7 "3" (tip two) rebasing 3:2ae46b1d99a7 "3" (two tip)
saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob) saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob)
$ hg log $ hg log
changeset: 3:42e5ed2cdcf4 changeset: 3:42e5ed2cdcf4
bookmark: two bookmark: two
tag: tip tag: tip
parent: 1:925d80f479bb parent: 1:925d80f479bb
user: test user: test
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark two) (leaving bookmark two)
$ echo 'e' > d $ echo 'e' > d
$ hg ci -A -m "4" $ hg ci -A -m "4"
adding d adding d
created new head created new head
$ hg bookmark three $ hg bookmark three
$ hg rebase -s three -d two $ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (tip three) rebasing 4:dd7c838e8362 "4" (three tip)
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
* three 4:dd7c838e8362 * three 4:dd7c838e8362
two 3:42e5ed2cdcf4 two 3:42e5ed2cdcf4
after aborted rebase, restoring a bookmark that has been removed should not fail after aborted rebase, restoring a bookmark that has been removed should not fail
$ hg rebase -s three -d two $ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (tip three) rebasing 4:dd7c838e8362 "4" (three tip)
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg bookmark -d three $ hg bookmark -d three
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg bookmark $ hg bookmark
one 1:925d80f479bb one 1:925d80f479bb
two 3:42e5ed2cdcf4 two 3:42e5ed2cdcf4

tests/test-rebase-abort.t

| o 2 c master | o 2 c master
| | | |
o | 1 b o | 1 b
|/ |/
o 0 a o 0 a
$ hg rebase -d master -r foo $ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 "C" (tip foo) rebasing 3:6c0f977a22d8 "C" (foo tip)
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
@ 3 C foo @ 3 C foo
(leaving bookmark @) (leaving bookmark @)
$ hg book foo $ hg book foo
$ echo y > b $ echo y > b
$ hg add b $ hg add b
$ hg commit -m b2 $ hg commit -m b2
created new head created new head
$ hg rebase -d @ -b foo --tool=internal:fail $ hg rebase -d @ -b foo --tool=internal:fail
rebasing 2:070cf4580bb5 "b2" (tip foo) rebasing 2:070cf4580bb5 "b2" (foo tip)
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3
$ hg up -C 0 # user does other stuff in the repo $ hg up -C 0 # user does other stuff in the repo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv rebasestate .hg/ # user upgrades to 2.7 $ mv rebasestate .hg/ # user upgrades to 2.7

tests/test-rebase-bookmarks.t

$ cd .. $ cd ..
$ hg clone -q a a4 $ hg clone -q a a4
$ cd a4 $ cd a4
$ hg up -q 2 $ hg up -q 2
$ hg book W@diverge $ hg book W@diverge
$ hg rebase -s W -d . $ hg rebase -s W -d .
rebasing 3:41acb9dca9eb "D" (tip W) rebasing 3:41acb9dca9eb "D" (W tip)
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob) saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob)
$ hg bookmarks $ hg bookmarks
W 3:0d3554f74897 W 3:0d3554f74897
X 1:6c81ed0049f8 X 1:6c81ed0049f8
Y 2:49cb3485fa0c Y 2:49cb3485fa0c
Z 2:49cb3485fa0c Z 2:49cb3485fa0c
$ hg ci -m bisect2 $ hg ci -m bisect2
$ echo e >> bimble $ echo e >> bimble
$ hg ci -m bisect3 $ hg ci -m bisect3
$ hg book bisect $ hg book bisect
$ hg update -q Y $ hg update -q Y
$ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
rebasing 5:345c90f326a4 "bisect" rebasing 5:345c90f326a4 "bisect"
rebasing 6:f677a2907404 "bisect2" rebasing 6:f677a2907404 "bisect2"
rebasing 7:325c16001345 "bisect3" (tip bisect) rebasing 7:325c16001345 "bisect3" (bisect tip)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob)

tests/test-rebase-collapse.t

adding a adding a
$ hg rm a $ hg rm a
$ touch b $ touch b
$ hg commit -Am b $ hg commit -Am b
adding b adding b
$ hg book foo $ hg book foo
$ hg rebase -d 0 -r "1::2" --collapse -m collapsed $ hg rebase -d 0 -r "1::2" --collapse -m collapsed
rebasing 1:6d8d9f24eec3 "a" rebasing 1:6d8d9f24eec3 "a"
rebasing 2:1cc73eca5ecc "b" (tip foo) rebasing 2:1cc73eca5ecc "b" (foo tip)
saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob) saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob)
$ hg log -G --template "{rev}: '{desc}' {bookmarks}" $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
@ 1: 'collapsed' foo @ 1: 'collapsed' foo
| |
o 0: 'base' o 0: 'base'
$ hg manifest --rev tip $ hg manifest --rev tip
b b

tests/test-rebase-emptycommit.t

o 0 A o 0 A
Bookmark is usually an indication of a head. For changes that are introduced by Bookmark is usually an indication of a head. For changes that are introduced by
an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally
still introduced by an ancestor of changeset on B-NEW. In the below case, still introduced by an ancestor of changeset on B-NEW. In the below case,
"BOOK-D", and "BOOK-E" include changes introduced by "C". "BOOK-D", and "BOOK-E" include changes introduced by "C".
$ hg rebase -s 2 -d E $ hg rebase -s 2 -d E
rebasing 2:dc0947a82db8 "C" (C BOOK-C) rebasing 2:dc0947a82db8 "C" (BOOK-C C)
rebasing 3:e7b3f00ed42e "D" (BOOK-D) rebasing 3:e7b3f00ed42e "D" (BOOK-D)
note: rebase of 3:e7b3f00ed42e created no changes to commit note: rebase of 3:e7b3f00ed42e created no changes to commit
rebasing 4:69a34c08022a "E" (BOOK-E) rebasing 4:69a34c08022a "E" (BOOK-E)
note: rebase of 4:69a34c08022a created no changes to commit note: rebase of 4:69a34c08022a created no changes to commit
rebasing 5:6b2aeab91270 "F" (F BOOK-F) rebasing 5:6b2aeab91270 "F" (BOOK-F F)
saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob) saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob)
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 5 F BOOK-F o 5 F BOOK-F
| |
o 4 C BOOK-C BOOK-D BOOK-E o 4 C BOOK-C BOOK-D BOOK-E
| |
o 3 E o 3 E
| |
> B > B
> EOS > EOS
$ hg rebase -r '(A::)-(B::)-A' -d H $ hg rebase -r '(A::)-(B::)-A' -d H
rebasing 2:dc0947a82db8 "C" (BOOK-C) rebasing 2:dc0947a82db8 "C" (BOOK-C)
note: rebase of 2:dc0947a82db8 created no changes to commit note: rebase of 2:dc0947a82db8 created no changes to commit
rebasing 3:b18e25de2cf5 "D" (BOOK-D) rebasing 3:b18e25de2cf5 "D" (BOOK-D)
note: rebase of 3:b18e25de2cf5 created no changes to commit note: rebase of 3:b18e25de2cf5 created no changes to commit
rebasing 4:86a1f6686812 "E" (E BOOK-E) rebasing 4:86a1f6686812 "E" (BOOK-E E)
note: rebase of 4:86a1f6686812 created no changes to commit note: rebase of 4:86a1f6686812 created no changes to commit
saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob) saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob)
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 4 H BOOK-C BOOK-D BOOK-E o 4 H BOOK-C BOOK-D BOOK-E
| |
o 3 D o 3 D
| |
> C > C
> | > |
> B > B
> EOS > EOS
$ hg rebase -r '(A::)-(B::)-A' -d H $ hg rebase -r '(A::)-(B::)-A' -d H
rebasing 2:dc0947a82db8 "C" (BOOK-C) rebasing 2:dc0947a82db8 "C" (BOOK-C)
note: rebase of 2:dc0947a82db8 created no changes to commit note: rebase of 2:dc0947a82db8 created no changes to commit
rebasing 3:b18e25de2cf5 "D" (D BOOK-D) rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
rebasing 4:03ca77807e91 "E" (E BOOK-E) rebasing 4:03ca77807e91 "E" (BOOK-E E)
rebasing 5:ad6717a6a58e "F" (BOOK-F) rebasing 5:ad6717a6a58e "F" (BOOK-F)
note: rebase of 5:ad6717a6a58e created no changes to commit note: rebase of 5:ad6717a6a58e created no changes to commit
rebasing 6:c58e8bdac1f4 "G" (G BOOK-G) rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob) saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob)
$ hg log -G -T '{rev} {desc} {bookmarks}' $ hg log -G -T '{rev} {desc} {bookmarks}'
o 7 G BOOK-G o 7 G BOOK-G
|\ |\
| o 6 E BOOK-E | o 6 E BOOK-E
| | | |
o | 5 D BOOK-D BOOK-F o | 5 D BOOK-D BOOK-F

tests/test-rebase-obsolete.t

> | B > | B
> |/ > |/
> A > A
> EOS > EOS
$ hg update D1 -q $ hg update D1 -q
$ hg bookmark book -i $ hg bookmark book -i
$ hg rebase -r B+D1 -d E $ hg rebase -r B+D1 -d E
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
note: not rebasing 5:15ecf15e0114 "D1" (D1 tip book), already in destination as 2:0807738e0be9 "D2" (D2) note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2)
$ hg log -G -T '{desc} {bookmarks}' $ hg log -G -T '{desc} {bookmarks}'
@ B book @ B book
| |
| x D1 | x D1
| | | |
o | E o | E
| | | |
| o C | o C