##// END OF EJS Templates
identify: add template support...
identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

File last commit:

r22046:7a9cbb31 default
r33051:15a79ac8 default
Show More
test-flags.t
154 lines | 3.8 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require execbit
Mads Kiilerich
tests: use 'hghave execbit' for tests that manipulate x bit in file system
r15442
Nicolas Dumazet
tests: unify test-flags
r11792 $ umask 027
Martin Geisler
tests: remove redundant mkdir...
r13956
$ hg init test1
Nicolas Dumazet
tests: unify test-flags
r11792 $ cd test1
$ touch a b
$ hg add a b
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m "added a b"
Nicolas Dumazet
tests: unify test-flags
r11792
$ cd ..
$ hg clone test1 test3
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Martin Geisler
tests: remove redundant mkdir...
r13956
$ hg init test2
Nicolas Dumazet
tests: unify test-flags
r11792 $ cd test2
$ hg pull ../test1
pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
$ hg co
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ chmod +x a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m "chmod +x a"
Nicolas Dumazet
tests: unify test-flags
r11792
the changelog should mention file a:
$ hg tip --template '{files}\n'
a
$ cd ../test1
$ echo 123 >>a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m "a updated"
Nicolas Dumazet
tests: unify test-flags
r11792
$ hg pull ../test2
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:7f4313b42a34
Nicolas Dumazet
tests: unify test-flags
r11792 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 0:22a449e20da5
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: chmod +x a
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:c6ecefc45368
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: a updated
$ hg history
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:7f4313b42a34
Nicolas Dumazet
tests: unify test-flags
r11792 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 0:22a449e20da5
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: chmod +x a
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:c6ecefc45368
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: a updated
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:22a449e20da5
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: added a b
$ hg -v merge
resolving manifests
Mads Kiilerich
merge: changing the mode of a file is also an update...
r18334 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Nicolas Dumazet
tests: unify test-flags
r11792 (branch merge, don't forget to commit)
Mads Kiilerich
tests: better test coverage of merges of flags...
r18337 $ cat a
123
$ [ -x a ]
Nicolas Dumazet
tests: unify test-flags
r11792
$ cd ../test3
$ echo 123 >>b
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m "b updated"
Nicolas Dumazet
tests: unify test-flags
r11792
$ hg pull ../test2
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:7f4313b42a34
Nicolas Dumazet
tests: unify test-flags
r11792 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 0:22a449e20da5
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: chmod +x a
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:dc57ead75f79
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: b updated
$ hg history
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:7f4313b42a34
Nicolas Dumazet
tests: unify test-flags
r11792 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 0:22a449e20da5
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: chmod +x a
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:dc57ead75f79
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: b updated
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:22a449e20da5
Nicolas Dumazet
tests: unify test-flags
r11792 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-flags
r11792 summary: added a b
$ hg -v merge
resolving manifests
Mads Kiilerich
merge: changing the mode of a file is also an update...
r18334 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Nicolas Dumazet
tests: unify test-flags
r11792 (branch merge, don't forget to commit)
$ ls -l ../test[123]/a > foo
$ cut -b 1-10 < foo
-rwxr-x---
-rwxr-x---
-rwxr-x---
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
r14182 $ hg debugindex a
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
r14182 $ hg debugindex -R ../test2 a
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
r14182 $ hg debugindex -R ../test1 a
Bryan O'Sullivan
tests: reduce spurious failures when run with generaldelta...
r17132 rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
1 0 5 ..... 1 7fe919cc0336 b80de5d13875 000000000000 (re)
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..