Show More
@@ -125,7 +125,11 b' def _ctxdesc(ctx):' | |||||
125 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
125 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |
126 | ctx.description().split('\n', 1)[0]) |
|
126 | ctx.description().split('\n', 1)[0]) | |
127 | repo = ctx.repo() |
|
127 | repo = ctx.repo() | |
128 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
128 | names = [] | |
|
129 | for nsname, ns in repo.names.iteritems(): | |||
|
130 | if nsname == 'branches': | |||
|
131 | continue | |||
|
132 | names.extend(ns.names(repo, ctx.node())) | |||
129 | if names: |
|
133 | if names: | |
130 | desc += ' (%s)' % ' '.join(names) |
|
134 | desc += ' (%s)' % ' '.join(names) | |
131 | return desc |
|
135 | return desc |
@@ -37,7 +37,7 b' bookmark list' | |||||
37 | rebase |
|
37 | rebase | |
38 |
|
38 | |||
39 | $ hg rebase -s two -d one |
|
39 | $ hg rebase -s two -d one | |
40 |
rebasing 3:2ae46b1d99a7 "3" (tip |
|
40 | rebasing 3:2ae46b1d99a7 "3" (two tip) | |
41 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob) |
|
41 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob) | |
42 |
|
42 | |||
43 | $ hg log |
|
43 | $ hg log | |
@@ -77,7 +77,7 b' aborted rebase should restore active boo' | |||||
77 | created new head |
|
77 | created new head | |
78 | $ hg bookmark three |
|
78 | $ hg bookmark three | |
79 | $ hg rebase -s three -d two |
|
79 | $ hg rebase -s three -d two | |
80 |
rebasing 4:dd7c838e8362 "4" (tip |
|
80 | rebasing 4:dd7c838e8362 "4" (three tip) | |
81 | merging d |
|
81 | merging d | |
82 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
82 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | |
83 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
83 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
@@ -92,7 +92,7 b' aborted rebase should restore active boo' | |||||
92 | after aborted rebase, restoring a bookmark that has been removed should not fail |
|
92 | after aborted rebase, restoring a bookmark that has been removed should not fail | |
93 |
|
93 | |||
94 | $ hg rebase -s three -d two |
|
94 | $ hg rebase -s three -d two | |
95 |
rebasing 4:dd7c838e8362 "4" (tip |
|
95 | rebasing 4:dd7c838e8362 "4" (three tip) | |
96 | merging d |
|
96 | merging d | |
97 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
97 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | |
98 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
98 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
@@ -266,7 +266,7 b' rebase abort should not leave working co' | |||||
266 |
|
266 | |||
267 |
|
267 | |||
268 | $ hg rebase -d master -r foo |
|
268 | $ hg rebase -d master -r foo | |
269 |
rebasing 3:6c0f977a22d8 "C" (tip |
|
269 | rebasing 3:6c0f977a22d8 "C" (foo tip) | |
270 | merging c |
|
270 | merging c | |
271 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
|
271 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | |
272 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
272 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
@@ -306,7 +306,7 b' user has somehow managed to update to a ' | |||||
306 | created new head |
|
306 | created new head | |
307 |
|
307 | |||
308 | $ hg rebase -d @ -b foo --tool=internal:fail |
|
308 | $ hg rebase -d @ -b foo --tool=internal:fail | |
309 |
rebasing 2:070cf4580bb5 "b2" ( |
|
309 | rebasing 2:070cf4580bb5 "b2" (foo tip) | |
310 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
310 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
311 | [1] |
|
311 | [1] | |
312 |
|
312 |
@@ -96,7 +96,7 b' Do not try to keep active but deleted di' | |||||
96 | $ hg book W@diverge |
|
96 | $ hg book W@diverge | |
97 |
|
97 | |||
98 | $ hg rebase -s W -d . |
|
98 | $ hg rebase -s W -d . | |
99 |
rebasing 3:41acb9dca9eb "D" (tip |
|
99 | rebasing 3:41acb9dca9eb "D" (W tip) | |
100 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob) |
|
100 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob) | |
101 |
|
101 | |||
102 | $ hg bookmarks |
|
102 | $ hg bookmarks | |
@@ -208,5 +208,5 b' as --rev arguments (issue3950)' | |||||
208 | $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z |
|
208 | $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z | |
209 | rebasing 5:345c90f326a4 "bisect" |
|
209 | rebasing 5:345c90f326a4 "bisect" | |
210 | rebasing 6:f677a2907404 "bisect2" |
|
210 | rebasing 6:f677a2907404 "bisect2" | |
211 |
rebasing 7:325c16001345 "bisect3" ( |
|
211 | rebasing 7:325c16001345 "bisect3" (bisect tip) | |
212 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob) |
|
212 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob) |
@@ -792,7 +792,7 b' Test collapsing changes that add then re' | |||||
792 | $ hg book foo |
|
792 | $ hg book foo | |
793 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
|
793 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed | |
794 | rebasing 1:6d8d9f24eec3 "a" |
|
794 | rebasing 1:6d8d9f24eec3 "a" | |
795 |
rebasing 2:1cc73eca5ecc "b" (tip |
|
795 | rebasing 2:1cc73eca5ecc "b" (foo tip) | |
796 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob) |
|
796 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg (glob) | |
797 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
|
797 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" | |
798 | @ 1: 'collapsed' foo |
|
798 | @ 1: 'collapsed' foo |
@@ -77,12 +77,12 b' still introduced by an ancestor of chang' | |||||
77 | "BOOK-D", and "BOOK-E" include changes introduced by "C". |
|
77 | "BOOK-D", and "BOOK-E" include changes introduced by "C". | |
78 |
|
78 | |||
79 | $ hg rebase -s 2 -d E |
|
79 | $ hg rebase -s 2 -d E | |
80 |
rebasing 2:dc0947a82db8 "C" (C |
|
80 | rebasing 2:dc0947a82db8 "C" (BOOK-C C) | |
81 | rebasing 3:e7b3f00ed42e "D" (BOOK-D) |
|
81 | rebasing 3:e7b3f00ed42e "D" (BOOK-D) | |
82 | note: rebase of 3:e7b3f00ed42e created no changes to commit |
|
82 | note: rebase of 3:e7b3f00ed42e created no changes to commit | |
83 | rebasing 4:69a34c08022a "E" (BOOK-E) |
|
83 | rebasing 4:69a34c08022a "E" (BOOK-E) | |
84 | note: rebase of 4:69a34c08022a created no changes to commit |
|
84 | note: rebase of 4:69a34c08022a created no changes to commit | |
85 |
rebasing 5:6b2aeab91270 "F" (F |
|
85 | rebasing 5:6b2aeab91270 "F" (BOOK-F F) | |
86 | saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob) |
|
86 | saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob) | |
87 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
|
87 | $ hg log -G -T '{rev} {desc} {bookmarks}' | |
88 | o 5 F BOOK-F |
|
88 | o 5 F BOOK-F | |
@@ -129,7 +129,7 b' Merge and its ancestors all become empty' | |||||
129 | note: rebase of 2:dc0947a82db8 created no changes to commit |
|
129 | note: rebase of 2:dc0947a82db8 created no changes to commit | |
130 | rebasing 3:b18e25de2cf5 "D" (BOOK-D) |
|
130 | rebasing 3:b18e25de2cf5 "D" (BOOK-D) | |
131 | note: rebase of 3:b18e25de2cf5 created no changes to commit |
|
131 | note: rebase of 3:b18e25de2cf5 created no changes to commit | |
132 |
rebasing 4:86a1f6686812 "E" (E |
|
132 | rebasing 4:86a1f6686812 "E" (BOOK-E E) | |
133 | note: rebase of 4:86a1f6686812 created no changes to commit |
|
133 | note: rebase of 4:86a1f6686812 created no changes to commit | |
134 | saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob) |
|
134 | saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob) | |
135 |
|
135 | |||
@@ -176,11 +176,11 b' Part of ancestors of a merge become empt' | |||||
176 | $ hg rebase -r '(A::)-(B::)-A' -d H |
|
176 | $ hg rebase -r '(A::)-(B::)-A' -d H | |
177 | rebasing 2:dc0947a82db8 "C" (BOOK-C) |
|
177 | rebasing 2:dc0947a82db8 "C" (BOOK-C) | |
178 | note: rebase of 2:dc0947a82db8 created no changes to commit |
|
178 | note: rebase of 2:dc0947a82db8 created no changes to commit | |
179 |
rebasing 3:b18e25de2cf5 "D" (D |
|
179 | rebasing 3:b18e25de2cf5 "D" (BOOK-D D) | |
180 |
rebasing 4:03ca77807e91 "E" (E |
|
180 | rebasing 4:03ca77807e91 "E" (BOOK-E E) | |
181 | rebasing 5:ad6717a6a58e "F" (BOOK-F) |
|
181 | rebasing 5:ad6717a6a58e "F" (BOOK-F) | |
182 | note: rebase of 5:ad6717a6a58e created no changes to commit |
|
182 | note: rebase of 5:ad6717a6a58e created no changes to commit | |
183 |
rebasing 6:c58e8bdac1f4 "G" (G |
|
183 | rebasing 6:c58e8bdac1f4 "G" (BOOK-G G) | |
184 | saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob) |
|
184 | saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob) | |
185 |
|
185 | |||
186 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
|
186 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
@@ -1251,7 +1251,7 b' parent gets moved:' | |||||
1251 | $ hg bookmark book -i |
|
1251 | $ hg bookmark book -i | |
1252 | $ hg rebase -r B+D1 -d E |
|
1252 | $ hg rebase -r B+D1 -d E | |
1253 | rebasing 1:112478962961 "B" (B) |
|
1253 | rebasing 1:112478962961 "B" (B) | |
1254 |
note: not rebasing 5:15ecf15e0114 "D1" (D1 tip |
|
1254 | note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2) | |
1255 | $ hg log -G -T '{desc} {bookmarks}' |
|
1255 | $ hg log -G -T '{desc} {bookmarks}' | |
1256 | @ B book |
|
1256 | @ B book | |
1257 | | |
|
1257 | | |
General Comments 0
You need to be logged in to leave comments.
Login now