This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9262

templates: include all non-branch namespaces in default one-line summary
ClosedPublic

Authored by martinvonz on Oct 29 2020, 12:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe9555305c5c6: templates: include all non-branch namespaces in default one-line summary
Summary

I left out branches and custom namespaces on purpose from D9252
because I figured that people like us (Google) who have custom
namespaces can also have custom configs. However, I just realized that
this makes everyone with the topic extension lose the topic they've
had in rebase output for a long time (ever since someone was nice
enough to add it in D741). Sorry about the churn.

The more generic template couldn't easily keep the "log.bookmark"
label in the template because the namespace is called "bookmarks"
(plural). That means that we can't be compatible with users' existing
configs for "log.bookmark", so I decided to change the labels to be in
a brand-new "oneline-summary" namespace.

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 23367

mercurial/cmdutil.py

) )
if not spec: if not spec:
spec = ui.config(b'command-templates', b'oneline-summary') spec = ui.config(b'command-templates', b'oneline-summary')
if not spec: if not spec:
spec = default_spec spec = default_spec
if not spec: if not spec:
spec = ( spec = (
b'{separate(" ", ' b'{separate(" ", '
b'label("log.changeset", "{rev}:{node|short}")' b'label("oneline-summary.changeset", "{rev}:{node|short}")'
b', ' b', '
b'label("log.tag", tags)' b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names % "{label("oneline-summary.{namespace}", name)}", " "))}"), " ")'
b', '
b'label("log.bookmark", bookmarks)'
b')} ' b')} '
b'"{label("log.desc", desc|firstline)}"' b'"{label("oneline-summary.desc", desc|firstline)}"'
) )
text = rendertemplate(ctx, spec) text = rendertemplate(ctx, spec)
return text.split(b'\n')[0] return text.split(b'\n')[0]
def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None): def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
r"""Convert old-style filename format string to template string r"""Convert old-style filename format string to template string

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 tip two "3" rebasing 3:2ae46b1d99a7 two tip "3"
saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
$ 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 tip three "4" rebasing 4:dd7c838e8362 three tip "4"
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 tip three "4" rebasing 4:dd7c838e8362 three tip "4"
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 tip foo "C" rebasing 3:6c0f977a22d8 foo tip "C"
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 abort $ hg 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 tip foo "b2" rebasing 2:070cf4580bb5 foo tip "b2"
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 tip W "D" rebasing 3:41acb9dca9eb W tip "D"
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
$ 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 tip bisect "bisect3" rebasing 7:325c16001345 bisect tip "bisect3"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
Bookmark and working parent get moved even if --keep is set (issue5682) Bookmark and working parent get moved even if --keep is set (issue5682)
$ hg init $TESTTMP/book-keep $ hg init $TESTTMP/book-keep
$ cd $TESTTMP/book-keep $ cd $TESTTMP/book-keep
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> B C > B C

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 tip foo "b" rebasing 2:1cc73eca5ecc foo tip "b"
saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg
$ 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

$ hg bookmark BOOK-E -fqir 4 $ hg bookmark BOOK-E -fqir 4
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 BOOK-C "C" rebasing 2:dc0947a82db8 BOOK-C C "C"
rebasing 3:e7b3f00ed42e BOOK-D "D" rebasing 3:e7b3f00ed42e BOOK-D "D"
note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
rebasing 4:69a34c08022a BOOK-E "E" rebasing 4:69a34c08022a BOOK-E "E"
note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes
rebasing 5:6b2aeab91270 F BOOK-F "F" rebasing 5:6b2aeab91270 BOOK-F F "F"
saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
$ 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
| |
$ hg update H -q $ hg update H -q
$ hg branch foo -q $ hg branch foo -q
$ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches
rebasing 2:dc0947a82db8 BOOK-C "C" rebasing 2:dc0947a82db8 BOOK-C "C"
note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
rebasing 3:b18e25de2cf5 BOOK-D "D" rebasing 3:b18e25de2cf5 BOOK-D "D"
note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes
rebasing 4:86a1f6686812 E BOOK-E "E" rebasing 4:86a1f6686812 BOOK-E E "E"
note: not rebasing 4:86a1f6686812 E BOOK-E "E", its destination already has all its changes note: not rebasing 4:86a1f6686812 BOOK-E E "E", its destination already has all its changes
saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
$ hg update null -q $ hg update null -q
$ 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 BOOK-C "C" rebasing 2:dc0947a82db8 BOOK-C "C"
note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
rebasing 3:b18e25de2cf5 D BOOK-D "D" rebasing 3:b18e25de2cf5 BOOK-D D "D"
rebasing 4:03ca77807e91 E BOOK-E "E" rebasing 4:03ca77807e91 BOOK-E E "E"
rebasing 5:ad6717a6a58e BOOK-F "F" rebasing 5:ad6717a6a58e BOOK-F "F"
note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes
rebasing 6:c58e8bdac1f4 G BOOK-G "G" rebasing 6:c58e8bdac1f4 BOOK-G G "G"
saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
$ 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 tip book "D1", already in destination as 2:0807738e0be9 D2 "D2" note: not rebasing 5:15ecf15e0114 book D1 tip "D1", already in destination as 2:0807738e0be9 D2 "D2"
1 new orphan changesets 1 new orphan changesets
$ hg log -G -T '{desc} {bookmarks}' $ hg log -G -T '{desc} {bookmarks}'
@ B book @ B book
| |
| x D1 | x D1
| | | |
o | E o | E
| | | |

tests/test-rebase-templates.t

$ hg rebase -r 7 -d 8 -n \ $ hg rebase -r 7 -d 8 -n \
> --config command-templates.oneline-summary='global: {rev}' \ > --config command-templates.oneline-summary='global: {rev}' \
> --config command-templates.oneline-summary.rebase='override: {rev}' > --config command-templates.oneline-summary.rebase='override: {rev}'
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing override: 7 rebasing override: 7
note: not rebasing override: 7, its destination already has all its changes note: not rebasing override: 7, its destination already has all its changes
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
check namespaces and coloring (labels)
$ hg tag -l -r 7 my-tag
$ hg rebase -r 7 -d 8 -n
starting dry-run rebase; repository will not be changed
rebasing 7:f48cd65c6dc3 my-tag "Added b"
note: not rebasing 7:f48cd65c6dc3 my-tag "Added b", its destination already has all its changes
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
$ hg bookmark -r 7 my-bookmark
$ hg rebase -r 7 -d 8 -n
starting dry-run rebase; repository will not be changed
rebasing 7:f48cd65c6dc3 my-bookmark my-tag "Added b"
note: not rebasing 7:f48cd65c6dc3 my-bookmark my-tag "Added b", its destination already has all its changes
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
$ hg rebase -r 7 -d 8 -n --color=debug
[ ui.status|starting dry-run rebase; repository will not be changed]
[ ui.status|rebasing [oneline-summary.changeset|7:f48cd65c6dc3] [oneline-summary.bookmarks|my-bookmark] [oneline-summary.tags|my-tag] "[oneline-summary.desc|Added b]"]
[ ui.warning|note: not rebasing [oneline-summary.changeset|7:f48cd65c6dc3] [oneline-summary.bookmarks|my-bookmark] [oneline-summary.tags|my-tag] "[oneline-summary.desc|Added b]", its destination already has all its changes]
[ ui.status|dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase]

tests/test-remotefilelog-bgprefetch.t

3 files updated, 0 files merged, 2 files removed, 0 files unresolved 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(leaving bookmark temporary) (leaving bookmark temporary)
$ clearcache $ clearcache
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
.. The following output line about files fetches is globed because it is .. The following output line about files fetches is globed because it is
.. flaky, the core the test is checked when checking the cache dir, so .. flaky, the core the test is checked when checking the cache dir, so
.. hopefully this flakyness is not hiding any actual bug. .. hopefully this flakyness is not hiding any actual bug.
$ hg rebase -s temporary -d foo $ hg rebase -s temporary -d foo
rebasing 3:d9cf06e3b5b6 tip temporary "b" rebasing 3:d9cf06e3b5b6 temporary tip "b"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg
? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob) ? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob)
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos