2018-01-23 23:09:16 +03:00
|
|
|
$ . helpers-usechg.sh
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
$ hg init a
|
|
|
|
$ cd a
|
|
|
|
$ echo a > a
|
|
|
|
$ hg add a
|
|
|
|
$ echo line 1 > b
|
|
|
|
$ echo line 2 >> b
|
|
|
|
$ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
|
|
|
|
|
|
|
|
$ hg add b
|
|
|
|
$ echo other 1 > c
|
|
|
|
$ echo other 2 >> c
|
|
|
|
$ echo >> c
|
|
|
|
$ echo other 3 >> c
|
|
|
|
$ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
|
|
|
|
|
|
|
|
$ hg add c
|
|
|
|
$ hg commit -m 'no person' -d '1200000 0' -u 'other@place'
|
|
|
|
$ echo c >> c
|
|
|
|
$ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
|
|
|
|
|
|
|
|
$ echo foo > .hg/branch
|
|
|
|
$ hg commit -m 'new branch' -d '1400000 0' -u 'person'
|
|
|
|
|
|
|
|
$ hg co -q 3
|
|
|
|
$ echo other 4 >> d
|
|
|
|
$ hg add d
|
|
|
|
$ hg commit -m 'new head' -d '1500000 0' -u 'person'
|
|
|
|
|
|
|
|
$ hg merge -q foo
|
|
|
|
$ hg commit -m 'merge' -d '1500001 0' -u 'person'
|
|
|
|
|
2018-05-14 20:37:27 +03:00
|
|
|
$ hg log -r . -T '{username}'
|
|
|
|
test (no-eol)
|
|
|
|
|
2016-10-09 15:51:04 +03:00
|
|
|
Test arithmetic operators have the right precedence:
|
|
|
|
|
2016-10-30 00:15:07 +03:00
|
|
|
$ hg log -l 1 -T '{date(date, "%Y") + 5 * 10} {date(date, "%Y") - 2 * 3}\n'
|
|
|
|
2020 1964
|
|
|
|
$ hg log -l 1 -T '{date(date, "%Y") * 5 + 10} {date(date, "%Y") * 3 - 2}\n'
|
|
|
|
9860 5908
|
2016-10-09 15:51:04 +03:00
|
|
|
|
|
|
|
Test division:
|
|
|
|
|
|
|
|
$ hg debugtemplate -r0 -v '{5 / 2} {mod(5, 2)}\n'
|
|
|
|
(template
|
|
|
|
(/
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5')
|
|
|
|
(integer '2'))
|
|
|
|
(string ' ')
|
2016-10-09 15:51:04 +03:00
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'mod')
|
2016-10-09 15:51:04 +03:00
|
|
|
(list
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5')
|
|
|
|
(integer '2')))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
2 1
|
|
|
|
$ hg debugtemplate -r0 -v '{5 / -2} {mod(5, -2)}\n'
|
|
|
|
(template
|
|
|
|
(/
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5')
|
2016-10-09 15:51:04 +03:00
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '2')))
|
|
|
|
(string ' ')
|
2016-10-09 15:51:04 +03:00
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'mod')
|
2016-10-09 15:51:04 +03:00
|
|
|
(list
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5')
|
2016-10-09 15:51:04 +03:00
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '2'))))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
-3 -1
|
|
|
|
$ hg debugtemplate -r0 -v '{-5 / 2} {mod(-5, 2)}\n'
|
|
|
|
(template
|
|
|
|
(/
|
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5'))
|
|
|
|
(integer '2'))
|
|
|
|
(string ' ')
|
2016-10-09 15:51:04 +03:00
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'mod')
|
2016-10-09 15:51:04 +03:00
|
|
|
(list
|
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5'))
|
|
|
|
(integer '2')))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
-3 1
|
|
|
|
$ hg debugtemplate -r0 -v '{-5 / -2} {mod(-5, -2)}\n'
|
|
|
|
(template
|
|
|
|
(/
|
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5'))
|
2016-10-09 15:51:04 +03:00
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '2')))
|
|
|
|
(string ' ')
|
2016-10-09 15:51:04 +03:00
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'mod')
|
2016-10-09 15:51:04 +03:00
|
|
|
(list
|
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '5'))
|
2016-10-09 15:51:04 +03:00
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '2'))))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
2 -1
|
|
|
|
|
|
|
|
Filters bind closer than arithmetic:
|
|
|
|
|
|
|
|
$ hg debugtemplate -r0 -v '{revset(".")|count - 1}\n'
|
|
|
|
(template
|
|
|
|
(-
|
|
|
|
(|
|
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'revset')
|
|
|
|
(string '.'))
|
|
|
|
(symbol 'count'))
|
|
|
|
(integer '1'))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
0
|
|
|
|
|
|
|
|
But negate binds closer still:
|
|
|
|
|
|
|
|
$ hg debugtemplate -r0 -v '{1-3|stringify}\n'
|
|
|
|
(template
|
|
|
|
(-
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '1')
|
2016-10-09 15:51:04 +03:00
|
|
|
(|
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '3')
|
|
|
|
(symbol 'stringify')))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
hg: parse error: arithmetic only defined on integers
|
|
|
|
[255]
|
|
|
|
$ hg debugtemplate -r0 -v '{-3|stringify}\n'
|
|
|
|
(template
|
|
|
|
(|
|
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '3'))
|
|
|
|
(symbol 'stringify'))
|
|
|
|
(string '\n'))
|
2016-10-09 15:51:04 +03:00
|
|
|
-3
|
|
|
|
|
2017-04-24 15:37:11 +03:00
|
|
|
Filters bind as close as map operator:
|
|
|
|
|
|
|
|
$ hg debugtemplate -r0 -v '{desc|splitlines % "{line}\n"}'
|
|
|
|
(template
|
|
|
|
(%
|
|
|
|
(|
|
|
|
|
(symbol 'desc')
|
|
|
|
(symbol 'splitlines'))
|
|
|
|
(template
|
|
|
|
(symbol 'line')
|
|
|
|
(string '\n'))))
|
|
|
|
line 1
|
|
|
|
line 2
|
|
|
|
|
2017-04-03 14:55:55 +03:00
|
|
|
Keyword arguments:
|
|
|
|
|
|
|
|
$ hg debugtemplate -r0 -v '{foo=bar|baz}'
|
|
|
|
(template
|
|
|
|
(keyvalue
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'foo')
|
2017-04-03 14:55:55 +03:00
|
|
|
(|
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'bar')
|
|
|
|
(symbol 'baz'))))
|
2017-04-03 14:55:55 +03:00
|
|
|
hg: parse error: can't use a key-value pair in this context
|
|
|
|
[255]
|
|
|
|
|
2017-04-03 16:23:52 +03:00
|
|
|
$ hg debugtemplate '{pad("foo", width=10, left=true)}\n'
|
|
|
|
foo
|
|
|
|
|
2017-04-03 15:22:39 +03:00
|
|
|
Call function which takes named arguments by filter syntax:
|
|
|
|
|
|
|
|
$ hg debugtemplate '{" "|separate}'
|
|
|
|
$ hg debugtemplate '{("not", "an", "argument", "list")|separate}'
|
|
|
|
hg: parse error: unknown method 'list'
|
|
|
|
[255]
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Second branch starting at nullrev:
|
|
|
|
|
|
|
|
$ hg update null
|
|
|
|
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
|
|
|
|
$ echo second > second
|
|
|
|
$ hg add second
|
|
|
|
$ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
|
|
|
|
|
|
|
|
$ echo third > third
|
|
|
|
$ hg add third
|
|
|
|
$ hg mv second fourth
|
|
|
|
$ hg commit -m third -d "2020-01-01 10:01"
|
|
|
|
|
2013-04-16 18:44:29 +04:00
|
|
|
$ hg log --template '{join(file_copies, ",\n")}\n' -r .
|
|
|
|
fourth (second)
|
2014-03-09 01:27:25 +04:00
|
|
|
$ hg log -T '{file_copies % "{source} -> {name}\n"}' -r .
|
2013-02-22 23:45:46 +04:00
|
|
|
second -> fourth
|
2015-02-18 17:01:33 +03:00
|
|
|
$ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7
|
|
|
|
8 t
|
|
|
|
7 f
|
2013-02-22 23:45:46 +04:00
|
|
|
|
2015-07-02 16:18:21 +03:00
|
|
|
Working-directory revision has special identifiers, though they are still
|
|
|
|
experimental:
|
|
|
|
|
|
|
|
$ hg log -r 'wdir()' -T '{rev}:{node}\n'
|
|
|
|
2147483647:ffffffffffffffffffffffffffffffffffffffff
|
|
|
|
|
2015-03-14 11:58:18 +03:00
|
|
|
Some keywords are invalid for working-directory revision, but they should
|
|
|
|
never cause crash:
|
|
|
|
|
|
|
|
$ hg log -r 'wdir()' -T '{manifest}\n'
|
|
|
|
|
|
|
|
|
2012-05-13 00:12:54 +04:00
|
|
|
Quoting for ui.logtemplate
|
|
|
|
|
|
|
|
$ hg tip --config "ui.logtemplate={rev}\n"
|
|
|
|
8
|
|
|
|
$ hg tip --config "ui.logtemplate='{rev}\n'"
|
|
|
|
8
|
|
|
|
$ hg tip --config 'ui.logtemplate="{rev}\n"'
|
|
|
|
8
|
2016-03-27 11:42:19 +03:00
|
|
|
$ hg tip --config 'ui.logtemplate=n{rev}\n'
|
|
|
|
n8
|
2012-05-13 00:12:54 +04:00
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Make sure user/global hgrc does not affect tests
|
|
|
|
|
|
|
|
$ echo '[ui]' > .hg/hgrc
|
|
|
|
$ echo 'logtemplate =' >> .hg/hgrc
|
|
|
|
$ echo 'style =' >> .hg/hgrc
|
|
|
|
|
2014-03-09 03:38:50 +04:00
|
|
|
Add some simple styles to settings
|
|
|
|
|
2017-04-22 14:14:55 +03:00
|
|
|
$ cat <<'EOF' >> .hg/hgrc
|
|
|
|
> [templates]
|
|
|
|
> simple = "{rev}\n"
|
|
|
|
> simple2 = {rev}\n
|
|
|
|
> rev = "should not precede {rev} keyword\n"
|
|
|
|
> EOF
|
2014-03-09 03:38:50 +04:00
|
|
|
|
|
|
|
$ hg log -l1 -Tsimple
|
|
|
|
8
|
|
|
|
$ hg log -l1 -Tsimple2
|
|
|
|
8
|
2017-04-22 14:14:55 +03:00
|
|
|
$ hg log -l1 -Trev
|
|
|
|
should not precede 8 keyword
|
|
|
|
$ hg log -l1 -T '{simple}'
|
|
|
|
8
|
|
|
|
|
|
|
|
Map file shouldn't see user templates:
|
|
|
|
|
|
|
|
$ cat <<EOF > tmpl
|
|
|
|
> changeset = 'nothing expanded:{simple}\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log -l1 --style ./tmpl
|
|
|
|
nothing expanded:
|
2014-03-09 03:38:50 +04:00
|
|
|
|
|
|
|
Test templates and style maps in files:
|
|
|
|
|
|
|
|
$ echo "{rev}" > tmpl
|
|
|
|
$ hg log -l1 -T./tmpl
|
|
|
|
8
|
|
|
|
$ hg log -l1 -Tblah/blah
|
|
|
|
blah/blah (no-eol)
|
|
|
|
|
|
|
|
$ printf 'changeset = "{rev}\\n"\n' > map-simple
|
|
|
|
$ hg log -l1 -T./map-simple
|
|
|
|
8
|
|
|
|
|
2017-10-14 12:06:42 +03:00
|
|
|
a map file may have [templates] and [templatealias] sections:
|
2017-10-14 11:51:01 +03:00
|
|
|
|
|
|
|
$ cat <<'EOF' > map-simple
|
|
|
|
> [templates]
|
2017-10-14 12:06:42 +03:00
|
|
|
> changeset = "{a}\n"
|
|
|
|
> [templatealias]
|
|
|
|
> a = rev
|
2017-10-14 11:51:01 +03:00
|
|
|
> EOF
|
|
|
|
$ hg log -l1 -T./map-simple
|
|
|
|
8
|
|
|
|
|
|
|
|
so it can be included in hgrc
|
|
|
|
|
|
|
|
$ cat <<'EOF' > myhgrc
|
|
|
|
> %include map-simple
|
|
|
|
> [templates]
|
|
|
|
> foo = "{changeset}"
|
|
|
|
> EOF
|
|
|
|
$ HGRCPATH=./myhgrc hg log -l1 -Tfoo
|
|
|
|
8
|
2017-10-14 12:06:42 +03:00
|
|
|
$ HGRCPATH=./myhgrc hg log -l1 -T'{a}\n'
|
|
|
|
8
|
2017-10-14 11:51:01 +03:00
|
|
|
|
2016-08-25 03:43:45 +03:00
|
|
|
Test template map inheritance
|
|
|
|
|
|
|
|
$ echo "__base__ = map-cmdline.default" > map-simple
|
|
|
|
$ printf 'cset = "changeset: ***{rev}***\\n"\n' >> map-simple
|
|
|
|
$ hg log -l1 -T./map-simple
|
|
|
|
changeset: ***8***
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
summary: third
|
|
|
|
|
|
|
|
|
2017-06-17 10:32:20 +03:00
|
|
|
Test docheader, docfooter and separator in template map
|
|
|
|
|
|
|
|
$ cat <<'EOF' > map-myjson
|
|
|
|
> docheader = '\{\n'
|
|
|
|
> docfooter = '\n}\n'
|
|
|
|
> separator = ',\n'
|
|
|
|
> changeset = ' {dict(rev, node|short)|json}'
|
|
|
|
> EOF
|
|
|
|
$ hg log -l2 -T./map-myjson
|
|
|
|
{
|
|
|
|
{"node": "95c24699272e", "rev": 8},
|
|
|
|
{"node": "29114dbae42b", "rev": 7}
|
|
|
|
}
|
|
|
|
|
2017-04-22 15:16:08 +03:00
|
|
|
Test docheader, docfooter and separator in [templates] section
|
|
|
|
|
|
|
|
$ cat <<'EOF' >> .hg/hgrc
|
|
|
|
> [templates]
|
|
|
|
> myjson = ' {dict(rev, node|short)|json}'
|
|
|
|
> myjson:docheader = '\{\n'
|
|
|
|
> myjson:docfooter = '\n}\n'
|
|
|
|
> myjson:separator = ',\n'
|
|
|
|
> :docheader = 'should not be selected as a docheader for literal templates\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log -l2 -Tmyjson
|
|
|
|
{
|
|
|
|
{"node": "95c24699272e", "rev": 8},
|
|
|
|
{"node": "29114dbae42b", "rev": 7}
|
|
|
|
}
|
|
|
|
$ hg log -l1 -T'{rev}\n'
|
|
|
|
8
|
|
|
|
|
2014-09-30 18:15:56 +04:00
|
|
|
Template should precede style option
|
|
|
|
|
|
|
|
$ hg log -l1 --style default -T '{rev}\n'
|
|
|
|
8
|
|
|
|
|
2015-04-24 21:17:14 +03:00
|
|
|
Add a commit with empty description, to ensure that the templates
|
2015-04-26 20:43:01 +03:00
|
|
|
below will omit the description line.
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2015-03-27 16:12:53 +03:00
|
|
|
$ echo c >> c
|
|
|
|
$ hg add c
|
|
|
|
$ hg commit -qm ' '
|
|
|
|
|
2015-04-24 21:52:12 +03:00
|
|
|
Default style is like normal output. Phases style should be the same
|
|
|
|
as default style, except for extra phase lines.
|
2015-04-24 21:17:14 +03:00
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
$ hg log > log.out
|
|
|
|
$ hg log --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg log -T phases > phases.out
|
2015-07-21 01:39:15 +03:00
|
|
|
$ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
|
2015-04-24 21:52:12 +03:00
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
$ hg log -v > log.out
|
|
|
|
$ hg log -v --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg log -v -T phases > phases.out
|
2015-07-21 01:39:15 +03:00
|
|
|
$ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
|
2015-04-24 21:52:12 +03:00
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
|
|
|
+phase: draft
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2015-03-14 16:34:27 +03:00
|
|
|
$ hg log -q > log.out
|
|
|
|
$ hg log -q --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg log -q -T phases > phases.out
|
|
|
|
$ cmp log.out phases.out || diff -u log.out phases.out
|
2015-03-14 16:34:27 +03:00
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
$ hg log --debug > log.out
|
|
|
|
$ hg log --debug --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg log --debug -T phases > phases.out
|
|
|
|
$ cmp log.out phases.out || diff -u log.out phases.out
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2015-07-04 11:19:49 +03:00
|
|
|
Default style of working-directory revision should also be the same (but
|
|
|
|
date may change while running tests):
|
|
|
|
|
|
|
|
$ hg log -r 'wdir()' | sed 's|^date:.*|date:|' > log.out
|
|
|
|
$ hg log -r 'wdir()' --style default | sed 's|^date:.*|date:|' > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
|
|
|
|
|
|
|
$ hg log -r 'wdir()' -v | sed 's|^date:.*|date:|' > log.out
|
|
|
|
$ hg log -r 'wdir()' -v --style default | sed 's|^date:.*|date:|' > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
|
|
|
|
|
|
|
$ hg log -r 'wdir()' -q > log.out
|
|
|
|
$ hg log -r 'wdir()' -q --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
|
|
|
|
|
|
|
$ hg log -r 'wdir()' --debug | sed 's|^date:.*|date:|' > log.out
|
|
|
|
$ hg log -r 'wdir()' --debug --style default \
|
|
|
|
> | sed 's|^date:.*|date:|' > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
|
|
|
|
log: rewrite default template to use labels (issue2866)
This is a complete rewrite of the default template to use labels. This
seems ultimately useless to me in most cases. The biggest benefit of
this patch to me seems to be a fairly complicated example of the
templating engine. It was a lot of hard work to figure out the precise
acceptable syntax, since it's almost undocumented. Hat tip to Steve
Losh's smartlog template, which helped me figure out a lot of the
syntax. Hopefully later I can use the present default log template
as an example for documenting the templating engine.
A test is attached. My goal was to match the --color=debug output,
which may differ slightly in newlines from the actual ANSI escape
codes output. I consider this an acceptable invisible deviation.
There seems to be a considerable slowdown with this rewrite.
Before:
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.882s
user 0m0.812s
sys 0m0.064s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.872s
user 0m0.796s
sys 0m0.068s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.917s
user 0m0.836s
sys 0m0.076s
After:
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.480s
user 0m1.392s
sys 0m0.072s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.500s
user 0m1.400s
sys 0m0.088s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.462s
user 0m1.364s
sys 0m0.092s
Following the maxim, "make it work, profile, make it faster, in that
order", I deem this slowdown acceptable for now.
I suspect but have not confirmed that a big slowdown comes from
calling keywords twice in the file templates, once to test the
existence of output and again to actually list the output. If so, a
simple speedup might be to improve the templating engine to cache
keywords when called more than once on the same revision.
TODO: I found a bug while working on this. The following stack traces:
hg log -r . -T '{ifcontains(phase, "secret public", "lol", "omg")}\n'
2014-10-04 03:48:56 +04:00
|
|
|
Default style should also preserve color information (issue2866):
|
|
|
|
|
|
|
|
$ cp $HGRCPATH $HGRCPATH-bak
|
|
|
|
$ cat <<EOF >> $HGRCPATH
|
|
|
|
> [extensions]
|
|
|
|
> color=
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg --color=debug log > log.out
|
|
|
|
$ hg --color=debug log --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg --color=debug log -T phases > phases.out
|
2015-07-21 01:39:15 +03:00
|
|
|
$ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
|
2015-04-24 21:52:12 +03:00
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
|
log: rewrite default template to use labels (issue2866)
This is a complete rewrite of the default template to use labels. This
seems ultimately useless to me in most cases. The biggest benefit of
this patch to me seems to be a fairly complicated example of the
templating engine. It was a lot of hard work to figure out the precise
acceptable syntax, since it's almost undocumented. Hat tip to Steve
Losh's smartlog template, which helped me figure out a lot of the
syntax. Hopefully later I can use the present default log template
as an example for documenting the templating engine.
A test is attached. My goal was to match the --color=debug output,
which may differ slightly in newlines from the actual ANSI escape
codes output. I consider this an acceptable invisible deviation.
There seems to be a considerable slowdown with this rewrite.
Before:
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.882s
user 0m0.812s
sys 0m0.064s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.872s
user 0m0.796s
sys 0m0.068s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.917s
user 0m0.836s
sys 0m0.076s
After:
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.480s
user 0m1.392s
sys 0m0.072s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.500s
user 0m1.400s
sys 0m0.088s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.462s
user 0m1.364s
sys 0m0.092s
Following the maxim, "make it work, profile, make it faster, in that
order", I deem this slowdown acceptable for now.
I suspect but have not confirmed that a big slowdown comes from
calling keywords twice in the file templates, once to test the
existence of output and again to actually list the output. If so, a
simple speedup might be to improve the templating engine to cache
keywords when called more than once on the same revision.
TODO: I found a bug while working on this. The following stack traces:
hg log -r . -T '{ifcontains(phase, "secret public", "lol", "omg")}\n'
2014-10-04 03:48:56 +04:00
|
|
|
$ hg --color=debug -v log > log.out
|
|
|
|
$ hg --color=debug -v log --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg --color=debug -v log -T phases > phases.out
|
2015-07-21 01:39:15 +03:00
|
|
|
$ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
|
2015-04-24 21:52:12 +03:00
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
+[log.phase|phase: draft]
|
|
|
|
|
2015-03-14 16:34:27 +03:00
|
|
|
$ hg --color=debug -q log > log.out
|
|
|
|
$ hg --color=debug -q log --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg --color=debug -q log -T phases > phases.out
|
|
|
|
$ cmp log.out phases.out || diff -u log.out phases.out
|
|
|
|
|
log: rewrite default template to use labels (issue2866)
This is a complete rewrite of the default template to use labels. This
seems ultimately useless to me in most cases. The biggest benefit of
this patch to me seems to be a fairly complicated example of the
templating engine. It was a lot of hard work to figure out the precise
acceptable syntax, since it's almost undocumented. Hat tip to Steve
Losh's smartlog template, which helped me figure out a lot of the
syntax. Hopefully later I can use the present default log template
as an example for documenting the templating engine.
A test is attached. My goal was to match the --color=debug output,
which may differ slightly in newlines from the actual ANSI escape
codes output. I consider this an acceptable invisible deviation.
There seems to be a considerable slowdown with this rewrite.
Before:
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.882s
user 0m0.812s
sys 0m0.064s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.872s
user 0m0.796s
sys 0m0.068s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.917s
user 0m0.836s
sys 0m0.076s
After:
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.480s
user 0m1.392s
sys 0m0.072s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.500s
user 0m1.400s
sys 0m0.088s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.462s
user 0m1.364s
sys 0m0.092s
Following the maxim, "make it work, profile, make it faster, in that
order", I deem this slowdown acceptable for now.
I suspect but have not confirmed that a big slowdown comes from
calling keywords twice in the file templates, once to test the
existence of output and again to actually list the output. If so, a
simple speedup might be to improve the templating engine to cache
keywords when called more than once on the same revision.
TODO: I found a bug while working on this. The following stack traces:
hg log -r . -T '{ifcontains(phase, "secret public", "lol", "omg")}\n'
2014-10-04 03:48:56 +04:00
|
|
|
$ hg --color=debug --debug log > log.out
|
|
|
|
$ hg --color=debug --debug log --style default > style.out
|
|
|
|
$ cmp log.out style.out || diff -u log.out style.out
|
2015-04-24 21:52:12 +03:00
|
|
|
$ hg --color=debug --debug log -T phases > phases.out
|
|
|
|
$ cmp log.out phases.out || diff -u log.out phases.out
|
log: rewrite default template to use labels (issue2866)
This is a complete rewrite of the default template to use labels. This
seems ultimately useless to me in most cases. The biggest benefit of
this patch to me seems to be a fairly complicated example of the
templating engine. It was a lot of hard work to figure out the precise
acceptable syntax, since it's almost undocumented. Hat tip to Steve
Losh's smartlog template, which helped me figure out a lot of the
syntax. Hopefully later I can use the present default log template
as an example for documenting the templating engine.
A test is attached. My goal was to match the --color=debug output,
which may differ slightly in newlines from the actual ANSI escape
codes output. I consider this an acceptable invisible deviation.
There seems to be a considerable slowdown with this rewrite.
Before:
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.882s
user 0m0.812s
sys 0m0.064s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.872s
user 0m0.796s
sys 0m0.068s
$ time hg log -T default -r .~100::. > /dev/null
real 0m0.917s
user 0m0.836s
sys 0m0.076s
After:
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.480s
user 0m1.392s
sys 0m0.072s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.500s
user 0m1.400s
sys 0m0.088s
$ time hg log -T default -r .~100::. > /dev/null
real 0m1.462s
user 0m1.364s
sys 0m0.092s
Following the maxim, "make it work, profile, make it faster, in that
order", I deem this slowdown acceptable for now.
I suspect but have not confirmed that a big slowdown comes from
calling keywords twice in the file templates, once to test the
existence of output and again to actually list the output. If so, a
simple speedup might be to improve the templating engine to cache
keywords when called more than once on the same revision.
TODO: I found a bug while working on this. The following stack traces:
hg log -r . -T '{ifcontains(phase, "secret public", "lol", "omg")}\n'
2014-10-04 03:48:56 +04:00
|
|
|
|
|
|
|
$ mv $HGRCPATH-bak $HGRCPATH
|
|
|
|
|
2015-04-24 21:17:14 +03:00
|
|
|
Remove commit with empty commit message, so as to not pollute further
|
|
|
|
tests.
|
|
|
|
|
2015-03-27 16:12:53 +03:00
|
|
|
$ hg --config extensions.strip= strip -q .
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Revision with no copies (used to print a traceback):
|
|
|
|
|
|
|
|
$ hg tip -v --template '\n'
|
|
|
|
|
|
|
|
|
|
|
|
Compact style works:
|
|
|
|
|
2014-03-09 03:38:50 +04:00
|
|
|
$ hg log -Tcompact
|
2010-09-14 21:31:00 +04:00
|
|
|
8[tip] 95c24699272e 2020-01-01 10:01 +0000 test
|
|
|
|
third
|
|
|
|
|
|
|
|
7:-1 29114dbae42b 1970-01-12 13:46 +0000 user
|
|
|
|
second
|
|
|
|
|
2011-05-02 21:20:29 +04:00
|
|
|
6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person
|
2010-09-14 21:31:00 +04:00
|
|
|
merge
|
|
|
|
|
|
|
|
5:3 13207e5a10d9 1970-01-18 08:40 +0000 person
|
|
|
|
new head
|
|
|
|
|
2011-05-02 21:20:29 +04:00
|
|
|
4 bbe44766e73d 1970-01-17 04:53 +0000 person
|
2010-09-14 21:31:00 +04:00
|
|
|
new branch
|
|
|
|
|
|
|
|
3 10e46f2dcbf4 1970-01-16 01:06 +0000 person
|
|
|
|
no user, no domain
|
|
|
|
|
|
|
|
2 97054abb4ab8 1970-01-14 21:20 +0000 other
|
|
|
|
no person
|
|
|
|
|
|
|
|
1 b608e9d1a3f0 1970-01-13 17:33 +0000 other
|
|
|
|
other 1
|
|
|
|
|
|
|
|
0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user
|
|
|
|
line 1
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log -v --style compact
|
|
|
|
8[tip] 95c24699272e 2020-01-01 10:01 +0000 test
|
|
|
|
third
|
|
|
|
|
|
|
|
7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname>
|
|
|
|
second
|
|
|
|
|
2011-05-02 21:20:29 +04:00
|
|
|
6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person
|
2010-09-14 21:31:00 +04:00
|
|
|
merge
|
|
|
|
|
|
|
|
5:3 13207e5a10d9 1970-01-18 08:40 +0000 person
|
|
|
|
new head
|
|
|
|
|
2011-05-02 21:20:29 +04:00
|
|
|
4 bbe44766e73d 1970-01-17 04:53 +0000 person
|
2010-09-14 21:31:00 +04:00
|
|
|
new branch
|
|
|
|
|
|
|
|
3 10e46f2dcbf4 1970-01-16 01:06 +0000 person
|
|
|
|
no user, no domain
|
|
|
|
|
|
|
|
2 97054abb4ab8 1970-01-14 21:20 +0000 other@place
|
|
|
|
no person
|
|
|
|
|
|
|
|
1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place>
|
|
|
|
other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
|
|
|
|
0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname>
|
|
|
|
line 1
|
|
|
|
line 2
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log --debug --style compact
|
|
|
|
8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test
|
|
|
|
third
|
|
|
|
|
|
|
|
7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname>
|
|
|
|
second
|
|
|
|
|
2011-05-02 21:20:29 +04:00
|
|
|
6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person
|
2010-09-14 21:31:00 +04:00
|
|
|
merge
|
|
|
|
|
|
|
|
5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person
|
|
|
|
new head
|
|
|
|
|
2011-05-02 21:20:29 +04:00
|
|
|
4:3,-1 bbe44766e73d 1970-01-17 04:53 +0000 person
|
2010-09-14 21:31:00 +04:00
|
|
|
new branch
|
|
|
|
|
|
|
|
3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person
|
|
|
|
no user, no domain
|
|
|
|
|
|
|
|
2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place
|
|
|
|
no person
|
|
|
|
|
|
|
|
1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place>
|
|
|
|
other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
|
|
|
|
0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname>
|
|
|
|
line 1
|
|
|
|
line 2
|
|
|
|
|
|
|
|
|
|
|
|
Test xml styles:
|
|
|
|
|
2015-08-27 00:27:14 +03:00
|
|
|
$ hg log --style xml -r 'not all()'
|
|
|
|
<?xml version="1.0"?>
|
|
|
|
<log>
|
|
|
|
</log>
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
$ hg log --style xml
|
|
|
|
<?xml version="1.0"?>
|
|
|
|
<log>
|
|
|
|
<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
|
|
|
|
<tag>tip</tag>
|
|
|
|
<author email="test">test</author>
|
|
|
|
<date>2020-01-01T10:01:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">third</msg>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="user@hostname">User Name</author>
|
|
|
|
<date>1970-01-12T13:46:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">second</msg>
|
|
|
|
</logentry>
|
2011-05-02 21:20:29 +04:00
|
|
|
<logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b">
|
2010-09-14 21:31:00 +04:00
|
|
|
<parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
|
2011-05-02 21:20:29 +04:00
|
|
|
<parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" />
|
2010-09-14 21:31:00 +04:00
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-18T08:40:01+00:00</date>
|
|
|
|
<msg xml:space="preserve">merge</msg>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
|
|
|
|
<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-18T08:40:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">new head</msg>
|
|
|
|
</logentry>
|
2011-05-02 21:20:29 +04:00
|
|
|
<logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74">
|
2010-09-14 21:31:00 +04:00
|
|
|
<branch>foo</branch>
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-17T04:53:20+00:00</date>
|
|
|
|
<msg xml:space="preserve">new branch</msg>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-16T01:06:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">no user, no domain</msg>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
|
|
|
|
<author email="other@place">other</author>
|
|
|
|
<date>1970-01-14T21:20:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">no person</msg>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
|
|
|
|
<author email="other@place">A. N. Other</author>
|
|
|
|
<date>1970-01-13T17:33:20+00:00</date>
|
|
|
|
<msg xml:space="preserve">other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3</msg>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
|
|
|
|
<author email="user@hostname">User Name</author>
|
|
|
|
<date>1970-01-12T13:46:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">line 1
|
|
|
|
line 2</msg>
|
|
|
|
</logentry>
|
|
|
|
</log>
|
|
|
|
|
|
|
|
$ hg log -v --style xml
|
|
|
|
<?xml version="1.0"?>
|
|
|
|
<log>
|
|
|
|
<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
|
|
|
|
<tag>tip</tag>
|
|
|
|
<author email="test">test</author>
|
|
|
|
<date>2020-01-01T10:01:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">third</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">fourth</path>
|
|
|
|
<path action="A">third</path>
|
|
|
|
<path action="R">second</path>
|
|
|
|
</paths>
|
|
|
|
<copies>
|
|
|
|
<copy source="second">fourth</copy>
|
|
|
|
</copies>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="user@hostname">User Name</author>
|
|
|
|
<date>1970-01-12T13:46:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">second</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">second</path>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
2011-05-02 21:20:29 +04:00
|
|
|
<logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b">
|
2010-09-14 21:31:00 +04:00
|
|
|
<parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
|
2011-05-02 21:20:29 +04:00
|
|
|
<parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" />
|
2010-09-14 21:31:00 +04:00
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-18T08:40:01+00:00</date>
|
|
|
|
<msg xml:space="preserve">merge</msg>
|
|
|
|
<paths>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
|
|
|
|
<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-18T08:40:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">new head</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">d</path>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
2011-05-02 21:20:29 +04:00
|
|
|
<logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74">
|
2010-09-14 21:31:00 +04:00
|
|
|
<branch>foo</branch>
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-17T04:53:20+00:00</date>
|
|
|
|
<msg xml:space="preserve">new branch</msg>
|
|
|
|
<paths>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-16T01:06:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">no user, no domain</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="M">c</path>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
|
|
|
|
<author email="other@place">other</author>
|
|
|
|
<date>1970-01-14T21:20:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">no person</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">c</path>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
|
|
|
|
<author email="other@place">A. N. Other</author>
|
|
|
|
<date>1970-01-13T17:33:20+00:00</date>
|
|
|
|
<msg xml:space="preserve">other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">b</path>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
|
|
|
|
<author email="user@hostname">User Name</author>
|
|
|
|
<date>1970-01-12T13:46:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">line 1
|
|
|
|
line 2</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">a</path>
|
|
|
|
</paths>
|
|
|
|
</logentry>
|
|
|
|
</log>
|
|
|
|
|
|
|
|
$ hg log --debug --style xml
|
|
|
|
<?xml version="1.0"?>
|
|
|
|
<log>
|
|
|
|
<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
|
|
|
|
<tag>tip</tag>
|
|
|
|
<parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="test">test</author>
|
|
|
|
<date>2020-01-01T10:01:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">third</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">fourth</path>
|
|
|
|
<path action="A">third</path>
|
|
|
|
<path action="R">second</path>
|
|
|
|
</paths>
|
|
|
|
<copies>
|
|
|
|
<copy source="second">fourth</copy>
|
|
|
|
</copies>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="user@hostname">User Name</author>
|
|
|
|
<date>1970-01-12T13:46:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">second</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">second</path>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
2011-05-02 21:20:29 +04:00
|
|
|
<logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b">
|
2010-09-14 21:31:00 +04:00
|
|
|
<parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
|
2011-05-02 21:20:29 +04:00
|
|
|
<parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" />
|
2010-09-14 21:31:00 +04:00
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-18T08:40:01+00:00</date>
|
|
|
|
<msg xml:space="preserve">merge</msg>
|
|
|
|
<paths>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
|
|
|
|
<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-18T08:40:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">new head</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">d</path>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
2011-05-02 21:20:29 +04:00
|
|
|
<logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74">
|
2010-09-14 21:31:00 +04:00
|
|
|
<branch>foo</branch>
|
|
|
|
<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-17T04:53:20+00:00</date>
|
|
|
|
<msg xml:space="preserve">new branch</msg>
|
|
|
|
<paths>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">foo</extra>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
|
|
|
|
<parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="person">person</author>
|
|
|
|
<date>1970-01-16T01:06:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">no user, no domain</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="M">c</path>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
|
|
|
|
<parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="other@place">other</author>
|
|
|
|
<date>1970-01-14T21:20:00+00:00</date>
|
|
|
|
<msg xml:space="preserve">no person</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">c</path>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
|
|
|
|
<parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="other@place">A. N. Other</author>
|
|
|
|
<date>1970-01-13T17:33:20+00:00</date>
|
|
|
|
<msg xml:space="preserve">other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">b</path>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
|
|
|
<logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
|
|
|
<author email="user@hostname">User Name</author>
|
|
|
|
<date>1970-01-12T13:46:40+00:00</date>
|
|
|
|
<msg xml:space="preserve">line 1
|
|
|
|
line 2</msg>
|
|
|
|
<paths>
|
|
|
|
<path action="A">a</path>
|
|
|
|
</paths>
|
|
|
|
<extra key="branch">default</extra>
|
|
|
|
</logentry>
|
|
|
|
</log>
|
|
|
|
|
|
|
|
|
2014-09-15 22:11:13 +04:00
|
|
|
Test JSON style:
|
|
|
|
|
|
|
|
$ hg log -k nosuch -Tjson
|
|
|
|
[]
|
|
|
|
|
|
|
|
$ hg log -qr . -Tjson
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"rev": 8,
|
|
|
|
"node": "95c24699272ef57d062b8bccc32c878bf841784a"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
$ hg log -vpr . -Tjson --stat
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"rev": 8,
|
|
|
|
"node": "95c24699272ef57d062b8bccc32c878bf841784a",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "test",
|
|
|
|
"date": [1577872860, 0],
|
|
|
|
"desc": "third",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": ["tip"],
|
|
|
|
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
|
|
|
"files": ["fourth", "second", "third"],
|
|
|
|
"diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n",
|
|
|
|
"diff": "diff -r 29114dbae42b -r 95c24699272e fourth\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/fourth\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+second\ndiff -r 29114dbae42b -r 95c24699272e second\n--- a/second\tMon Jan 12 13:46:40 1970 +0000\n+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n@@ -1,1 +0,0 @@\n-second\ndiff -r 29114dbae42b -r 95c24699272e third\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/third\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+third\n"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
2014-11-19 09:13:05 +03:00
|
|
|
honor --git but not format-breaking diffopts
|
|
|
|
$ hg --config diff.noprefix=True log --git -vpr . -Tjson
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"rev": 8,
|
|
|
|
"node": "95c24699272ef57d062b8bccc32c878bf841784a",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "test",
|
|
|
|
"date": [1577872860, 0],
|
|
|
|
"desc": "third",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": ["tip"],
|
|
|
|
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
|
|
|
"files": ["fourth", "second", "third"],
|
|
|
|
"diff": "diff --git a/second b/fourth\nrename from second\nrename to fourth\ndiff --git a/third b/third\nnew file mode 100644\n--- /dev/null\n+++ b/third\n@@ -0,0 +1,1 @@\n+third\n"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
2014-09-15 22:11:13 +04:00
|
|
|
$ hg log -T json
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"rev": 8,
|
|
|
|
"node": "95c24699272ef57d062b8bccc32c878bf841784a",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "test",
|
|
|
|
"date": [1577872860, 0],
|
|
|
|
"desc": "third",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": ["tip"],
|
|
|
|
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 7,
|
|
|
|
"node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "User Name <user@hostname>",
|
|
|
|
"date": [1000000, 0],
|
|
|
|
"desc": "second",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["0000000000000000000000000000000000000000"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 6,
|
|
|
|
"node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1500001, 0],
|
|
|
|
"desc": "merge",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 5,
|
|
|
|
"node": "13207e5a10d9fd28ec424934298e176197f2c67f",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1500000, 0],
|
|
|
|
"desc": "new head",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 4,
|
|
|
|
"node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
|
|
|
|
"branch": "foo",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1400000, 0],
|
|
|
|
"desc": "new branch",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 3,
|
|
|
|
"node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1300000, 0],
|
|
|
|
"desc": "no user, no domain",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["97054abb4ab824450e9164180baf491ae0078465"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 2,
|
|
|
|
"node": "97054abb4ab824450e9164180baf491ae0078465",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "other@place",
|
|
|
|
"date": [1200000, 0],
|
|
|
|
"desc": "no person",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 1,
|
|
|
|
"node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "A. N. Other <other@place>",
|
|
|
|
"date": [1100000, 0],
|
|
|
|
"desc": "other 1\nother 2\n\nother 3",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 0,
|
|
|
|
"node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "User Name <user@hostname>",
|
|
|
|
"date": [1000000, 0],
|
|
|
|
"desc": "line 1\nline 2",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["0000000000000000000000000000000000000000"]
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
$ hg heads -v -Tjson
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"rev": 8,
|
|
|
|
"node": "95c24699272ef57d062b8bccc32c878bf841784a",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "test",
|
|
|
|
"date": [1577872860, 0],
|
|
|
|
"desc": "third",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": ["tip"],
|
|
|
|
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
|
|
|
"files": ["fourth", "second", "third"]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 6,
|
|
|
|
"node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1500001, 0],
|
|
|
|
"desc": "merge",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
|
|
|
|
"files": []
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 4,
|
|
|
|
"node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
|
|
|
|
"branch": "foo",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1400000, 0],
|
|
|
|
"desc": "new branch",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
|
|
|
|
"files": []
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
$ hg log --debug -Tjson
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"rev": 8,
|
|
|
|
"node": "95c24699272ef57d062b8bccc32c878bf841784a",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "test",
|
|
|
|
"date": [1577872860, 0],
|
|
|
|
"desc": "third",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": ["tip"],
|
|
|
|
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
|
|
|
"manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
2015-01-06 09:18:55 +03:00
|
|
|
"added": ["fourth", "third"],
|
|
|
|
"removed": ["second"]
|
2014-09-15 22:11:13 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 7,
|
|
|
|
"node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "User Name <user@hostname>",
|
|
|
|
"date": [1000000, 0],
|
|
|
|
"desc": "second",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["0000000000000000000000000000000000000000"],
|
|
|
|
"manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
2015-01-06 09:18:55 +03:00
|
|
|
"added": ["second"],
|
|
|
|
"removed": []
|
2014-09-15 22:11:13 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 6,
|
|
|
|
"node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1500001, 0],
|
|
|
|
"desc": "merge",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
|
|
|
|
"manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
|
|
|
"added": [],
|
|
|
|
"removed": []
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 5,
|
|
|
|
"node": "13207e5a10d9fd28ec424934298e176197f2c67f",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1500000, 0],
|
|
|
|
"desc": "new head",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
|
|
|
|
"manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
2015-01-06 09:18:55 +03:00
|
|
|
"added": ["d"],
|
|
|
|
"removed": []
|
2014-09-15 22:11:13 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 4,
|
|
|
|
"node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
|
|
|
|
"branch": "foo",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1400000, 0],
|
|
|
|
"desc": "new branch",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
|
|
|
|
"manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc",
|
|
|
|
"extra": {"branch": "foo"},
|
|
|
|
"modified": [],
|
|
|
|
"added": [],
|
|
|
|
"removed": []
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 3,
|
|
|
|
"node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "person",
|
|
|
|
"date": [1300000, 0],
|
|
|
|
"desc": "no user, no domain",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["97054abb4ab824450e9164180baf491ae0078465"],
|
|
|
|
"manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": ["c"],
|
|
|
|
"added": [],
|
|
|
|
"removed": []
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 2,
|
|
|
|
"node": "97054abb4ab824450e9164180baf491ae0078465",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "other@place",
|
|
|
|
"date": [1200000, 0],
|
|
|
|
"desc": "no person",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"],
|
|
|
|
"manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
2015-01-06 09:18:55 +03:00
|
|
|
"added": ["c"],
|
|
|
|
"removed": []
|
2014-09-15 22:11:13 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 1,
|
|
|
|
"node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "A. N. Other <other@place>",
|
|
|
|
"date": [1100000, 0],
|
|
|
|
"desc": "other 1\nother 2\n\nother 3",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"],
|
|
|
|
"manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
2015-01-06 09:18:55 +03:00
|
|
|
"added": ["b"],
|
|
|
|
"removed": []
|
2014-09-15 22:11:13 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"rev": 0,
|
|
|
|
"node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
|
|
|
|
"branch": "default",
|
|
|
|
"phase": "draft",
|
|
|
|
"user": "User Name <user@hostname>",
|
|
|
|
"date": [1000000, 0],
|
|
|
|
"desc": "line 1\nline 2",
|
|
|
|
"bookmarks": [],
|
|
|
|
"tags": [],
|
|
|
|
"parents": ["0000000000000000000000000000000000000000"],
|
|
|
|
"manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0",
|
|
|
|
"extra": {"branch": "default"},
|
|
|
|
"modified": [],
|
2015-01-06 09:18:55 +03:00
|
|
|
"added": ["a"],
|
|
|
|
"removed": []
|
2014-09-15 22:11:13 +04:00
|
|
|
}
|
|
|
|
]
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Error if style not readable:
|
|
|
|
|
2013-11-15 04:07:43 +04:00
|
|
|
#if unix-permissions no-root
|
2010-09-14 21:31:00 +04:00
|
|
|
$ touch q
|
|
|
|
$ chmod 0 q
|
|
|
|
$ hg log --style ./q
|
|
|
|
abort: Permission denied: ./q
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2012-06-11 21:18:36 +04:00
|
|
|
#endif
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
Error if no style:
|
|
|
|
|
|
|
|
$ hg log --style notexist
|
2013-05-03 05:41:22 +04:00
|
|
|
abort: style 'notexist' not found
|
show: new extension for displaying various repository data
Currently, Mercurial has a number of commands to show information. And,
there are features coming down the pipe that will introduce more
commands for showing information.
Currently, when introducing a new class of data or a view that we
wish to expose to the user, the strategy is to introduce a new command
or overload an existing command, sometimes both. For example, there is
a desire to formalize the wip/smartlog/underway/mine functionality that
many have devised. There is also a desire to introduce a "topics"
concept. Others would like views of "the current stack." In the
current model, we'd need a new command for wip/smartlog/etc (that
behaves a lot like a pre-defined alias of `hg log`). For topics,
we'd likely overload `hg topic[s]` to both display and manipulate
topics.
Adding new commands for every pre-defined query doesn't scale well
and pollutes `hg help`. Overloading commands to perform read-only and
write operations is arguably an UX anti-pattern: while having all
functionality for a given concept in one command is nice, having a
single command doing multiple discrete operations is not. Furthermore,
a user may be surprised that a command they thought was read-only
actually changes something.
We discussed this at the Mercurial 4.0 Sprint in Paris and decided that
having a single command where we could hang pre-defined views of
various data would be a good idea. Having such a command would:
* Help prevent an explosion of new query-related commands
* Create a clear separation between read and write operations
(mitigates footguns)
* Avoids overloading the meaning of commands that manipulate data
(bookmark, tag, branch, etc) (while we can't take away the
existing behavior for BC reasons, we now won't introduce this
behavior on new commands)
* Allows users to discover informational views more easily by
aggregating them in a single location
* Lowers the barrier to creating the new views (since the barrier
to creating a top-level command is relatively high)
So, this commit introduces the `hg show` command via the "show"
extension. This command accepts a positional argument of the
"view" to show. New views can be registered with a decorator. To
prove it works, we implement the "bookmarks" view, which shows a
table of bookmarks and their associated nodes.
We introduce a new style to hold everything used by `hg show`.
For our initial bookmarks view, the output varies from `hg bookmarks`:
* Padding is performed in the template itself as opposed to Python
* Revision integers are not shown
* shortest() is used to display a 5 character node by default (as
opposed to static 12 characters)
I chose to implement the "bookmarks" view first because it is simple
and shouldn't invite too much bikeshedding that detracts from the
evaluation of `hg show` itself. But there is an important point
to consider: we now have 2 ways to show a list of bookmarks. I'm not
a fan of introducing multiple ways to do very similar things. So it
might be worth discussing how we wish to tackle this issue for
bookmarks, tags, branches, MQ series, etc.
I also made the choice of explicitly declaring the default show
template not part of the standard BC guarantees. History has shown
that we make mistakes and poor choices with output formatting but
can't fix these mistakes later because random tools are parsing
output and we don't want to break these tools. Optimizing for human
consumption is one of my goals for `hg show`. So, by not covering
the formatting as part of BC, the barrier to future change is much
lower and humans benefit.
There are some improvements that can be made to formatting. For
example, we don't yet use label() in the templates. We obviously
want this for color. But I'm not sure if we should reuse the existing
log.* labels or invent new ones. I figure we can punt that to a
follow-up.
At the aforementioned Sprint, we discussed and discarded various
alternatives to `hg show`.
We considered making `hg log <view>` perform this behavior. The main
reason we can't do this is because a positional argument to `hg log`
can be a file path and if there is a conflict between a path name and
a view name, behavior is ambiguous. We could have introduced
`hg log --view` or similar, but we felt that required too much typing
(we don't want to require a command flag to show a view) and wasn't
very discoverable. Furthermore, `hg log` is optimized for showing
changelog data and there are things that `hg display` could display
that aren't changelog centric.
There were concerns about using "show" as the command name.
Some users already have a "show" alias that is similar to `hg export`.
There were also concerns that Git users adapted to `git show` would
be confused by `hg show`'s different behavior. The main difference
here is `git show` prints an `hg export` like view of the current
commit by default and `hg show` requires an argument. `git show`
can also display any Git object. `git show` does not support
displaying more complex views: just single objects. If we
implemented `hg show <hash>` or `hg show <identifier>`, `hg show`
would be a superset of `git show`. Although, I'm hesitant to do that
at this time because I view `hg show` as a higher-level querying
command and there are namespace collisions between valid identifiers
and registered views.
There is also a prefix collision with `hg showconfig`, which is an
alias of `hg config`.
We also considered `hg view`, but that is already used by the "hgk"
extension.
`hg display` was also proposed at one point. It has a prefix collision
with `hg diff`. General consensus was "show" or "view" are the best
verbs. And since "view" was taken, "show" was chosen.
There are a number of inline TODOs in this patch. Some of these
represent decisions yet to be made. Others represent features
requiring non-trivial complexity. Rather than bloat the patch or
invite additional bikeshedding, I figured I'd document future
enhancements via TODO so we can get a minimal implmentation landed.
Something is better than nothing.
2017-03-25 05:19:00 +03:00
|
|
|
(available styles: bisect, changelog, compact, default, phases, show, status, xml)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2014-07-26 00:35:09 +04:00
|
|
|
$ hg log -T list
|
show: new extension for displaying various repository data
Currently, Mercurial has a number of commands to show information. And,
there are features coming down the pipe that will introduce more
commands for showing information.
Currently, when introducing a new class of data or a view that we
wish to expose to the user, the strategy is to introduce a new command
or overload an existing command, sometimes both. For example, there is
a desire to formalize the wip/smartlog/underway/mine functionality that
many have devised. There is also a desire to introduce a "topics"
concept. Others would like views of "the current stack." In the
current model, we'd need a new command for wip/smartlog/etc (that
behaves a lot like a pre-defined alias of `hg log`). For topics,
we'd likely overload `hg topic[s]` to both display and manipulate
topics.
Adding new commands for every pre-defined query doesn't scale well
and pollutes `hg help`. Overloading commands to perform read-only and
write operations is arguably an UX anti-pattern: while having all
functionality for a given concept in one command is nice, having a
single command doing multiple discrete operations is not. Furthermore,
a user may be surprised that a command they thought was read-only
actually changes something.
We discussed this at the Mercurial 4.0 Sprint in Paris and decided that
having a single command where we could hang pre-defined views of
various data would be a good idea. Having such a command would:
* Help prevent an explosion of new query-related commands
* Create a clear separation between read and write operations
(mitigates footguns)
* Avoids overloading the meaning of commands that manipulate data
(bookmark, tag, branch, etc) (while we can't take away the
existing behavior for BC reasons, we now won't introduce this
behavior on new commands)
* Allows users to discover informational views more easily by
aggregating them in a single location
* Lowers the barrier to creating the new views (since the barrier
to creating a top-level command is relatively high)
So, this commit introduces the `hg show` command via the "show"
extension. This command accepts a positional argument of the
"view" to show. New views can be registered with a decorator. To
prove it works, we implement the "bookmarks" view, which shows a
table of bookmarks and their associated nodes.
We introduce a new style to hold everything used by `hg show`.
For our initial bookmarks view, the output varies from `hg bookmarks`:
* Padding is performed in the template itself as opposed to Python
* Revision integers are not shown
* shortest() is used to display a 5 character node by default (as
opposed to static 12 characters)
I chose to implement the "bookmarks" view first because it is simple
and shouldn't invite too much bikeshedding that detracts from the
evaluation of `hg show` itself. But there is an important point
to consider: we now have 2 ways to show a list of bookmarks. I'm not
a fan of introducing multiple ways to do very similar things. So it
might be worth discussing how we wish to tackle this issue for
bookmarks, tags, branches, MQ series, etc.
I also made the choice of explicitly declaring the default show
template not part of the standard BC guarantees. History has shown
that we make mistakes and poor choices with output formatting but
can't fix these mistakes later because random tools are parsing
output and we don't want to break these tools. Optimizing for human
consumption is one of my goals for `hg show`. So, by not covering
the formatting as part of BC, the barrier to future change is much
lower and humans benefit.
There are some improvements that can be made to formatting. For
example, we don't yet use label() in the templates. We obviously
want this for color. But I'm not sure if we should reuse the existing
log.* labels or invent new ones. I figure we can punt that to a
follow-up.
At the aforementioned Sprint, we discussed and discarded various
alternatives to `hg show`.
We considered making `hg log <view>` perform this behavior. The main
reason we can't do this is because a positional argument to `hg log`
can be a file path and if there is a conflict between a path name and
a view name, behavior is ambiguous. We could have introduced
`hg log --view` or similar, but we felt that required too much typing
(we don't want to require a command flag to show a view) and wasn't
very discoverable. Furthermore, `hg log` is optimized for showing
changelog data and there are things that `hg display` could display
that aren't changelog centric.
There were concerns about using "show" as the command name.
Some users already have a "show" alias that is similar to `hg export`.
There were also concerns that Git users adapted to `git show` would
be confused by `hg show`'s different behavior. The main difference
here is `git show` prints an `hg export` like view of the current
commit by default and `hg show` requires an argument. `git show`
can also display any Git object. `git show` does not support
displaying more complex views: just single objects. If we
implemented `hg show <hash>` or `hg show <identifier>`, `hg show`
would be a superset of `git show`. Although, I'm hesitant to do that
at this time because I view `hg show` as a higher-level querying
command and there are namespace collisions between valid identifiers
and registered views.
There is also a prefix collision with `hg showconfig`, which is an
alias of `hg config`.
We also considered `hg view`, but that is already used by the "hgk"
extension.
`hg display` was also proposed at one point. It has a prefix collision
with `hg diff`. General consensus was "show" or "view" are the best
verbs. And since "view" was taken, "show" was chosen.
There are a number of inline TODOs in this patch. Some of these
represent decisions yet to be made. Others represent features
requiring non-trivial complexity. Rather than bloat the patch or
invite additional bikeshedding, I figured I'd document future
enhancements via TODO so we can get a minimal implmentation landed.
Something is better than nothing.
2017-03-25 05:19:00 +03:00
|
|
|
available styles: bisect, changelog, compact, default, phases, show, status, xml
|
2014-07-26 00:35:09 +04:00
|
|
|
abort: specify a template
|
|
|
|
[255]
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Error if style missing key:
|
|
|
|
|
|
|
|
$ echo 'q = q' > t
|
|
|
|
$ hg log --style ./t
|
2010-12-20 21:09:00 +03:00
|
|
|
abort: "changeset" not in template map
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2012-08-04 16:37:17 +04:00
|
|
|
Error if style missing value:
|
|
|
|
|
|
|
|
$ echo 'changeset =' > t
|
|
|
|
$ hg log --style t
|
2016-03-26 12:01:04 +03:00
|
|
|
hg: parse error at t:1: missing value
|
2012-08-04 16:37:17 +04:00
|
|
|
[255]
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Error if include fails:
|
|
|
|
|
|
|
|
$ echo 'changeset = q' >> t
|
2013-11-15 04:07:43 +04:00
|
|
|
#if unix-permissions no-root
|
2010-09-14 21:31:00 +04:00
|
|
|
$ hg log --style ./t
|
|
|
|
abort: template file ./q: Permission denied
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2016-02-05 16:32:05 +03:00
|
|
|
$ rm -f q
|
2012-06-11 21:18:36 +04:00
|
|
|
#endif
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
Include works:
|
|
|
|
|
|
|
|
$ echo '{rev}' > q
|
|
|
|
$ hg log --style ./t
|
|
|
|
8
|
|
|
|
7
|
|
|
|
6
|
|
|
|
5
|
|
|
|
4
|
|
|
|
3
|
|
|
|
2
|
|
|
|
1
|
|
|
|
0
|
|
|
|
|
2015-07-22 17:29:41 +03:00
|
|
|
Check that recursive reference does not fall into RuntimeError (issue4758):
|
|
|
|
|
|
|
|
common mistake:
|
|
|
|
|
2017-05-06 11:41:05 +03:00
|
|
|
$ cat << EOF > issue4758
|
|
|
|
> changeset = '{changeset}\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log --style ./issue4758
|
2015-07-22 17:29:41 +03:00
|
|
|
abort: recursive reference 'changeset' in template
|
|
|
|
[255]
|
|
|
|
|
|
|
|
circular reference:
|
|
|
|
|
|
|
|
$ cat << EOF > issue4758
|
|
|
|
> changeset = '{foo}'
|
|
|
|
> foo = '{changeset}'
|
|
|
|
> EOF
|
|
|
|
$ hg log --style ./issue4758
|
|
|
|
abort: recursive reference 'foo' in template
|
|
|
|
[255]
|
|
|
|
|
2015-07-23 17:41:29 +03:00
|
|
|
buildmap() -> gettemplate(), where no thunk was made:
|
|
|
|
|
2017-05-06 11:41:05 +03:00
|
|
|
$ cat << EOF > issue4758
|
|
|
|
> changeset = '{files % changeset}\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log --style ./issue4758
|
2015-07-23 17:41:29 +03:00
|
|
|
abort: recursive reference 'changeset' in template
|
|
|
|
[255]
|
|
|
|
|
2015-07-22 17:29:41 +03:00
|
|
|
not a recursion if a keyword of the same name exists:
|
|
|
|
|
|
|
|
$ cat << EOF > issue4758
|
|
|
|
> changeset = '{tags % rev}'
|
|
|
|
> rev = '{rev} {tag}\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log --style ./issue4758 -r tip
|
|
|
|
8 tip
|
|
|
|
|
2014-10-04 06:03:31 +04:00
|
|
|
Check that {phase} works correctly on parents:
|
|
|
|
|
|
|
|
$ cat << EOF > parentphase
|
|
|
|
> changeset_debug = '{rev} ({phase}):{parents}\n'
|
|
|
|
> parent = ' {rev} ({phase})'
|
|
|
|
> EOF
|
|
|
|
$ hg phase -r 5 --public
|
|
|
|
$ hg phase -r 7 --secret --force
|
|
|
|
$ hg log --debug -G --style ./parentphase
|
|
|
|
@ 8 (secret): 7 (secret) -1 (public)
|
|
|
|
|
|
|
|
|
o 7 (secret): -1 (public) -1 (public)
|
|
|
|
|
|
|
|
o 6 (draft): 5 (public) 4 (draft)
|
|
|
|
|\
|
|
|
|
| o 5 (public): 3 (public) -1 (public)
|
|
|
|
| |
|
|
|
|
o | 4 (draft): 3 (public) -1 (public)
|
|
|
|
|/
|
|
|
|
o 3 (public): 2 (public) -1 (public)
|
|
|
|
|
|
|
|
|
o 2 (public): 1 (public) -1 (public)
|
|
|
|
|
|
|
|
|
o 1 (public): 0 (public) -1 (public)
|
|
|
|
|
|
|
|
|
o 0 (public): -1 (public) -1 (public)
|
|
|
|
|
|
|
|
|
2013-09-22 13:52:18 +04:00
|
|
|
Missing non-standard names give no error (backward compatibility):
|
|
|
|
|
|
|
|
$ echo "changeset = '{c}'" > t
|
|
|
|
$ hg log --style ./t
|
|
|
|
|
|
|
|
Defining non-standard name works:
|
|
|
|
|
|
|
|
$ cat <<EOF > t
|
|
|
|
> changeset = '{c}'
|
|
|
|
> c = q
|
|
|
|
> EOF
|
|
|
|
$ hg log --style ./t
|
|
|
|
8
|
|
|
|
7
|
|
|
|
6
|
|
|
|
5
|
|
|
|
4
|
|
|
|
3
|
|
|
|
2
|
|
|
|
1
|
|
|
|
0
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
ui.style works:
|
|
|
|
|
|
|
|
$ echo '[ui]' > .hg/hgrc
|
|
|
|
$ echo 'style = t' >> .hg/hgrc
|
|
|
|
$ hg log
|
|
|
|
8
|
|
|
|
7
|
|
|
|
6
|
|
|
|
5
|
|
|
|
4
|
|
|
|
3
|
|
|
|
2
|
|
|
|
1
|
|
|
|
0
|
|
|
|
|
|
|
|
|
|
|
|
Issue338:
|
|
|
|
|
|
|
|
$ hg log --style=changelog > changelog
|
|
|
|
|
|
|
|
$ cat changelog
|
|
|
|
2020-01-01 test <test>
|
|
|
|
|
|
|
|
* fourth, second, third:
|
|
|
|
third
|
|
|
|
[95c24699272e] [tip]
|
|
|
|
|
|
|
|
1970-01-12 User Name <user@hostname>
|
|
|
|
|
|
|
|
* second:
|
|
|
|
second
|
|
|
|
[29114dbae42b]
|
|
|
|
|
|
|
|
1970-01-18 person <person>
|
|
|
|
|
|
|
|
* merge
|
2011-05-02 21:20:29 +04:00
|
|
|
[d41e714fe50d]
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
* d:
|
|
|
|
new head
|
|
|
|
[13207e5a10d9]
|
|
|
|
|
|
|
|
1970-01-17 person <person>
|
|
|
|
|
|
|
|
* new branch
|
2011-05-02 21:20:29 +04:00
|
|
|
[bbe44766e73d] <foo>
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
1970-01-16 person <person>
|
|
|
|
|
|
|
|
* c:
|
|
|
|
no user, no domain
|
|
|
|
[10e46f2dcbf4]
|
|
|
|
|
|
|
|
1970-01-14 other <other@place>
|
|
|
|
|
|
|
|
* c:
|
|
|
|
no person
|
|
|
|
[97054abb4ab8]
|
|
|
|
|
|
|
|
1970-01-13 A. N. Other <other@place>
|
|
|
|
|
|
|
|
* b:
|
|
|
|
other 1 other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
[b608e9d1a3f0]
|
|
|
|
|
|
|
|
1970-01-12 User Name <user@hostname>
|
|
|
|
|
|
|
|
* a:
|
|
|
|
line 1 line 2
|
|
|
|
[1e4e1b8f71e0]
|
|
|
|
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue2130: xml output for 'hg heads' is malformed
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
$ hg heads --style changelog
|
|
|
|
2020-01-01 test <test>
|
|
|
|
|
|
|
|
* fourth, second, third:
|
|
|
|
third
|
|
|
|
[95c24699272e] [tip]
|
|
|
|
|
|
|
|
1970-01-18 person <person>
|
|
|
|
|
|
|
|
* merge
|
2011-05-02 21:20:29 +04:00
|
|
|
[d41e714fe50d]
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
1970-01-17 person <person>
|
|
|
|
|
|
|
|
* new branch
|
2011-05-02 21:20:29 +04:00
|
|
|
[bbe44766e73d] <foo>
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
|
|
|
|
Keys work:
|
|
|
|
|
2010-12-13 18:30:15 +03:00
|
|
|
$ for key in author branch branches date desc file_adds file_dels file_mods \
|
2010-09-14 21:31:00 +04:00
|
|
|
> file_copies file_copies_switch files \
|
2012-07-10 19:43:32 +04:00
|
|
|
> manifest node parents rev tags diffstat extras \
|
|
|
|
> p1rev p2rev p1node p2node; do
|
2010-09-14 21:31:00 +04:00
|
|
|
> for mode in '' --verbose --debug; do
|
|
|
|
> hg log $mode --template "$key$mode: {$key}\n"
|
|
|
|
> done
|
|
|
|
> done
|
|
|
|
author: test
|
|
|
|
author: User Name <user@hostname>
|
|
|
|
author: person
|
|
|
|
author: person
|
|
|
|
author: person
|
|
|
|
author: person
|
|
|
|
author: other@place
|
|
|
|
author: A. N. Other <other@place>
|
|
|
|
author: User Name <user@hostname>
|
|
|
|
author--verbose: test
|
|
|
|
author--verbose: User Name <user@hostname>
|
|
|
|
author--verbose: person
|
|
|
|
author--verbose: person
|
|
|
|
author--verbose: person
|
|
|
|
author--verbose: person
|
|
|
|
author--verbose: other@place
|
|
|
|
author--verbose: A. N. Other <other@place>
|
|
|
|
author--verbose: User Name <user@hostname>
|
|
|
|
author--debug: test
|
|
|
|
author--debug: User Name <user@hostname>
|
|
|
|
author--debug: person
|
|
|
|
author--debug: person
|
|
|
|
author--debug: person
|
|
|
|
author--debug: person
|
|
|
|
author--debug: other@place
|
|
|
|
author--debug: A. N. Other <other@place>
|
|
|
|
author--debug: User Name <user@hostname>
|
2010-12-13 18:30:15 +03:00
|
|
|
branch: default
|
|
|
|
branch: default
|
|
|
|
branch: default
|
|
|
|
branch: default
|
|
|
|
branch: foo
|
|
|
|
branch: default
|
|
|
|
branch: default
|
|
|
|
branch: default
|
|
|
|
branch: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: foo
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--verbose: default
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: foo
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: default
|
|
|
|
branch--debug: default
|
2010-09-14 21:31:00 +04:00
|
|
|
branches:
|
|
|
|
branches:
|
|
|
|
branches:
|
|
|
|
branches:
|
|
|
|
branches: foo
|
|
|
|
branches:
|
|
|
|
branches:
|
|
|
|
branches:
|
|
|
|
branches:
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose: foo
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose:
|
|
|
|
branches--verbose:
|
|
|
|
branches--debug:
|
|
|
|
branches--debug:
|
|
|
|
branches--debug:
|
|
|
|
branches--debug:
|
|
|
|
branches--debug: foo
|
|
|
|
branches--debug:
|
|
|
|
branches--debug:
|
|
|
|
branches--debug:
|
|
|
|
branches--debug:
|
|
|
|
date: 1577872860.00
|
|
|
|
date: 1000000.00
|
|
|
|
date: 1500001.00
|
|
|
|
date: 1500000.00
|
|
|
|
date: 1400000.00
|
|
|
|
date: 1300000.00
|
|
|
|
date: 1200000.00
|
|
|
|
date: 1100000.00
|
|
|
|
date: 1000000.00
|
|
|
|
date--verbose: 1577872860.00
|
|
|
|
date--verbose: 1000000.00
|
|
|
|
date--verbose: 1500001.00
|
|
|
|
date--verbose: 1500000.00
|
|
|
|
date--verbose: 1400000.00
|
|
|
|
date--verbose: 1300000.00
|
|
|
|
date--verbose: 1200000.00
|
|
|
|
date--verbose: 1100000.00
|
|
|
|
date--verbose: 1000000.00
|
|
|
|
date--debug: 1577872860.00
|
|
|
|
date--debug: 1000000.00
|
|
|
|
date--debug: 1500001.00
|
|
|
|
date--debug: 1500000.00
|
|
|
|
date--debug: 1400000.00
|
|
|
|
date--debug: 1300000.00
|
|
|
|
date--debug: 1200000.00
|
|
|
|
date--debug: 1100000.00
|
|
|
|
date--debug: 1000000.00
|
|
|
|
desc: third
|
|
|
|
desc: second
|
|
|
|
desc: merge
|
|
|
|
desc: new head
|
|
|
|
desc: new branch
|
|
|
|
desc: no user, no domain
|
|
|
|
desc: no person
|
|
|
|
desc: other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
desc: line 1
|
|
|
|
line 2
|
|
|
|
desc--verbose: third
|
|
|
|
desc--verbose: second
|
|
|
|
desc--verbose: merge
|
|
|
|
desc--verbose: new head
|
|
|
|
desc--verbose: new branch
|
|
|
|
desc--verbose: no user, no domain
|
|
|
|
desc--verbose: no person
|
|
|
|
desc--verbose: other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
desc--verbose: line 1
|
|
|
|
line 2
|
|
|
|
desc--debug: third
|
|
|
|
desc--debug: second
|
|
|
|
desc--debug: merge
|
|
|
|
desc--debug: new head
|
|
|
|
desc--debug: new branch
|
|
|
|
desc--debug: no user, no domain
|
|
|
|
desc--debug: no person
|
|
|
|
desc--debug: other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
desc--debug: line 1
|
|
|
|
line 2
|
|
|
|
file_adds: fourth third
|
|
|
|
file_adds: second
|
|
|
|
file_adds:
|
|
|
|
file_adds: d
|
|
|
|
file_adds:
|
|
|
|
file_adds:
|
|
|
|
file_adds: c
|
|
|
|
file_adds: b
|
|
|
|
file_adds: a
|
|
|
|
file_adds--verbose: fourth third
|
|
|
|
file_adds--verbose: second
|
|
|
|
file_adds--verbose:
|
|
|
|
file_adds--verbose: d
|
|
|
|
file_adds--verbose:
|
|
|
|
file_adds--verbose:
|
|
|
|
file_adds--verbose: c
|
|
|
|
file_adds--verbose: b
|
|
|
|
file_adds--verbose: a
|
|
|
|
file_adds--debug: fourth third
|
|
|
|
file_adds--debug: second
|
|
|
|
file_adds--debug:
|
|
|
|
file_adds--debug: d
|
|
|
|
file_adds--debug:
|
|
|
|
file_adds--debug:
|
|
|
|
file_adds--debug: c
|
|
|
|
file_adds--debug: b
|
|
|
|
file_adds--debug: a
|
|
|
|
file_dels: second
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels:
|
|
|
|
file_dels--verbose: second
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--verbose:
|
|
|
|
file_dels--debug: second
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_dels--debug:
|
|
|
|
file_mods:
|
|
|
|
file_mods:
|
|
|
|
file_mods:
|
|
|
|
file_mods:
|
|
|
|
file_mods:
|
|
|
|
file_mods: c
|
|
|
|
file_mods:
|
|
|
|
file_mods:
|
|
|
|
file_mods:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose: c
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--verbose:
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug: c
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug:
|
|
|
|
file_mods--debug:
|
|
|
|
file_copies: fourth (second)
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies:
|
|
|
|
file_copies--verbose: fourth (second)
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--verbose:
|
|
|
|
file_copies--debug: fourth (second)
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies--debug:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--verbose:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
file_copies_switch--debug:
|
|
|
|
files: fourth second third
|
|
|
|
files: second
|
|
|
|
files:
|
|
|
|
files: d
|
|
|
|
files:
|
|
|
|
files: c
|
|
|
|
files: c
|
|
|
|
files: b
|
|
|
|
files: a
|
|
|
|
files--verbose: fourth second third
|
|
|
|
files--verbose: second
|
|
|
|
files--verbose:
|
|
|
|
files--verbose: d
|
|
|
|
files--verbose:
|
|
|
|
files--verbose: c
|
|
|
|
files--verbose: c
|
|
|
|
files--verbose: b
|
|
|
|
files--verbose: a
|
|
|
|
files--debug: fourth second third
|
|
|
|
files--debug: second
|
|
|
|
files--debug:
|
|
|
|
files--debug: d
|
|
|
|
files--debug:
|
|
|
|
files--debug: c
|
|
|
|
files--debug: c
|
|
|
|
files--debug: b
|
|
|
|
files--debug: a
|
2011-05-02 21:20:29 +04:00
|
|
|
manifest: 6:94961b75a2da
|
|
|
|
manifest: 5:f2dbc354b94e
|
|
|
|
manifest: 4:4dc3def4f9b4
|
|
|
|
manifest: 4:4dc3def4f9b4
|
|
|
|
manifest: 3:cb5a1327723b
|
2010-09-14 21:31:00 +04:00
|
|
|
manifest: 3:cb5a1327723b
|
|
|
|
manifest: 2:6e0e82995c35
|
|
|
|
manifest: 1:4e8d705b1e53
|
|
|
|
manifest: 0:a0c8bcbbb45c
|
2011-05-02 21:20:29 +04:00
|
|
|
manifest--verbose: 6:94961b75a2da
|
|
|
|
manifest--verbose: 5:f2dbc354b94e
|
|
|
|
manifest--verbose: 4:4dc3def4f9b4
|
|
|
|
manifest--verbose: 4:4dc3def4f9b4
|
|
|
|
manifest--verbose: 3:cb5a1327723b
|
2010-09-14 21:31:00 +04:00
|
|
|
manifest--verbose: 3:cb5a1327723b
|
|
|
|
manifest--verbose: 2:6e0e82995c35
|
|
|
|
manifest--verbose: 1:4e8d705b1e53
|
|
|
|
manifest--verbose: 0:a0c8bcbbb45c
|
2011-05-02 21:20:29 +04:00
|
|
|
manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64
|
|
|
|
manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
|
|
|
|
manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
|
|
|
|
manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
|
|
|
|
manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
|
2010-09-14 21:31:00 +04:00
|
|
|
manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
|
|
|
|
manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
|
|
|
|
manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
|
|
|
|
manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
|
|
|
|
node: 95c24699272ef57d062b8bccc32c878bf841784a
|
|
|
|
node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
|
2011-05-02 21:20:29 +04:00
|
|
|
node: d41e714fe50d9e4a5f11b4d595d543481b5f980b
|
2010-09-14 21:31:00 +04:00
|
|
|
node: 13207e5a10d9fd28ec424934298e176197f2c67f
|
2011-05-02 21:20:29 +04:00
|
|
|
node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
2010-09-14 21:31:00 +04:00
|
|
|
node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
node: 97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
node: 1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
|
|
|
|
node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
|
2011-05-02 21:20:29 +04:00
|
|
|
node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b
|
2010-09-14 21:31:00 +04:00
|
|
|
node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
|
2011-05-02 21:20:29 +04:00
|
|
|
node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
2010-09-14 21:31:00 +04:00
|
|
|
node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
node--verbose: 97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
|
|
|
|
node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
|
2011-05-02 21:20:29 +04:00
|
|
|
node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b
|
2010-09-14 21:31:00 +04:00
|
|
|
node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
|
2011-05-02 21:20:29 +04:00
|
|
|
node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
2010-09-14 21:31:00 +04:00
|
|
|
node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
node--debug: 97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
parents:
|
|
|
|
parents: -1:000000000000
|
2011-05-02 21:20:29 +04:00
|
|
|
parents: 5:13207e5a10d9 4:bbe44766e73d
|
2010-09-14 21:31:00 +04:00
|
|
|
parents: 3:10e46f2dcbf4
|
|
|
|
parents:
|
|
|
|
parents:
|
|
|
|
parents:
|
|
|
|
parents:
|
|
|
|
parents:
|
|
|
|
parents--verbose:
|
|
|
|
parents--verbose: -1:000000000000
|
2011-05-02 21:20:29 +04:00
|
|
|
parents--verbose: 5:13207e5a10d9 4:bbe44766e73d
|
2010-09-14 21:31:00 +04:00
|
|
|
parents--verbose: 3:10e46f2dcbf4
|
|
|
|
parents--verbose:
|
|
|
|
parents--verbose:
|
|
|
|
parents--verbose:
|
|
|
|
parents--verbose:
|
|
|
|
parents--verbose:
|
|
|
|
parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000
|
|
|
|
parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
|
2011-05-02 21:20:29 +04:00
|
|
|
parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
2010-09-14 21:31:00 +04:00
|
|
|
parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
|
|
|
|
parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
|
|
|
|
parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000
|
|
|
|
parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000
|
|
|
|
parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000
|
|
|
|
parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
|
|
|
|
rev: 8
|
|
|
|
rev: 7
|
|
|
|
rev: 6
|
|
|
|
rev: 5
|
|
|
|
rev: 4
|
|
|
|
rev: 3
|
|
|
|
rev: 2
|
|
|
|
rev: 1
|
|
|
|
rev: 0
|
|
|
|
rev--verbose: 8
|
|
|
|
rev--verbose: 7
|
|
|
|
rev--verbose: 6
|
|
|
|
rev--verbose: 5
|
|
|
|
rev--verbose: 4
|
|
|
|
rev--verbose: 3
|
|
|
|
rev--verbose: 2
|
|
|
|
rev--verbose: 1
|
|
|
|
rev--verbose: 0
|
|
|
|
rev--debug: 8
|
|
|
|
rev--debug: 7
|
|
|
|
rev--debug: 6
|
|
|
|
rev--debug: 5
|
|
|
|
rev--debug: 4
|
|
|
|
rev--debug: 3
|
|
|
|
rev--debug: 2
|
|
|
|
rev--debug: 1
|
|
|
|
rev--debug: 0
|
|
|
|
tags: tip
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags:
|
|
|
|
tags--verbose: tip
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--verbose:
|
|
|
|
tags--debug: tip
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
tags--debug:
|
|
|
|
diffstat: 3: +2/-1
|
|
|
|
diffstat: 1: +1/-0
|
|
|
|
diffstat: 0: +0/-0
|
|
|
|
diffstat: 1: +1/-0
|
|
|
|
diffstat: 0: +0/-0
|
|
|
|
diffstat: 1: +1/-0
|
|
|
|
diffstat: 1: +4/-0
|
|
|
|
diffstat: 1: +2/-0
|
|
|
|
diffstat: 1: +1/-0
|
|
|
|
diffstat--verbose: 3: +2/-1
|
|
|
|
diffstat--verbose: 1: +1/-0
|
|
|
|
diffstat--verbose: 0: +0/-0
|
|
|
|
diffstat--verbose: 1: +1/-0
|
|
|
|
diffstat--verbose: 0: +0/-0
|
|
|
|
diffstat--verbose: 1: +1/-0
|
|
|
|
diffstat--verbose: 1: +4/-0
|
|
|
|
diffstat--verbose: 1: +2/-0
|
|
|
|
diffstat--verbose: 1: +1/-0
|
|
|
|
diffstat--debug: 3: +2/-1
|
|
|
|
diffstat--debug: 1: +1/-0
|
|
|
|
diffstat--debug: 0: +0/-0
|
|
|
|
diffstat--debug: 1: +1/-0
|
|
|
|
diffstat--debug: 0: +0/-0
|
|
|
|
diffstat--debug: 1: +1/-0
|
|
|
|
diffstat--debug: 1: +4/-0
|
|
|
|
diffstat--debug: 1: +2/-0
|
|
|
|
diffstat--debug: 1: +1/-0
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=foo
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=default
|
|
|
|
extras: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=foo
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--verbose: branch=default
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=foo
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=default
|
|
|
|
extras--debug: branch=default
|
2012-07-10 19:43:32 +04:00
|
|
|
p1rev: 7
|
|
|
|
p1rev: -1
|
|
|
|
p1rev: 5
|
|
|
|
p1rev: 3
|
|
|
|
p1rev: 3
|
|
|
|
p1rev: 2
|
|
|
|
p1rev: 1
|
|
|
|
p1rev: 0
|
|
|
|
p1rev: -1
|
|
|
|
p1rev--verbose: 7
|
|
|
|
p1rev--verbose: -1
|
|
|
|
p1rev--verbose: 5
|
|
|
|
p1rev--verbose: 3
|
|
|
|
p1rev--verbose: 3
|
|
|
|
p1rev--verbose: 2
|
|
|
|
p1rev--verbose: 1
|
|
|
|
p1rev--verbose: 0
|
|
|
|
p1rev--verbose: -1
|
|
|
|
p1rev--debug: 7
|
|
|
|
p1rev--debug: -1
|
|
|
|
p1rev--debug: 5
|
|
|
|
p1rev--debug: 3
|
|
|
|
p1rev--debug: 3
|
|
|
|
p1rev--debug: 2
|
|
|
|
p1rev--debug: 1
|
|
|
|
p1rev--debug: 0
|
|
|
|
p1rev--debug: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: 4
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: 4
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--verbose: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: 4
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p2rev--debug: -1
|
|
|
|
p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
|
|
|
|
p1node: 0000000000000000000000000000000000000000
|
|
|
|
p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
|
|
|
|
p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
p1node: 97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
p1node: 0000000000000000000000000000000000000000
|
|
|
|
p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
|
|
|
|
p1node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
|
|
|
|
p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
p1node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
|
|
|
|
p1node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
|
|
|
|
p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
p1node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--verbose: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
|
|
|
p2node--debug: 0000000000000000000000000000000000000000
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
Filters work:
|
|
|
|
|
|
|
|
$ hg log --template '{author|domain}\n'
|
|
|
|
|
|
|
|
hostname
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
place
|
|
|
|
place
|
|
|
|
hostname
|
|
|
|
|
|
|
|
$ hg log --template '{author|person}\n'
|
|
|
|
test
|
|
|
|
User Name
|
|
|
|
person
|
|
|
|
person
|
|
|
|
person
|
|
|
|
person
|
|
|
|
other
|
|
|
|
A. N. Other
|
|
|
|
User Name
|
|
|
|
|
|
|
|
$ hg log --template '{author|user}\n'
|
|
|
|
test
|
|
|
|
user
|
|
|
|
person
|
|
|
|
person
|
|
|
|
person
|
|
|
|
person
|
|
|
|
other
|
|
|
|
other
|
|
|
|
user
|
|
|
|
|
|
|
|
$ hg log --template '{date|date}\n'
|
|
|
|
Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
Sun Jan 18 08:40:01 1970 +0000
|
|
|
|
Sun Jan 18 08:40:00 1970 +0000
|
|
|
|
Sat Jan 17 04:53:20 1970 +0000
|
|
|
|
Fri Jan 16 01:06:40 1970 +0000
|
|
|
|
Wed Jan 14 21:20:00 1970 +0000
|
|
|
|
Tue Jan 13 17:33:20 1970 +0000
|
|
|
|
Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
|
|
|
|
$ hg log --template '{date|isodate}\n'
|
|
|
|
2020-01-01 10:01 +0000
|
|
|
|
1970-01-12 13:46 +0000
|
|
|
|
1970-01-18 08:40 +0000
|
|
|
|
1970-01-18 08:40 +0000
|
|
|
|
1970-01-17 04:53 +0000
|
|
|
|
1970-01-16 01:06 +0000
|
|
|
|
1970-01-14 21:20 +0000
|
|
|
|
1970-01-13 17:33 +0000
|
|
|
|
1970-01-12 13:46 +0000
|
|
|
|
|
|
|
|
$ hg log --template '{date|isodatesec}\n'
|
|
|
|
2020-01-01 10:01:00 +0000
|
|
|
|
1970-01-12 13:46:40 +0000
|
|
|
|
1970-01-18 08:40:01 +0000
|
|
|
|
1970-01-18 08:40:00 +0000
|
|
|
|
1970-01-17 04:53:20 +0000
|
|
|
|
1970-01-16 01:06:40 +0000
|
|
|
|
1970-01-14 21:20:00 +0000
|
|
|
|
1970-01-13 17:33:20 +0000
|
|
|
|
1970-01-12 13:46:40 +0000
|
|
|
|
|
|
|
|
$ hg log --template '{date|rfc822date}\n'
|
|
|
|
Wed, 01 Jan 2020 10:01:00 +0000
|
|
|
|
Mon, 12 Jan 1970 13:46:40 +0000
|
|
|
|
Sun, 18 Jan 1970 08:40:01 +0000
|
|
|
|
Sun, 18 Jan 1970 08:40:00 +0000
|
|
|
|
Sat, 17 Jan 1970 04:53:20 +0000
|
|
|
|
Fri, 16 Jan 1970 01:06:40 +0000
|
|
|
|
Wed, 14 Jan 1970 21:20:00 +0000
|
|
|
|
Tue, 13 Jan 1970 17:33:20 +0000
|
|
|
|
Mon, 12 Jan 1970 13:46:40 +0000
|
|
|
|
|
|
|
|
$ hg log --template '{desc|firstline}\n'
|
|
|
|
third
|
|
|
|
second
|
|
|
|
merge
|
|
|
|
new head
|
|
|
|
new branch
|
|
|
|
no user, no domain
|
|
|
|
no person
|
|
|
|
other 1
|
|
|
|
line 1
|
|
|
|
|
|
|
|
$ hg log --template '{node|short}\n'
|
|
|
|
95c24699272e
|
|
|
|
29114dbae42b
|
2011-05-02 21:20:29 +04:00
|
|
|
d41e714fe50d
|
2010-09-14 21:31:00 +04:00
|
|
|
13207e5a10d9
|
2011-05-02 21:20:29 +04:00
|
|
|
bbe44766e73d
|
2010-09-14 21:31:00 +04:00
|
|
|
10e46f2dcbf4
|
|
|
|
97054abb4ab8
|
|
|
|
b608e9d1a3f0
|
|
|
|
1e4e1b8f71e0
|
|
|
|
|
|
|
|
$ hg log --template '<changeset author="{author|xmlescape}"/>\n'
|
|
|
|
<changeset author="test"/>
|
|
|
|
<changeset author="User Name <user@hostname>"/>
|
|
|
|
<changeset author="person"/>
|
|
|
|
<changeset author="person"/>
|
|
|
|
<changeset author="person"/>
|
|
|
|
<changeset author="person"/>
|
|
|
|
<changeset author="other@place"/>
|
|
|
|
<changeset author="A. N. Other <other@place>"/>
|
|
|
|
<changeset author="User Name <user@hostname>"/>
|
|
|
|
|
|
|
|
$ hg log --template '{rev}: {children}\n'
|
|
|
|
8:
|
|
|
|
7: 8:95c24699272e
|
|
|
|
6:
|
2011-05-02 21:20:29 +04:00
|
|
|
5: 6:d41e714fe50d
|
|
|
|
4: 6:d41e714fe50d
|
|
|
|
3: 4:bbe44766e73d 5:13207e5a10d9
|
2010-09-14 21:31:00 +04:00
|
|
|
2: 3:10e46f2dcbf4
|
|
|
|
1: 2:97054abb4ab8
|
|
|
|
0: 1:b608e9d1a3f0
|
|
|
|
|
|
|
|
Formatnode filter works:
|
|
|
|
|
|
|
|
$ hg -q log -r 0 --template '{node|formatnode}\n'
|
|
|
|
1e4e1b8f71e0
|
|
|
|
|
|
|
|
$ hg log -r 0 --template '{node|formatnode}\n'
|
|
|
|
1e4e1b8f71e0
|
|
|
|
|
|
|
|
$ hg -v log -r 0 --template '{node|formatnode}\n'
|
|
|
|
1e4e1b8f71e0
|
|
|
|
|
|
|
|
$ hg --debug log -r 0 --template '{node|formatnode}\n'
|
|
|
|
1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
|
2012-01-11 18:18:20 +04:00
|
|
|
Age filter:
|
|
|
|
|
2015-05-12 20:33:42 +03:00
|
|
|
$ hg init unstable-hash
|
|
|
|
$ cd unstable-hash
|
2012-01-11 18:18:20 +04:00
|
|
|
$ hg log --template '{date|age}\n' > /dev/null || exit 1
|
|
|
|
|
2017-08-22 22:49:54 +03:00
|
|
|
>>> from __future__ import absolute_import
|
|
|
|
>>> import datetime
|
2012-01-11 18:18:20 +04:00
|
|
|
>>> fp = open('a', 'w')
|
2017-08-22 22:49:54 +03:00
|
|
|
>>> n = datetime.datetime.now() + datetime.timedelta(366 * 7)
|
2013-01-02 16:59:07 +04:00
|
|
|
>>> fp.write('%d-%d-%d 00:00' % (n.year, n.month, n.day))
|
2012-01-11 18:18:20 +04:00
|
|
|
>>> fp.close()
|
|
|
|
$ hg add a
|
|
|
|
$ hg commit -m future -d "`cat a`"
|
|
|
|
|
2012-08-08 20:10:16 +04:00
|
|
|
$ hg log -l1 --template '{date|age}\n'
|
2012-01-11 18:18:20 +04:00
|
|
|
7 years from now
|
|
|
|
|
2015-05-12 20:33:42 +03:00
|
|
|
$ cd ..
|
|
|
|
$ rm -rf unstable-hash
|
|
|
|
|
|
|
|
Add a dummy commit to make up for the instability of the above:
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg add a
|
|
|
|
$ hg ci -m future
|
|
|
|
|
templater: add count template filter, plus tests
Previously there was no way of telling how much children or bookmarks or tags a
certain changeset has in a template. It was possible to tell if a changeset has
either 0 or not 0 bookmarks, but not to tell if it has 1 or 2 of them, for
example.
This filter, simply named count, makes it possible to count the number of items
in a list or the length of a string (or, anything that python's len can count).
E.g.: {children|count}, {bookmarks|count}, {file_adds|count}.
Testing the filter on node hash and shortened node hash is chosen because they
both have defined length.
As for lists of strings - children, tags and file_adds are used, because they
provide some variety and also prove that what's counted is the number of string
items in the list, and not the list stringified (they are lists of non-empty,
multi-character strings).
Additionally, revset template function is used for testing the filter, since
the combination is very flexible and will possibly be used together a lot.
(The previous version of this patch had an incorrect email subject and was
apparently lost - patchwork says the patch has been accepted, but it's not so.
The changes between that and this patch are minimal: now the filter does not
disturb the alphabetical order of function definitions and dict keys.)
2014-09-09 17:14:13 +04:00
|
|
|
Count filter:
|
|
|
|
|
|
|
|
$ hg log -l1 --template '{node|count} {node|short|count}\n'
|
|
|
|
40 12
|
|
|
|
|
|
|
|
$ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n'
|
|
|
|
0 1 4
|
|
|
|
|
|
|
|
$ hg log -G --template '{rev}: children: {children|count}, \
|
|
|
|
> tags: {tags|count}, file_adds: {file_adds|count}, \
|
|
|
|
> ancestors: {revset("ancestors(%s)", rev)|count}'
|
|
|
|
@ 9: children: 0, tags: 1, file_adds: 1, ancestors: 3
|
|
|
|
|
|
|
|
|
o 8: children: 1, tags: 0, file_adds: 2, ancestors: 2
|
|
|
|
|
|
|
|
|
o 7: children: 1, tags: 0, file_adds: 1, ancestors: 1
|
|
|
|
|
|
|
|
o 6: children: 0, tags: 0, file_adds: 0, ancestors: 7
|
|
|
|
|\
|
|
|
|
| o 5: children: 1, tags: 0, file_adds: 1, ancestors: 5
|
|
|
|
| |
|
|
|
|
o | 4: children: 1, tags: 0, file_adds: 0, ancestors: 5
|
|
|
|
|/
|
|
|
|
o 3: children: 2, tags: 0, file_adds: 0, ancestors: 4
|
|
|
|
|
|
|
|
|
o 2: children: 1, tags: 0, file_adds: 1, ancestors: 3
|
|
|
|
|
|
|
|
|
o 1: children: 1, tags: 0, file_adds: 1, ancestors: 2
|
|
|
|
|
|
|
|
|
o 0: children: 1, tags: 0, file_adds: 1, ancestors: 1
|
|
|
|
|
|
|
|
|
2015-03-30 17:54:29 +03:00
|
|
|
Upper/lower filters:
|
|
|
|
|
|
|
|
$ hg log -r0 --template '{branch|upper}\n'
|
|
|
|
DEFAULT
|
|
|
|
$ hg log -r0 --template '{author|lower}\n'
|
|
|
|
user name <user@hostname>
|
|
|
|
$ hg log -r0 --template '{date|upper}\n'
|
|
|
|
abort: template filter 'upper' is not compatible with keyword 'date'
|
|
|
|
[255]
|
|
|
|
|
2015-05-05 21:45:09 +03:00
|
|
|
Add a commit that does all possible modifications at once
|
|
|
|
|
|
|
|
$ echo modify >> third
|
|
|
|
$ touch b
|
|
|
|
$ hg add b
|
|
|
|
$ hg mv fourth fifth
|
|
|
|
$ hg rm a
|
|
|
|
$ hg ci -m "Modify, add, remove, rename"
|
|
|
|
|
2015-05-10 21:04:43 +03:00
|
|
|
Check the status template
|
|
|
|
|
|
|
|
$ cat <<EOF >> $HGRCPATH
|
|
|
|
> [extensions]
|
|
|
|
> color=
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg log -T status -r 10
|
|
|
|
changeset: 10:0f9759ec227a
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: Modify, add, remove, rename
|
|
|
|
files:
|
|
|
|
M third
|
|
|
|
A b
|
|
|
|
A fifth
|
|
|
|
R a
|
|
|
|
R fourth
|
|
|
|
|
|
|
|
$ hg log -T status -C -r 10
|
|
|
|
changeset: 10:0f9759ec227a
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: Modify, add, remove, rename
|
|
|
|
files:
|
|
|
|
M third
|
|
|
|
A b
|
|
|
|
A fifth
|
|
|
|
fourth
|
|
|
|
R a
|
|
|
|
R fourth
|
|
|
|
|
|
|
|
$ hg log -T status -C -r 10 -v
|
|
|
|
changeset: 10:0f9759ec227a
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
description:
|
|
|
|
Modify, add, remove, rename
|
|
|
|
|
|
|
|
files:
|
|
|
|
M third
|
|
|
|
A b
|
|
|
|
A fifth
|
|
|
|
fourth
|
|
|
|
R a
|
|
|
|
R fourth
|
|
|
|
|
|
|
|
$ hg log -T status -C -r 10 --debug
|
|
|
|
changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c
|
|
|
|
tag: tip
|
|
|
|
phase: secret
|
|
|
|
parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
extra: branch=default
|
|
|
|
description:
|
|
|
|
Modify, add, remove, rename
|
|
|
|
|
|
|
|
files:
|
|
|
|
M third
|
|
|
|
A b
|
|
|
|
A fifth
|
|
|
|
fourth
|
|
|
|
R a
|
|
|
|
R fourth
|
|
|
|
|
|
|
|
$ hg log -T status -C -r 10 --quiet
|
|
|
|
10:0f9759ec227a
|
|
|
|
$ hg --color=debug log -T status -r 10
|
|
|
|
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
|
|
|
|
[log.tag|tag: tip]
|
|
|
|
[log.user|user: test]
|
|
|
|
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
|
|
|
[log.summary|summary: Modify, add, remove, rename]
|
|
|
|
[ui.note log.files|files:]
|
|
|
|
[status.modified|M third]
|
|
|
|
[status.added|A b]
|
|
|
|
[status.added|A fifth]
|
|
|
|
[status.removed|R a]
|
|
|
|
[status.removed|R fourth]
|
|
|
|
|
|
|
|
$ hg --color=debug log -T status -C -r 10
|
|
|
|
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
|
|
|
|
[log.tag|tag: tip]
|
|
|
|
[log.user|user: test]
|
|
|
|
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
|
|
|
[log.summary|summary: Modify, add, remove, rename]
|
|
|
|
[ui.note log.files|files:]
|
|
|
|
[status.modified|M third]
|
|
|
|
[status.added|A b]
|
|
|
|
[status.added|A fifth]
|
|
|
|
[status.copied| fourth]
|
|
|
|
[status.removed|R a]
|
|
|
|
[status.removed|R fourth]
|
|
|
|
|
|
|
|
$ hg --color=debug log -T status -C -r 10 -v
|
|
|
|
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
|
|
|
|
[log.tag|tag: tip]
|
|
|
|
[log.user|user: test]
|
|
|
|
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|Modify, add, remove, rename]
|
|
|
|
|
|
|
|
[ui.note log.files|files:]
|
|
|
|
[status.modified|M third]
|
|
|
|
[status.added|A b]
|
|
|
|
[status.added|A fifth]
|
|
|
|
[status.copied| fourth]
|
|
|
|
[status.removed|R a]
|
|
|
|
[status.removed|R fourth]
|
|
|
|
|
|
|
|
$ hg --color=debug log -T status -C -r 10 --debug
|
|
|
|
[log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c]
|
|
|
|
[log.tag|tag: tip]
|
|
|
|
[log.phase|phase: secret]
|
|
|
|
[log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[ui.debug log.manifest|manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567]
|
|
|
|
[log.user|user: test]
|
|
|
|
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
|
|
|
[ui.debug log.extra|extra: branch=default]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|Modify, add, remove, rename]
|
|
|
|
|
|
|
|
[ui.note log.files|files:]
|
|
|
|
[status.modified|M third]
|
|
|
|
[status.added|A b]
|
|
|
|
[status.added|A fifth]
|
|
|
|
[status.copied| fourth]
|
|
|
|
[status.removed|R a]
|
|
|
|
[status.removed|R fourth]
|
|
|
|
|
|
|
|
$ hg --color=debug log -T status -C -r 10 --quiet
|
|
|
|
[log.node|10:0f9759ec227a]
|
|
|
|
|
2015-05-10 20:48:10 +03:00
|
|
|
Check the bisect template
|
|
|
|
|
|
|
|
$ hg bisect -g 1
|
|
|
|
$ hg bisect -b 3 --noupdate
|
|
|
|
Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests)
|
|
|
|
$ hg log -T bisect -r 0:4
|
|
|
|
changeset: 0:1e4e1b8f71e0
|
|
|
|
bisect: good (implicit)
|
|
|
|
user: User Name <user@hostname>
|
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
summary: line 1
|
|
|
|
|
|
|
|
changeset: 1:b608e9d1a3f0
|
|
|
|
bisect: good
|
|
|
|
user: A. N. Other <other@place>
|
|
|
|
date: Tue Jan 13 17:33:20 1970 +0000
|
|
|
|
summary: other 1
|
|
|
|
|
|
|
|
changeset: 2:97054abb4ab8
|
|
|
|
bisect: untested
|
|
|
|
user: other@place
|
|
|
|
date: Wed Jan 14 21:20:00 1970 +0000
|
|
|
|
summary: no person
|
|
|
|
|
|
|
|
changeset: 3:10e46f2dcbf4
|
|
|
|
bisect: bad
|
|
|
|
user: person
|
|
|
|
date: Fri Jan 16 01:06:40 1970 +0000
|
|
|
|
summary: no user, no domain
|
|
|
|
|
|
|
|
changeset: 4:bbe44766e73d
|
|
|
|
bisect: bad (implicit)
|
|
|
|
branch: foo
|
|
|
|
user: person
|
|
|
|
date: Sat Jan 17 04:53:20 1970 +0000
|
|
|
|
summary: new branch
|
|
|
|
|
|
|
|
$ hg log --debug -T bisect -r 0:4
|
|
|
|
changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
bisect: good (implicit)
|
|
|
|
phase: public
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
|
|
|
|
user: User Name <user@hostname>
|
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
files+: a
|
|
|
|
extra: branch=default
|
|
|
|
description:
|
|
|
|
line 1
|
|
|
|
line 2
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
bisect: good
|
|
|
|
phase: public
|
|
|
|
parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
|
|
|
|
user: A. N. Other <other@place>
|
|
|
|
date: Tue Jan 13 17:33:20 1970 +0000
|
|
|
|
files+: b
|
|
|
|
extra: branch=default
|
|
|
|
description:
|
|
|
|
other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 2:97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
bisect: untested
|
|
|
|
phase: public
|
|
|
|
parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
|
|
|
|
user: other@place
|
|
|
|
date: Wed Jan 14 21:20:00 1970 +0000
|
|
|
|
files+: c
|
|
|
|
extra: branch=default
|
|
|
|
description:
|
|
|
|
no person
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
bisect: bad
|
|
|
|
phase: public
|
|
|
|
parent: 2:97054abb4ab824450e9164180baf491ae0078465
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
|
|
|
|
user: person
|
|
|
|
date: Fri Jan 16 01:06:40 1970 +0000
|
|
|
|
files: c
|
|
|
|
extra: branch=default
|
|
|
|
description:
|
|
|
|
no user, no domain
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
|
|
|
bisect: bad (implicit)
|
|
|
|
branch: foo
|
|
|
|
phase: draft
|
|
|
|
parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
|
manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
|
|
|
|
user: person
|
|
|
|
date: Sat Jan 17 04:53:20 1970 +0000
|
|
|
|
extra: branch=foo
|
|
|
|
description:
|
|
|
|
new branch
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log -v -T bisect -r 0:4
|
|
|
|
changeset: 0:1e4e1b8f71e0
|
|
|
|
bisect: good (implicit)
|
|
|
|
user: User Name <user@hostname>
|
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
files: a
|
|
|
|
description:
|
|
|
|
line 1
|
|
|
|
line 2
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 1:b608e9d1a3f0
|
|
|
|
bisect: good
|
|
|
|
user: A. N. Other <other@place>
|
|
|
|
date: Tue Jan 13 17:33:20 1970 +0000
|
|
|
|
files: b
|
|
|
|
description:
|
|
|
|
other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 2:97054abb4ab8
|
|
|
|
bisect: untested
|
|
|
|
user: other@place
|
|
|
|
date: Wed Jan 14 21:20:00 1970 +0000
|
|
|
|
files: c
|
|
|
|
description:
|
|
|
|
no person
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 3:10e46f2dcbf4
|
|
|
|
bisect: bad
|
|
|
|
user: person
|
|
|
|
date: Fri Jan 16 01:06:40 1970 +0000
|
|
|
|
files: c
|
|
|
|
description:
|
|
|
|
no user, no domain
|
|
|
|
|
|
|
|
|
|
|
|
changeset: 4:bbe44766e73d
|
|
|
|
bisect: bad (implicit)
|
|
|
|
branch: foo
|
|
|
|
user: person
|
|
|
|
date: Sat Jan 17 04:53:20 1970 +0000
|
|
|
|
description:
|
|
|
|
new branch
|
|
|
|
|
|
|
|
|
|
|
|
$ hg --color=debug log -T bisect -r 0:4
|
|
|
|
[log.changeset changeset.public|changeset: 0:1e4e1b8f71e0]
|
|
|
|
[log.bisect bisect.good|bisect: good (implicit)]
|
|
|
|
[log.user|user: User Name <user@hostname>]
|
|
|
|
[log.date|date: Mon Jan 12 13:46:40 1970 +0000]
|
|
|
|
[log.summary|summary: line 1]
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 1:b608e9d1a3f0]
|
|
|
|
[log.bisect bisect.good|bisect: good]
|
|
|
|
[log.user|user: A. N. Other <other@place>]
|
|
|
|
[log.date|date: Tue Jan 13 17:33:20 1970 +0000]
|
|
|
|
[log.summary|summary: other 1]
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 2:97054abb4ab8]
|
|
|
|
[log.bisect bisect.untested|bisect: untested]
|
|
|
|
[log.user|user: other@place]
|
|
|
|
[log.date|date: Wed Jan 14 21:20:00 1970 +0000]
|
|
|
|
[log.summary|summary: no person]
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 3:10e46f2dcbf4]
|
|
|
|
[log.bisect bisect.bad|bisect: bad]
|
|
|
|
[log.user|user: person]
|
|
|
|
[log.date|date: Fri Jan 16 01:06:40 1970 +0000]
|
|
|
|
[log.summary|summary: no user, no domain]
|
|
|
|
|
|
|
|
[log.changeset changeset.draft|changeset: 4:bbe44766e73d]
|
|
|
|
[log.bisect bisect.bad|bisect: bad (implicit)]
|
|
|
|
[log.branch|branch: foo]
|
|
|
|
[log.user|user: person]
|
|
|
|
[log.date|date: Sat Jan 17 04:53:20 1970 +0000]
|
|
|
|
[log.summary|summary: new branch]
|
|
|
|
|
|
|
|
$ hg --color=debug log --debug -T bisect -r 0:4
|
|
|
|
[log.changeset changeset.public|changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f]
|
|
|
|
[log.bisect bisect.good|bisect: good (implicit)]
|
|
|
|
[log.phase|phase: public]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[ui.debug log.manifest|manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0]
|
|
|
|
[log.user|user: User Name <user@hostname>]
|
|
|
|
[log.date|date: Mon Jan 12 13:46:40 1970 +0000]
|
|
|
|
[ui.debug log.files|files+: a]
|
|
|
|
[ui.debug log.extra|extra: branch=default]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|line 1
|
|
|
|
line 2]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965]
|
|
|
|
[log.bisect bisect.good|bisect: good]
|
|
|
|
[log.phase|phase: public]
|
|
|
|
[log.parent changeset.public|parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[ui.debug log.manifest|manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55]
|
|
|
|
[log.user|user: A. N. Other <other@place>]
|
|
|
|
[log.date|date: Tue Jan 13 17:33:20 1970 +0000]
|
|
|
|
[ui.debug log.files|files+: b]
|
|
|
|
[ui.debug log.extra|extra: branch=default]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 2:97054abb4ab824450e9164180baf491ae0078465]
|
|
|
|
[log.bisect bisect.untested|bisect: untested]
|
|
|
|
[log.phase|phase: public]
|
|
|
|
[log.parent changeset.public|parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[ui.debug log.manifest|manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1]
|
|
|
|
[log.user|user: other@place]
|
|
|
|
[log.date|date: Wed Jan 14 21:20:00 1970 +0000]
|
|
|
|
[ui.debug log.files|files+: c]
|
|
|
|
[ui.debug log.extra|extra: branch=default]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|no person]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47]
|
|
|
|
[log.bisect bisect.bad|bisect: bad]
|
|
|
|
[log.phase|phase: public]
|
|
|
|
[log.parent changeset.public|parent: 2:97054abb4ab824450e9164180baf491ae0078465]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc]
|
|
|
|
[log.user|user: person]
|
|
|
|
[log.date|date: Fri Jan 16 01:06:40 1970 +0000]
|
|
|
|
[ui.debug log.files|files: c]
|
|
|
|
[ui.debug log.extra|extra: branch=default]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|no user, no domain]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.draft|changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74]
|
|
|
|
[log.bisect bisect.bad|bisect: bad (implicit)]
|
|
|
|
[log.branch|branch: foo]
|
|
|
|
[log.phase|phase: draft]
|
|
|
|
[log.parent changeset.public|parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47]
|
|
|
|
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
|
|
|
[ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc]
|
|
|
|
[log.user|user: person]
|
|
|
|
[log.date|date: Sat Jan 17 04:53:20 1970 +0000]
|
|
|
|
[ui.debug log.extra|extra: branch=foo]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|new branch]
|
|
|
|
|
|
|
|
|
|
|
|
$ hg --color=debug log -v -T bisect -r 0:4
|
|
|
|
[log.changeset changeset.public|changeset: 0:1e4e1b8f71e0]
|
|
|
|
[log.bisect bisect.good|bisect: good (implicit)]
|
|
|
|
[log.user|user: User Name <user@hostname>]
|
|
|
|
[log.date|date: Mon Jan 12 13:46:40 1970 +0000]
|
|
|
|
[ui.note log.files|files: a]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|line 1
|
|
|
|
line 2]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 1:b608e9d1a3f0]
|
|
|
|
[log.bisect bisect.good|bisect: good]
|
|
|
|
[log.user|user: A. N. Other <other@place>]
|
|
|
|
[log.date|date: Tue Jan 13 17:33:20 1970 +0000]
|
|
|
|
[ui.note log.files|files: b]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|other 1
|
|
|
|
other 2
|
|
|
|
|
|
|
|
other 3]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 2:97054abb4ab8]
|
|
|
|
[log.bisect bisect.untested|bisect: untested]
|
|
|
|
[log.user|user: other@place]
|
|
|
|
[log.date|date: Wed Jan 14 21:20:00 1970 +0000]
|
|
|
|
[ui.note log.files|files: c]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|no person]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.public|changeset: 3:10e46f2dcbf4]
|
|
|
|
[log.bisect bisect.bad|bisect: bad]
|
|
|
|
[log.user|user: person]
|
|
|
|
[log.date|date: Fri Jan 16 01:06:40 1970 +0000]
|
|
|
|
[ui.note log.files|files: c]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|no user, no domain]
|
|
|
|
|
|
|
|
|
|
|
|
[log.changeset changeset.draft|changeset: 4:bbe44766e73d]
|
|
|
|
[log.bisect bisect.bad|bisect: bad (implicit)]
|
|
|
|
[log.branch|branch: foo]
|
|
|
|
[log.user|user: person]
|
|
|
|
[log.date|date: Sat Jan 17 04:53:20 1970 +0000]
|
|
|
|
[ui.note log.description|description:]
|
|
|
|
[ui.note log.description|new branch]
|
|
|
|
|
|
|
|
|
|
|
|
$ hg bisect --reset
|
2015-05-10 21:04:43 +03:00
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
Error on syntax:
|
|
|
|
|
|
|
|
$ echo 'x = "f' >> t
|
|
|
|
$ hg log
|
2016-03-26 12:01:04 +03:00
|
|
|
hg: parse error at t:3: unmatched quotes
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2015-06-15 17:03:30 +03:00
|
|
|
$ hg log -T '{date'
|
|
|
|
hg: parse error at 1: unterminated template expansion
|
2018-03-16 21:14:41 +03:00
|
|
|
({date
|
|
|
|
^ here)
|
2015-06-15 17:03:30 +03:00
|
|
|
[255]
|
|
|
|
|
2012-08-18 02:12:01 +04:00
|
|
|
Behind the scenes, this will throw TypeError
|
|
|
|
|
|
|
|
$ hg log -l 3 --template '{date|obfuscate}\n'
|
2012-08-24 23:52:45 +04:00
|
|
|
abort: template filter 'obfuscate' is not compatible with keyword 'date'
|
2012-08-18 02:12:01 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
Behind the scenes, this will throw a ValueError
|
|
|
|
|
|
|
|
$ hg log -l 3 --template 'line: {desc|shortdate}\n'
|
2012-08-24 23:52:45 +04:00
|
|
|
abort: template filter 'shortdate' is not compatible with keyword 'desc'
|
2012-08-18 02:12:01 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
Behind the scenes, this will throw AttributeError
|
|
|
|
|
|
|
|
$ hg log -l 3 --template 'line: {date|escape}\n'
|
2012-08-24 23:52:45 +04:00
|
|
|
abort: template filter 'escape' is not compatible with keyword 'date'
|
2012-08-18 02:12:01 +04:00
|
|
|
[255]
|
|
|
|
|
2015-09-01 13:15:16 +03:00
|
|
|
$ hg log -l 3 --template 'line: {extras|localdate}\n'
|
|
|
|
hg: parse error: localdate expects a date information
|
|
|
|
[255]
|
|
|
|
|
2012-08-18 02:12:01 +04:00
|
|
|
Behind the scenes, this will throw ValueError
|
|
|
|
|
|
|
|
$ hg tip --template '{author|email|date}\n'
|
2015-07-04 10:07:42 +03:00
|
|
|
hg: parse error: date expects a date information
|
2012-08-18 02:12:01 +04:00
|
|
|
[255]
|
|
|
|
|
2017-04-08 17:33:32 +03:00
|
|
|
$ hg tip -T '{author|email|shortdate}\n'
|
|
|
|
abort: template filter 'shortdate' is not compatible with keyword 'author'
|
|
|
|
[255]
|
|
|
|
|
|
|
|
$ hg tip -T '{get(extras, "branch")|shortdate}\n'
|
|
|
|
abort: incompatible use of template filter 'shortdate'
|
|
|
|
[255]
|
|
|
|
|
2015-06-15 17:11:35 +03:00
|
|
|
Error in nested template:
|
|
|
|
|
|
|
|
$ hg log -T '{"date'
|
|
|
|
hg: parse error at 2: unterminated string
|
2018-03-16 21:14:41 +03:00
|
|
|
({"date
|
|
|
|
^ here)
|
2015-06-15 17:11:35 +03:00
|
|
|
[255]
|
|
|
|
|
2017-04-03 14:55:55 +03:00
|
|
|
$ hg log -T '{"foo{date|?}"}'
|
2015-06-15 17:11:35 +03:00
|
|
|
hg: parse error at 11: syntax error
|
2018-03-16 21:14:41 +03:00
|
|
|
({"foo{date|?}"}
|
|
|
|
^ here)
|
2015-06-15 17:11:35 +03:00
|
|
|
[255]
|
|
|
|
|
2014-03-28 02:21:27 +04:00
|
|
|
Thrown an error if a template function doesn't exist
|
|
|
|
|
|
|
|
$ hg tip --template '{foo()}\n'
|
|
|
|
hg: parse error: unknown function 'foo'
|
|
|
|
[255]
|
|
|
|
|
2015-02-23 18:04:55 +03:00
|
|
|
Pass generator object created by template function to filter
|
|
|
|
|
|
|
|
$ hg log -l 1 --template '{if(author, author)|user}\n'
|
|
|
|
test
|
|
|
|
|
2016-04-22 15:46:33 +03:00
|
|
|
Test index keyword:
|
|
|
|
|
|
|
|
$ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n'
|
|
|
|
10 0:a 1:b 2:fifth 3:fourth 4:third
|
|
|
|
11 0:a
|
|
|
|
|
|
|
|
$ hg branches -T '{index} {branch}\n'
|
|
|
|
0 default
|
|
|
|
1 foo
|
|
|
|
|
2014-08-28 17:45:36 +04:00
|
|
|
Test diff function:
|
|
|
|
|
|
|
|
$ hg diff -c 8
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e fourth
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/fourth Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+second
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e second
|
|
|
|
--- a/second Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-second
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e third
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/third Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+third
|
|
|
|
|
|
|
|
$ hg log -r 8 -T "{diff()}"
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e fourth
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/fourth Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+second
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e second
|
|
|
|
--- a/second Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-second
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e third
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/third Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+third
|
|
|
|
|
|
|
|
$ hg log -r 8 -T "{diff('glob:f*')}"
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e fourth
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/fourth Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+second
|
|
|
|
|
|
|
|
$ hg log -r 8 -T "{diff('', 'glob:f*')}"
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e second
|
|
|
|
--- a/second Mon Jan 12 13:46:40 1970 +0000
|
|
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-second
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e third
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/third Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+third
|
|
|
|
|
2015-06-13 14:14:22 +03:00
|
|
|
$ hg log -r 8 -T "{diff('FOURTH'|lower)}"
|
|
|
|
diff -r 29114dbae42b -r 95c24699272e fourth
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/fourth Wed Jan 01 10:01:00 2020 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+second
|
|
|
|
|
2017-10-21 11:46:41 +03:00
|
|
|
ui verbosity:
|
|
|
|
|
|
|
|
$ hg log -l1 -T '{verbosity}\n'
|
|
|
|
|
|
|
|
$ hg log -l1 -T '{verbosity}\n' --debug
|
|
|
|
debug
|
|
|
|
$ hg log -l1 -T '{verbosity}\n' --quiet
|
|
|
|
quiet
|
|
|
|
$ hg log -l1 -T '{verbosity}\n' --verbose
|
|
|
|
verbose
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
latesttag:
|
|
|
|
|
|
|
|
$ hg init latesttag
|
|
|
|
$ cd latesttag
|
|
|
|
|
|
|
|
$ echo a > file
|
|
|
|
$ hg ci -Am a -d '0 0'
|
|
|
|
adding file
|
|
|
|
|
|
|
|
$ echo b >> file
|
|
|
|
$ hg ci -m b -d '1 0'
|
|
|
|
|
|
|
|
$ echo c >> head1
|
|
|
|
$ hg ci -Am h1c -d '2 0'
|
|
|
|
adding head1
|
|
|
|
|
|
|
|
$ hg update -q 1
|
|
|
|
$ echo d >> head2
|
|
|
|
$ hg ci -Am h2d -d '3 0'
|
|
|
|
adding head2
|
|
|
|
|
|
|
|
$ echo e >> head2
|
|
|
|
$ hg ci -m h2e -d '4 0'
|
|
|
|
|
|
|
|
$ hg merge -q
|
2013-11-08 01:24:23 +04:00
|
|
|
$ hg ci -m merge -d '5 -3600'
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
No tag set:
|
|
|
|
|
2017-08-18 22:50:26 +03:00
|
|
|
$ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
|
|
|
|
@ 5: null+5
|
|
|
|
|\
|
|
|
|
| o 4: null+4
|
|
|
|
| |
|
|
|
|
| o 3: null+3
|
|
|
|
| |
|
|
|
|
o | 2: null+3
|
|
|
|
|/
|
|
|
|
o 1: null+2
|
|
|
|
|
|
|
|
|
o 0: null+1
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2017-08-16 09:23:55 +03:00
|
|
|
One common tag: longest path wins for {latesttagdistance}:
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
$ hg tag -r 1 -m t1 -d '6 0' t1
|
2017-08-18 22:50:26 +03:00
|
|
|
$ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
|
|
|
|
@ 6: t1+4
|
|
|
|
|
|
|
|
|
o 5: t1+3
|
|
|
|
|\
|
|
|
|
| o 4: t1+2
|
|
|
|
| |
|
|
|
|
| o 3: t1+1
|
|
|
|
| |
|
|
|
|
o | 2: t1+1
|
|
|
|
|/
|
|
|
|
o 1: t1+0
|
|
|
|
|
|
|
|
|
o 0: null+1
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2017-08-16 09:23:55 +03:00
|
|
|
One ancestor tag: closest wins:
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
$ hg tag -r 2 -m t2 -d '7 0' t2
|
2017-08-18 22:50:26 +03:00
|
|
|
$ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
|
|
|
|
@ 7: t2+3
|
|
|
|
|
|
|
|
|
o 6: t2+2
|
|
|
|
|
|
|
|
|
o 5: t2+1
|
|
|
|
|\
|
|
|
|
| o 4: t1+2
|
|
|
|
| |
|
|
|
|
| o 3: t1+1
|
|
|
|
| |
|
|
|
|
o | 2: t2+0
|
|
|
|
|/
|
|
|
|
o 1: t1+0
|
|
|
|
|
|
|
|
|
o 0: null+1
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2017-08-16 09:23:55 +03:00
|
|
|
Two branch tags: more recent wins if same number of changes:
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
$ hg tag -r 3 -m t3 -d '8 0' t3
|
2017-08-18 22:50:26 +03:00
|
|
|
$ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
|
|
|
|
@ 8: t3+5
|
|
|
|
|
|
|
|
|
o 7: t3+4
|
|
|
|
|
|
|
|
|
o 6: t3+3
|
|
|
|
|
|
|
|
|
o 5: t3+2
|
|
|
|
|\
|
|
|
|
| o 4: t3+1
|
|
|
|
| |
|
|
|
|
| o 3: t3+0
|
|
|
|
| |
|
|
|
|
o | 2: t2+0
|
|
|
|
|/
|
|
|
|
o 1: t1+0
|
|
|
|
|
|
|
|
|
o 0: null+1
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
|
2017-08-16 09:23:55 +03:00
|
|
|
Two branch tags: fewest changes wins:
|
|
|
|
|
|
|
|
$ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
|
|
|
|
$ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
|
|
|
|
@ 9: t4+5,6
|
|
|
|
|
|
|
|
|
o 8: t4+4,5
|
|
|
|
|
|
|
|
|
o 7: t4+3,4
|
|
|
|
|
|
|
|
|
o 6: t4+2,3
|
|
|
|
|
|
|
|
|
o 5: t4+1,2
|
|
|
|
|\
|
|
|
|
| o 4: t4+0,0
|
|
|
|
| |
|
|
|
|
| o 3: t3+0,0
|
|
|
|
| |
|
|
|
|
o | 2: t2+0,0
|
|
|
|
|/
|
|
|
|
o 1: t1+0,0
|
|
|
|
|
|
|
|
|
o 0: null+1,1
|
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
Merged tag overrides:
|
|
|
|
|
|
|
|
$ hg tag -r 5 -m t5 -d '9 0' t5
|
|
|
|
$ hg tag -r 3 -m at3 -d '10 0' at3
|
2017-08-18 22:50:26 +03:00
|
|
|
$ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
|
2017-08-16 09:23:55 +03:00
|
|
|
@ 11: t5+6
|
|
|
|
|
|
|
|
|
o 10: t5+5
|
2017-08-18 22:50:26 +03:00
|
|
|
|
|
|
|
|
o 9: t5+4
|
|
|
|
|
|
|
|
|
o 8: t5+3
|
|
|
|
|
|
|
|
|
o 7: t5+2
|
|
|
|
|
|
|
|
|
o 6: t5+1
|
|
|
|
|
|
|
|
|
o 5: t5+0
|
|
|
|
|\
|
2017-08-16 09:23:55 +03:00
|
|
|
| o 4: t4+0
|
2017-08-18 22:50:26 +03:00
|
|
|
| |
|
|
|
|
| o 3: at3:t3+0
|
|
|
|
| |
|
|
|
|
o | 2: t2+0
|
|
|
|
|/
|
|
|
|
o 1: t1+0
|
|
|
|
|
|
|
|
|
o 0: null+1
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
|
2017-08-16 09:23:55 +03:00
|
|
|
@ 11: t5+6,6
|
|
|
|
|
|
|
|
|
o 10: t5+5,5
|
2017-08-18 22:50:26 +03:00
|
|
|
|
|
|
|
|
o 9: t5+4,4
|
|
|
|
|
|
|
|
|
o 8: t5+3,3
|
|
|
|
|
|
|
|
|
o 7: t5+2,2
|
|
|
|
|
|
|
|
|
o 6: t5+1,1
|
|
|
|
|
|
|
|
|
o 5: t5+0,0
|
|
|
|
|\
|
2017-08-16 09:23:55 +03:00
|
|
|
| o 4: t4+0,0
|
2017-08-18 22:50:26 +03:00
|
|
|
| |
|
|
|
|
| o 3: at3+0,0 t3+0,0
|
|
|
|
| |
|
|
|
|
o | 2: t2+0,0
|
|
|
|
|/
|
|
|
|
o 1: t1+0,0
|
|
|
|
|
|
|
|
|
o 0: null+1,1
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n"
|
2017-08-16 09:23:55 +03:00
|
|
|
@ 11: t3, C: 9, D: 8
|
|
|
|
|
|
|
|
|
o 10: t3, C: 8, D: 7
|
2017-08-18 22:50:26 +03:00
|
|
|
|
|
|
|
|
o 9: t3, C: 7, D: 6
|
|
|
|
|
|
|
|
|
o 8: t3, C: 6, D: 5
|
|
|
|
|
|
|
|
|
o 7: t3, C: 5, D: 4
|
|
|
|
|
|
|
|
|
o 6: t3, C: 4, D: 3
|
|
|
|
|
|
|
|
|
o 5: t3, C: 3, D: 2
|
|
|
|
|\
|
|
|
|
| o 4: t3, C: 1, D: 1
|
|
|
|
| |
|
|
|
|
| o 3: t3, C: 0, D: 0
|
|
|
|
| |
|
|
|
|
o | 2: t1, C: 1, D: 1
|
|
|
|
|/
|
|
|
|
o 1: t1, C: 0, D: 0
|
|
|
|
|
|
|
|
|
o 0: null, C: 1, D: 1
|
|
|
|
|
2015-08-24 06:44:58 +03:00
|
|
|
|
2010-09-14 21:31:00 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Style path expansion: issue1948 - ui.style option doesn't work on OSX
|
|
|
|
if it is a relative path
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
$ mkdir -p home/styles
|
|
|
|
|
|
|
|
$ cat > home/styles/teststyle <<EOF
|
|
|
|
> changeset = 'test {rev}:{node|short}\n'
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ HOME=`pwd`/home; export HOME
|
|
|
|
|
|
|
|
$ cat > latesttag/.hg/hgrc <<EOF
|
|
|
|
> [ui]
|
|
|
|
> style = ~/styles/teststyle
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg -R latesttag tip
|
2017-08-16 09:23:55 +03:00
|
|
|
test 11:97e5943b523a
|
2010-09-14 21:31:00 +04:00
|
|
|
|
|
|
|
Test recursive showlist template (issue1989):
|
|
|
|
|
|
|
|
$ cat > style1989 <<EOF
|
|
|
|
> changeset = '{file_mods}{manifest}{extras}'
|
|
|
|
> file_mod = 'M|{author|person}\n'
|
|
|
|
> manifest = '{rev},{author}\n'
|
|
|
|
> extra = '{key}: {author}\n'
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg -R latesttag log -r tip --style=style1989
|
|
|
|
M|test
|
2017-08-16 09:23:55 +03:00
|
|
|
11,test
|
2010-09-14 21:31:00 +04:00
|
|
|
branch: test
|
|
|
|
|
2012-09-22 03:54:00 +04:00
|
|
|
Test new-style inline templating:
|
|
|
|
|
|
|
|
$ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n'
|
|
|
|
modified files: .hgtags
|
|
|
|
|
2016-02-14 07:58:46 +03:00
|
|
|
|
|
|
|
$ hg log -R latesttag -r tip -T '{rev % "a"}\n'
|
|
|
|
hg: parse error: keyword 'rev' is not iterable
|
|
|
|
[255]
|
|
|
|
$ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "a"}\n'
|
|
|
|
hg: parse error: None is not iterable
|
|
|
|
[255]
|
|
|
|
|
templatekw: add new-style template expansion to {manifest}
The goal is to allow us to easily access to nested data. The dot operator
will be introduced later so we can write '{p1.files}' instead of
'{revset("p1()") % "{files}"}' for example.
In the example above, 'p1' needs to carry a mapping dict along with its
string representation. If it were a list or a dict, it could be wrapped
semi-transparently with the _hybrid class, but for non-list/dict types,
it would be difficult to proxy all necessary functions to underlying value
type because several core operations may conflict with the ones of the
underlying value:
- hash(value) should be different from hash(wrapped(value)), which means
dict[wrapped(value)] would be invalid
- 'value == wrapped(value)' would be false, breaks 'ifcontains'
- len(wrapped(value)) may be either len(value) or len(iter(wrapped(value)))
So the wrapper has no proxy functions and its scope designed to be minimal.
It's unwrapped at eval*() functions so we don't have to care for a wrapped
object unless it's really needed:
# most template functions just call evalfuncarg()
unwrapped_value = evalfuncarg(context, mapping, args[n])
# if wrapped value is needed, use evalrawexp()
maybe_wrapped_value = evalrawexp(context, mapping, args[n])
Another idea was to wrap every template variable with a tagging class, but
which seemed uneasy without a static type checker.
This patch updates {manifest} to a mappable as an example.
2016-04-24 12:41:23 +03:00
|
|
|
Test new-style inline templating of non-list/dict type:
|
|
|
|
|
|
|
|
$ hg log -R latesttag -r tip -T '{manifest}\n'
|
|
|
|
11:2bc6e9006ce2
|
|
|
|
$ hg log -R latesttag -r tip -T 'string length: {manifest|count}\n'
|
|
|
|
string length: 15
|
|
|
|
$ hg log -R latesttag -r tip -T '{manifest % "{rev}:{node}"}\n'
|
|
|
|
11:2bc6e9006ce29882383a22d39fd1f4e66dd3e2fc
|
|
|
|
|
2017-09-09 13:13:25 +03:00
|
|
|
$ hg log -R latesttag -r tip -T '{get(extras, "branch") % "{key}: {value}\n"}'
|
|
|
|
branch: default
|
|
|
|
$ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "{key}\n"}'
|
|
|
|
hg: parse error: None is not iterable
|
|
|
|
[255]
|
|
|
|
$ hg log -R latesttag -r tip -T '{min(extras) % "{key}: {value}\n"}'
|
|
|
|
branch: default
|
|
|
|
$ hg log -R latesttag -l1 -T '{min(revset("0:9")) % "{rev}:{node|short}\n"}'
|
|
|
|
0:ce3cec86e6c2
|
|
|
|
$ hg log -R latesttag -l1 -T '{max(revset("0:9")) % "{rev}:{node|short}\n"}'
|
|
|
|
9:fbc7cd862e9c
|
|
|
|
|
|
|
|
Test manifest/get() can be join()-ed as before, though it's silly:
|
templatekw: add new-style template expansion to {manifest}
The goal is to allow us to easily access to nested data. The dot operator
will be introduced later so we can write '{p1.files}' instead of
'{revset("p1()") % "{files}"}' for example.
In the example above, 'p1' needs to carry a mapping dict along with its
string representation. If it were a list or a dict, it could be wrapped
semi-transparently with the _hybrid class, but for non-list/dict types,
it would be difficult to proxy all necessary functions to underlying value
type because several core operations may conflict with the ones of the
underlying value:
- hash(value) should be different from hash(wrapped(value)), which means
dict[wrapped(value)] would be invalid
- 'value == wrapped(value)' would be false, breaks 'ifcontains'
- len(wrapped(value)) may be either len(value) or len(iter(wrapped(value)))
So the wrapper has no proxy functions and its scope designed to be minimal.
It's unwrapped at eval*() functions so we don't have to care for a wrapped
object unless it's really needed:
# most template functions just call evalfuncarg()
unwrapped_value = evalfuncarg(context, mapping, args[n])
# if wrapped value is needed, use evalrawexp()
maybe_wrapped_value = evalrawexp(context, mapping, args[n])
Another idea was to wrap every template variable with a tagging class, but
which seemed uneasy without a static type checker.
This patch updates {manifest} to a mappable as an example.
2016-04-24 12:41:23 +03:00
|
|
|
|
|
|
|
$ hg log -R latesttag -r tip -T '{join(manifest, "")}\n'
|
|
|
|
11:2bc6e9006ce2
|
2017-09-09 13:13:25 +03:00
|
|
|
$ hg log -R latesttag -r tip -T '{join(get(extras, "branch"), "")}\n'
|
|
|
|
default
|
templatekw: add new-style template expansion to {manifest}
The goal is to allow us to easily access to nested data. The dot operator
will be introduced later so we can write '{p1.files}' instead of
'{revset("p1()") % "{files}"}' for example.
In the example above, 'p1' needs to carry a mapping dict along with its
string representation. If it were a list or a dict, it could be wrapped
semi-transparently with the _hybrid class, but for non-list/dict types,
it would be difficult to proxy all necessary functions to underlying value
type because several core operations may conflict with the ones of the
underlying value:
- hash(value) should be different from hash(wrapped(value)), which means
dict[wrapped(value)] would be invalid
- 'value == wrapped(value)' would be false, breaks 'ifcontains'
- len(wrapped(value)) may be either len(value) or len(iter(wrapped(value)))
So the wrapper has no proxy functions and its scope designed to be minimal.
It's unwrapped at eval*() functions so we don't have to care for a wrapped
object unless it's really needed:
# most template functions just call evalfuncarg()
unwrapped_value = evalfuncarg(context, mapping, args[n])
# if wrapped value is needed, use evalrawexp()
maybe_wrapped_value = evalrawexp(context, mapping, args[n])
Another idea was to wrap every template variable with a tagging class, but
which seemed uneasy without a static type checker.
This patch updates {manifest} to a mappable as an example.
2016-04-24 12:41:23 +03:00
|
|
|
|
2017-09-19 17:13:46 +03:00
|
|
|
Test min/max of integers
|
|
|
|
|
|
|
|
$ hg log -R latesttag -l1 -T '{min(revset("9:10"))}\n'
|
|
|
|
9
|
|
|
|
$ hg log -R latesttag -l1 -T '{max(revset("9:10"))}\n'
|
|
|
|
10
|
|
|
|
|
2017-09-09 13:32:56 +03:00
|
|
|
Test dot operator precedence:
|
|
|
|
|
|
|
|
$ hg debugtemplate -R latesttag -r0 -v '{manifest.node|short}\n'
|
|
|
|
(template
|
|
|
|
(|
|
|
|
|
(.
|
|
|
|
(symbol 'manifest')
|
|
|
|
(symbol 'node'))
|
|
|
|
(symbol 'short'))
|
|
|
|
(string '\n'))
|
|
|
|
89f4071fec70
|
|
|
|
|
|
|
|
(the following examples are invalid, but seem natural in parsing POV)
|
|
|
|
|
|
|
|
$ hg debugtemplate -R latesttag -r0 -v '{foo|bar.baz}\n' 2> /dev/null
|
|
|
|
(template
|
|
|
|
(|
|
|
|
|
(symbol 'foo')
|
|
|
|
(.
|
|
|
|
(symbol 'bar')
|
|
|
|
(symbol 'baz')))
|
|
|
|
(string '\n'))
|
|
|
|
[255]
|
|
|
|
$ hg debugtemplate -R latesttag -r0 -v '{foo.bar()}\n' 2> /dev/null
|
|
|
|
(template
|
|
|
|
(.
|
|
|
|
(symbol 'foo')
|
|
|
|
(func
|
|
|
|
(symbol 'bar')
|
|
|
|
None))
|
|
|
|
(string '\n'))
|
|
|
|
[255]
|
|
|
|
|
|
|
|
Test evaluation of dot operator:
|
|
|
|
|
|
|
|
$ hg log -R latesttag -l1 -T '{min(revset("0:9")).node}\n'
|
|
|
|
ce3cec86e6c26bd9bdfc590a6b92abc9680f1796
|
2017-09-18 17:07:17 +03:00
|
|
|
$ hg log -R latesttag -r0 -T '{extras.branch}\n'
|
|
|
|
default
|
2017-09-09 13:32:56 +03:00
|
|
|
|
|
|
|
$ hg log -R latesttag -l1 -T '{author.invalid}\n'
|
|
|
|
hg: parse error: keyword 'author' has no member
|
|
|
|
[255]
|
|
|
|
$ hg log -R latesttag -l1 -T '{min("abc").invalid}\n'
|
|
|
|
hg: parse error: 'a' has no member
|
|
|
|
[255]
|
|
|
|
|
2013-04-11 04:27:49 +04:00
|
|
|
Test the sub function of templating for expansion:
|
|
|
|
|
|
|
|
$ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n'
|
|
|
|
xx
|
2013-06-25 21:02:22 +04:00
|
|
|
|
2015-09-07 15:58:17 +03:00
|
|
|
$ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n'
|
|
|
|
hg: parse error: sub got an invalid pattern: [
|
|
|
|
[255]
|
|
|
|
$ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n'
|
|
|
|
hg: parse error: sub got an invalid replacement: \1
|
|
|
|
[255]
|
|
|
|
|
2013-06-25 21:02:22 +04:00
|
|
|
Test the strip function with chars specified:
|
|
|
|
|
|
|
|
$ hg log -R latesttag --template '{desc}\n'
|
|
|
|
at3
|
|
|
|
t5
|
2017-08-16 09:23:55 +03:00
|
|
|
t4
|
2013-06-25 21:02:22 +04:00
|
|
|
t3
|
|
|
|
t2
|
|
|
|
t1
|
|
|
|
merge
|
|
|
|
h2e
|
|
|
|
h2d
|
|
|
|
h1c
|
|
|
|
b
|
|
|
|
a
|
|
|
|
|
|
|
|
$ hg log -R latesttag --template '{strip(desc, "te")}\n'
|
|
|
|
at3
|
|
|
|
5
|
2017-08-16 09:23:55 +03:00
|
|
|
4
|
2013-06-25 21:02:22 +04:00
|
|
|
3
|
|
|
|
2
|
|
|
|
1
|
|
|
|
merg
|
|
|
|
h2
|
|
|
|
h2d
|
|
|
|
h1c
|
|
|
|
b
|
|
|
|
a
|
2013-11-08 01:24:23 +04:00
|
|
|
|
|
|
|
Test date format:
|
|
|
|
|
|
|
|
$ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n'
|
|
|
|
date: 70 01 01 10 +0000
|
|
|
|
date: 70 01 01 09 +0000
|
2017-08-16 09:23:55 +03:00
|
|
|
date: 70 01 01 04 +0000
|
2013-11-08 01:24:23 +04:00
|
|
|
date: 70 01 01 08 +0000
|
|
|
|
date: 70 01 01 07 +0000
|
|
|
|
date: 70 01 01 06 +0000
|
|
|
|
date: 70 01 01 05 +0100
|
|
|
|
date: 70 01 01 04 +0000
|
|
|
|
date: 70 01 01 03 +0000
|
|
|
|
date: 70 01 01 02 +0000
|
|
|
|
date: 70 01 01 01 +0000
|
|
|
|
date: 70 01 01 00 +0000
|
2013-11-18 23:02:26 +04:00
|
|
|
|
2015-05-03 11:33:14 +03:00
|
|
|
Test invalid date:
|
|
|
|
|
|
|
|
$ hg log -R latesttag -T '{date(rev)}\n'
|
|
|
|
hg: parse error: date expects a date information
|
|
|
|
[255]
|
|
|
|
|
2015-05-01 14:43:55 +03:00
|
|
|
Test integer literal:
|
|
|
|
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -v '{(0)}\n'
|
|
|
|
(template
|
|
|
|
(group
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '0'))
|
|
|
|
(string '\n'))
|
2015-05-01 14:43:55 +03:00
|
|
|
0
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -v '{(123)}\n'
|
|
|
|
(template
|
|
|
|
(group
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '123'))
|
|
|
|
(string '\n'))
|
2015-05-01 14:43:55 +03:00
|
|
|
123
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -v '{(-4)}\n'
|
|
|
|
(template
|
|
|
|
(group
|
2016-10-09 15:51:04 +03:00
|
|
|
(negate
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '4')))
|
|
|
|
(string '\n'))
|
2015-05-01 14:43:55 +03:00
|
|
|
-4
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate '{(-)}\n'
|
2016-10-09 15:51:04 +03:00
|
|
|
hg: parse error at 3: not a prefix: )
|
2018-03-16 21:14:41 +03:00
|
|
|
({(-)}\n
|
|
|
|
^ here)
|
2015-05-01 14:43:55 +03:00
|
|
|
[255]
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate '{(-a)}\n'
|
2016-10-09 15:51:04 +03:00
|
|
|
hg: parse error: negation needs an integer argument
|
2015-05-01 14:43:55 +03:00
|
|
|
[255]
|
|
|
|
|
|
|
|
top-level integer literal is interpreted as symbol (i.e. variable name):
|
|
|
|
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -D 1=one -v '{1}\n'
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '1')
|
|
|
|
(string '\n'))
|
2016-02-13 19:06:12 +03:00
|
|
|
one
|
|
|
|
$ hg debugtemplate -D 1=one -v '{if("t", "{1}")}\n'
|
|
|
|
(template
|
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'if')
|
2016-02-13 19:06:12 +03:00
|
|
|
(list
|
2017-09-03 15:17:25 +03:00
|
|
|
(string 't')
|
2016-02-13 19:06:12 +03:00
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '1'))))
|
|
|
|
(string '\n'))
|
2016-02-13 19:06:12 +03:00
|
|
|
one
|
|
|
|
$ hg debugtemplate -D 1=one -v '{1|stringify}\n'
|
|
|
|
(template
|
|
|
|
(|
|
2017-09-03 15:17:25 +03:00
|
|
|
(integer '1')
|
|
|
|
(symbol 'stringify'))
|
|
|
|
(string '\n'))
|
2016-02-13 19:06:12 +03:00
|
|
|
one
|
2015-05-01 14:43:55 +03:00
|
|
|
|
|
|
|
unless explicit symbol is expected:
|
|
|
|
|
|
|
|
$ hg log -Ra -r0 -T '{desc|1}\n'
|
|
|
|
hg: parse error: expected a symbol, got 'integer'
|
|
|
|
[255]
|
|
|
|
$ hg log -Ra -r0 -T '{1()}\n'
|
|
|
|
hg: parse error: expected a symbol, got 'integer'
|
|
|
|
[255]
|
|
|
|
|
templater: take any string literals as template, but not for rawstring (BC)
This patch series is intended to unify the interpretation of string literals.
It is breaking change that boldly assumes
a. string literal "..." never contains template-like fragment or it is
intended to be a template
b. we tend to use raw string literal r"..." for regexp pattern in which "{"
should have different meaning
Currently, we don't have a comprehensible rule how string literals are
evaluated in template functions. For example, fill() takes "initialindent"
and "hangindent" as templates, but not for "text", whereas "text" is a
template in pad() function.
date(date, fmt)
diff(includepattern, excludepattern)
fill(text, width, initialident: T, hangindent: T)
get(dict, key)
if(expr, then: T, else: T)
ifcontains(search, thing, then: T, else: T)
ifeq(expr1, expr2, then: T, else: T)
indent(text, indentchars, firstline)
join(list, sep)
label(label: T, expr: T)
pad(text: T, width, fillchar, right)
revset(query, formatargs...])
rstdoc(text, style)
shortest(node, minlength)
startswith(pattern, text)
strip(text, chars)
sub(pattern, replacement, expression: T)
word(number, text, separator)
expr % template: T
T: interpret "string" or r"rawstring" as template
This patch series adjusts the rule as follows:
a. string literal, '' or "", starts template processing (BC)
b. raw string literal, r'' or r"", disables both \-escape and template
processing (BC, done by subsequent patches)
c. fragment not surrounded by {} is non-templated string
"ccc{'aaa'}{r'bbb'}"
------------------ *: template
--- c: string
--- a: template
--- b: rawstring
Because this can eliminate the compilation of template arguments from the
evaluation phase, "hg log -Tdefault" gets faster.
% cd mozilla-central
% LANG=C HGRCPATH=/dev/null hg log -Tdefault -r0:10000 --time > /dev/null
before: real 4.870 secs (user 4.860+0.000 sys 0.010+0.000)
after: real 3.480 secs (user 3.440+0.000 sys 0.030+0.000)
Also, this will allow us to parse nested templates at once for better error
indication.
2015-06-13 13:49:54 +03:00
|
|
|
Test string literal:
|
|
|
|
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -Ra -r0 -v '{"string with no template fragment"}\n'
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(string 'string with no template fragment')
|
|
|
|
(string '\n'))
|
templater: take any string literals as template, but not for rawstring (BC)
This patch series is intended to unify the interpretation of string literals.
It is breaking change that boldly assumes
a. string literal "..." never contains template-like fragment or it is
intended to be a template
b. we tend to use raw string literal r"..." for regexp pattern in which "{"
should have different meaning
Currently, we don't have a comprehensible rule how string literals are
evaluated in template functions. For example, fill() takes "initialindent"
and "hangindent" as templates, but not for "text", whereas "text" is a
template in pad() function.
date(date, fmt)
diff(includepattern, excludepattern)
fill(text, width, initialident: T, hangindent: T)
get(dict, key)
if(expr, then: T, else: T)
ifcontains(search, thing, then: T, else: T)
ifeq(expr1, expr2, then: T, else: T)
indent(text, indentchars, firstline)
join(list, sep)
label(label: T, expr: T)
pad(text: T, width, fillchar, right)
revset(query, formatargs...])
rstdoc(text, style)
shortest(node, minlength)
startswith(pattern, text)
strip(text, chars)
sub(pattern, replacement, expression: T)
word(number, text, separator)
expr % template: T
T: interpret "string" or r"rawstring" as template
This patch series adjusts the rule as follows:
a. string literal, '' or "", starts template processing (BC)
b. raw string literal, r'' or r"", disables both \-escape and template
processing (BC, done by subsequent patches)
c. fragment not surrounded by {} is non-templated string
"ccc{'aaa'}{r'bbb'}"
------------------ *: template
--- c: string
--- a: template
--- b: rawstring
Because this can eliminate the compilation of template arguments from the
evaluation phase, "hg log -Tdefault" gets faster.
% cd mozilla-central
% LANG=C HGRCPATH=/dev/null hg log -Tdefault -r0:10000 --time > /dev/null
before: real 4.870 secs (user 4.860+0.000 sys 0.010+0.000)
after: real 3.480 secs (user 3.440+0.000 sys 0.030+0.000)
Also, this will allow us to parse nested templates at once for better error
indication.
2015-06-13 13:49:54 +03:00
|
|
|
string with no template fragment
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -Ra -r0 -v '{"template: {rev}"}\n'
|
|
|
|
(template
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(string 'template: ')
|
|
|
|
(symbol 'rev'))
|
|
|
|
(string '\n'))
|
templater: take any string literals as template, but not for rawstring (BC)
This patch series is intended to unify the interpretation of string literals.
It is breaking change that boldly assumes
a. string literal "..." never contains template-like fragment or it is
intended to be a template
b. we tend to use raw string literal r"..." for regexp pattern in which "{"
should have different meaning
Currently, we don't have a comprehensible rule how string literals are
evaluated in template functions. For example, fill() takes "initialindent"
and "hangindent" as templates, but not for "text", whereas "text" is a
template in pad() function.
date(date, fmt)
diff(includepattern, excludepattern)
fill(text, width, initialident: T, hangindent: T)
get(dict, key)
if(expr, then: T, else: T)
ifcontains(search, thing, then: T, else: T)
ifeq(expr1, expr2, then: T, else: T)
indent(text, indentchars, firstline)
join(list, sep)
label(label: T, expr: T)
pad(text: T, width, fillchar, right)
revset(query, formatargs...])
rstdoc(text, style)
shortest(node, minlength)
startswith(pattern, text)
strip(text, chars)
sub(pattern, replacement, expression: T)
word(number, text, separator)
expr % template: T
T: interpret "string" or r"rawstring" as template
This patch series adjusts the rule as follows:
a. string literal, '' or "", starts template processing (BC)
b. raw string literal, r'' or r"", disables both \-escape and template
processing (BC, done by subsequent patches)
c. fragment not surrounded by {} is non-templated string
"ccc{'aaa'}{r'bbb'}"
------------------ *: template
--- c: string
--- a: template
--- b: rawstring
Because this can eliminate the compilation of template arguments from the
evaluation phase, "hg log -Tdefault" gets faster.
% cd mozilla-central
% LANG=C HGRCPATH=/dev/null hg log -Tdefault -r0:10000 --time > /dev/null
before: real 4.870 secs (user 4.860+0.000 sys 0.010+0.000)
after: real 3.480 secs (user 3.440+0.000 sys 0.030+0.000)
Also, this will allow us to parse nested templates at once for better error
indication.
2015-06-13 13:49:54 +03:00
|
|
|
template: 0
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -Ra -r0 -v '{r"rawstring: {rev}"}\n'
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(string 'rawstring: {rev}')
|
|
|
|
(string '\n'))
|
templater: take any string literals as template, but not for rawstring (BC)
This patch series is intended to unify the interpretation of string literals.
It is breaking change that boldly assumes
a. string literal "..." never contains template-like fragment or it is
intended to be a template
b. we tend to use raw string literal r"..." for regexp pattern in which "{"
should have different meaning
Currently, we don't have a comprehensible rule how string literals are
evaluated in template functions. For example, fill() takes "initialindent"
and "hangindent" as templates, but not for "text", whereas "text" is a
template in pad() function.
date(date, fmt)
diff(includepattern, excludepattern)
fill(text, width, initialident: T, hangindent: T)
get(dict, key)
if(expr, then: T, else: T)
ifcontains(search, thing, then: T, else: T)
ifeq(expr1, expr2, then: T, else: T)
indent(text, indentchars, firstline)
join(list, sep)
label(label: T, expr: T)
pad(text: T, width, fillchar, right)
revset(query, formatargs...])
rstdoc(text, style)
shortest(node, minlength)
startswith(pattern, text)
strip(text, chars)
sub(pattern, replacement, expression: T)
word(number, text, separator)
expr % template: T
T: interpret "string" or r"rawstring" as template
This patch series adjusts the rule as follows:
a. string literal, '' or "", starts template processing (BC)
b. raw string literal, r'' or r"", disables both \-escape and template
processing (BC, done by subsequent patches)
c. fragment not surrounded by {} is non-templated string
"ccc{'aaa'}{r'bbb'}"
------------------ *: template
--- c: string
--- a: template
--- b: rawstring
Because this can eliminate the compilation of template arguments from the
evaluation phase, "hg log -Tdefault" gets faster.
% cd mozilla-central
% LANG=C HGRCPATH=/dev/null hg log -Tdefault -r0:10000 --time > /dev/null
before: real 4.870 secs (user 4.860+0.000 sys 0.010+0.000)
after: real 3.480 secs (user 3.440+0.000 sys 0.030+0.000)
Also, this will allow us to parse nested templates at once for better error
indication.
2015-06-13 13:49:54 +03:00
|
|
|
rawstring: {rev}
|
2016-02-13 19:06:12 +03:00
|
|
|
$ hg debugtemplate -Ra -r0 -v '{files % r"rawstring: {file}"}\n'
|
|
|
|
(template
|
|
|
|
(%
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'files')
|
|
|
|
(string 'rawstring: {file}'))
|
|
|
|
(string '\n'))
|
2016-02-14 09:42:49 +03:00
|
|
|
rawstring: {file}
|
2015-06-10 15:44:43 +03:00
|
|
|
|
2013-11-19 20:29:56 +04:00
|
|
|
Test string escaping:
|
2013-11-22 00:47:03 +04:00
|
|
|
|
2013-11-18 23:02:26 +04:00
|
|
|
$ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
|
|
|
|
>
|
|
|
|
<>\n<[>
|
|
|
|
<>\n<]>
|
|
|
|
<>\n<
|
2013-11-19 00:37:09 +04:00
|
|
|
|
2015-05-04 03:54:01 +03:00
|
|
|
$ hg log -R latesttag -r 0 \
|
|
|
|
> --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
|
|
|
|
>
|
|
|
|
<>\n<[>
|
|
|
|
<>\n<]>
|
|
|
|
<>\n<
|
|
|
|
|
|
|
|
$ hg log -R latesttag -r 0 -T esc \
|
|
|
|
> --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
|
|
|
|
>
|
|
|
|
<>\n<[>
|
|
|
|
<>\n<]>
|
|
|
|
<>\n<
|
|
|
|
|
|
|
|
$ cat <<'EOF' > esctmpl
|
|
|
|
> changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log -R latesttag -r 0 --style ./esctmpl
|
|
|
|
>
|
|
|
|
<>\n<[>
|
|
|
|
<>\n<]>
|
|
|
|
<>\n<
|
|
|
|
|
2015-06-21 07:24:43 +03:00
|
|
|
Test string escaping of quotes:
|
|
|
|
|
|
|
|
$ hg log -Ra -r0 -T '{"\""}\n'
|
|
|
|
"
|
|
|
|
$ hg log -Ra -r0 -T '{"\\\""}\n'
|
|
|
|
\"
|
|
|
|
$ hg log -Ra -r0 -T '{r"\""}\n'
|
|
|
|
\"
|
|
|
|
$ hg log -Ra -r0 -T '{r"\\\""}\n'
|
|
|
|
\\\"
|
|
|
|
|
templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)
As of Mercurial 3.4, there were several syntax rules to process nested
template strings. Unfortunately, they were inconsistent and conflicted
each other.
a. buildmap() rule
- template string is _parsed_ as string, and parsed as template
- <\"> is not allowed in nested template:
{xs % "{f(\"{x}\")}"} -> parse error
- template escaping <\{> is handled consistently:
{xs % "\{x}"} -> escaped
b. _evalifliteral() rule
- template string is _interpreted_ as string, and parsed as template
in crafted environment to avoid double processing of escape sequences
- <\"> is allowed in nested template:
{if(x, "{f(\"{x}\")}")}
- <\{> and escape sequences in string literal in nested template are not
handled well
c. pad() rule
- template string is first interpreted as string, and parsed as template,
which means escape sequences are processed twice
- <\"> is allowed in nested template:
{pad("{xs % \"{x}\"}', 10)}
Because of the issue of template escaping, issue4714, 56e0b66a4c27 (in stable)
unified the rule (b) to (a). Then, 41e044cfb1ef (in default) unified the rule
(c) to (b) = (a). But they disabled the following syntax that was somewhat
considered valid.
{if(rev, "{if(rev, \"{rev}\")}")}
{pad("{files % \"{file}\"}", 10)}
So, this patch introduces \"...\" literal to work around the escaped-quoted
nested template strings. Because this parsing rule exists only for the backward
compatibility, it is designed to copy the behavior of old _evalifliteral() as
possible.
Future patches will introduce a better parsing rule similar to a command
substitution of POSIX shells or a string interpolation of Ruby, where extra
escapes won't be necessary at all.
{pad("{files % "{file}"}", 10)}
~~~~~~~~~~~~~~~~~~
parsed as a template, not as a string
Because <\> character wasn't allowed in a template fragment, this patch won't
introduce more breakages. But the syntax of nested templates are interpreted
differently by people, there might be unknown issues. So if we want, we could
instead remove e926f2ef639a, 72be08a15d8d and 56e0b66a4c27 from the stable
branch as the bug fixed by these patches existed for longer periods.
554d6fcc3c8, "strip single backslash before quotation mark in quoted template",
should be superseded by this patch. I'll remove it later.
2015-06-25 16:07:38 +03:00
|
|
|
|
2015-07-02 00:33:31 +03:00
|
|
|
$ hg log -Ra -r0 -T '{"\""}\n'
|
|
|
|
"
|
|
|
|
$ hg log -Ra -r0 -T '{"\\\""}\n'
|
|
|
|
\"
|
|
|
|
$ hg log -Ra -r0 -T '{r"\""}\n'
|
|
|
|
\"
|
|
|
|
$ hg log -Ra -r0 -T '{r"\\\""}\n'
|
|
|
|
\\\"
|
|
|
|
|
templater: strip single backslash before quotation mark in quoted template
e926f2ef639a fixed the issue of double escapes, but it made the following
template fail with syntax error because of <\">. Strictly speaking, <\">
appears to be invalid in non-string part, but we are likely to escape <">
if surrounded by quotes, and we are used to write such templates by trial
and error.
[templates]
sl = "{tags % \"{ifeq(tag,'tip','',label('log.tag', ' {tag}'))}\"}"
So, for backward compatibility between 2.8.1 and 3.4, a single backslash
before quotation mark is stripped only in quoted template. We don't care
for <\"> in string literal in quoted template, which never worked as expected
before.
template result
--------- ------------------------
{\"\"} parse error
"{""}" {""} -> <>
"{\"\"}" {""} -> <>
{"\""} {"\""} -> <">
'{"\""}' {"\""} -> <">
"{"\""}" parse error (don't care)
2015-05-08 12:11:26 +03:00
|
|
|
Test exception in quoted template. single backslash before quotation mark is
|
|
|
|
stripped before parsing:
|
|
|
|
|
|
|
|
$ cat <<'EOF' > escquotetmpl
|
|
|
|
> changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n"
|
|
|
|
> EOF
|
|
|
|
$ cd latesttag
|
|
|
|
$ hg log -r 2 --style ../escquotetmpl
|
|
|
|
" \" \" \\" head1
|
|
|
|
|
|
|
|
$ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"'
|
|
|
|
valid
|
|
|
|
$ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'"
|
|
|
|
valid
|
2015-07-02 00:33:31 +03:00
|
|
|
|
|
|
|
Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested
|
|
|
|
_evalifliteral() templates (issue4733):
|
templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)
As of Mercurial 3.4, there were several syntax rules to process nested
template strings. Unfortunately, they were inconsistent and conflicted
each other.
a. buildmap() rule
- template string is _parsed_ as string, and parsed as template
- <\"> is not allowed in nested template:
{xs % "{f(\"{x}\")}"} -> parse error
- template escaping <\{> is handled consistently:
{xs % "\{x}"} -> escaped
b. _evalifliteral() rule
- template string is _interpreted_ as string, and parsed as template
in crafted environment to avoid double processing of escape sequences
- <\"> is allowed in nested template:
{if(x, "{f(\"{x}\")}")}
- <\{> and escape sequences in string literal in nested template are not
handled well
c. pad() rule
- template string is first interpreted as string, and parsed as template,
which means escape sequences are processed twice
- <\"> is allowed in nested template:
{pad("{xs % \"{x}\"}', 10)}
Because of the issue of template escaping, issue4714, 56e0b66a4c27 (in stable)
unified the rule (b) to (a). Then, 41e044cfb1ef (in default) unified the rule
(c) to (b) = (a). But they disabled the following syntax that was somewhat
considered valid.
{if(rev, "{if(rev, \"{rev}\")}")}
{pad("{files % \"{file}\"}", 10)}
So, this patch introduces \"...\" literal to work around the escaped-quoted
nested template strings. Because this parsing rule exists only for the backward
compatibility, it is designed to copy the behavior of old _evalifliteral() as
possible.
Future patches will introduce a better parsing rule similar to a command
substitution of POSIX shells or a string interpolation of Ruby, where extra
escapes won't be necessary at all.
{pad("{files % "{file}"}", 10)}
~~~~~~~~~~~~~~~~~~
parsed as a template, not as a string
Because <\> character wasn't allowed in a template fragment, this patch won't
introduce more breakages. But the syntax of nested templates are interpreted
differently by people, there might be unknown issues. So if we want, we could
instead remove e926f2ef639a, 72be08a15d8d and 56e0b66a4c27 from the stable
branch as the bug fixed by these patches existed for longer periods.
554d6fcc3c8, "strip single backslash before quotation mark in quoted template",
should be superseded by this patch. I'll remove it later.
2015-06-25 16:07:38 +03:00
|
|
|
|
|
|
|
$ hg log -r 2 -T '{if(rev, "\"{rev}")}\n'
|
|
|
|
"2
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n'
|
|
|
|
"2
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n'
|
|
|
|
"2
|
|
|
|
|
|
|
|
$ hg log -r 2 -T '{if(rev, "\\\"")}\n'
|
|
|
|
\"
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n'
|
|
|
|
\"
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n'
|
|
|
|
\"
|
|
|
|
|
|
|
|
$ hg log -r 2 -T '{if(rev, r"\\\"")}\n'
|
|
|
|
\\\"
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n'
|
|
|
|
\\\"
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n'
|
|
|
|
\\\"
|
|
|
|
|
|
|
|
escaped single quotes and errors:
|
|
|
|
|
|
|
|
$ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n'
|
|
|
|
foo
|
|
|
|
$ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n'
|
|
|
|
foo
|
|
|
|
$ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n'
|
2015-06-15 17:11:35 +03:00
|
|
|
hg: parse error at 21: unterminated string
|
2018-03-16 21:14:41 +03:00
|
|
|
({if(rev, "{if(rev, \")}")}\n
|
|
|
|
^ here)
|
templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)
As of Mercurial 3.4, there were several syntax rules to process nested
template strings. Unfortunately, they were inconsistent and conflicted
each other.
a. buildmap() rule
- template string is _parsed_ as string, and parsed as template
- <\"> is not allowed in nested template:
{xs % "{f(\"{x}\")}"} -> parse error
- template escaping <\{> is handled consistently:
{xs % "\{x}"} -> escaped
b. _evalifliteral() rule
- template string is _interpreted_ as string, and parsed as template
in crafted environment to avoid double processing of escape sequences
- <\"> is allowed in nested template:
{if(x, "{f(\"{x}\")}")}
- <\{> and escape sequences in string literal in nested template are not
handled well
c. pad() rule
- template string is first interpreted as string, and parsed as template,
which means escape sequences are processed twice
- <\"> is allowed in nested template:
{pad("{xs % \"{x}\"}', 10)}
Because of the issue of template escaping, issue4714, 56e0b66a4c27 (in stable)
unified the rule (b) to (a). Then, 41e044cfb1ef (in default) unified the rule
(c) to (b) = (a). But they disabled the following syntax that was somewhat
considered valid.
{if(rev, "{if(rev, \"{rev}\")}")}
{pad("{files % \"{file}\"}", 10)}
So, this patch introduces \"...\" literal to work around the escaped-quoted
nested template strings. Because this parsing rule exists only for the backward
compatibility, it is designed to copy the behavior of old _evalifliteral() as
possible.
Future patches will introduce a better parsing rule similar to a command
substitution of POSIX shells or a string interpolation of Ruby, where extra
escapes won't be necessary at all.
{pad("{files % "{file}"}", 10)}
~~~~~~~~~~~~~~~~~~
parsed as a template, not as a string
Because <\> character wasn't allowed in a template fragment, this patch won't
introduce more breakages. But the syntax of nested templates are interpreted
differently by people, there might be unknown issues. So if we want, we could
instead remove e926f2ef639a, 72be08a15d8d and 56e0b66a4c27 from the stable
branch as the bug fixed by these patches existed for longer periods.
554d6fcc3c8, "strip single backslash before quotation mark in quoted template",
should be superseded by this patch. I'll remove it later.
2015-06-25 16:07:38 +03:00
|
|
|
[255]
|
|
|
|
$ hg log -r 2 -T '{if(rev, \"\\"")}\n'
|
2015-09-10 00:43:45 +03:00
|
|
|
hg: parse error: trailing \ in string
|
templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)
As of Mercurial 3.4, there were several syntax rules to process nested
template strings. Unfortunately, they were inconsistent and conflicted
each other.
a. buildmap() rule
- template string is _parsed_ as string, and parsed as template
- <\"> is not allowed in nested template:
{xs % "{f(\"{x}\")}"} -> parse error
- template escaping <\{> is handled consistently:
{xs % "\{x}"} -> escaped
b. _evalifliteral() rule
- template string is _interpreted_ as string, and parsed as template
in crafted environment to avoid double processing of escape sequences
- <\"> is allowed in nested template:
{if(x, "{f(\"{x}\")}")}
- <\{> and escape sequences in string literal in nested template are not
handled well
c. pad() rule
- template string is first interpreted as string, and parsed as template,
which means escape sequences are processed twice
- <\"> is allowed in nested template:
{pad("{xs % \"{x}\"}', 10)}
Because of the issue of template escaping, issue4714, 56e0b66a4c27 (in stable)
unified the rule (b) to (a). Then, 41e044cfb1ef (in default) unified the rule
(c) to (b) = (a). But they disabled the following syntax that was somewhat
considered valid.
{if(rev, "{if(rev, \"{rev}\")}")}
{pad("{files % \"{file}\"}", 10)}
So, this patch introduces \"...\" literal to work around the escaped-quoted
nested template strings. Because this parsing rule exists only for the backward
compatibility, it is designed to copy the behavior of old _evalifliteral() as
possible.
Future patches will introduce a better parsing rule similar to a command
substitution of POSIX shells or a string interpolation of Ruby, where extra
escapes won't be necessary at all.
{pad("{files % "{file}"}", 10)}
~~~~~~~~~~~~~~~~~~
parsed as a template, not as a string
Because <\> character wasn't allowed in a template fragment, this patch won't
introduce more breakages. But the syntax of nested templates are interpreted
differently by people, there might be unknown issues. So if we want, we could
instead remove e926f2ef639a, 72be08a15d8d and 56e0b66a4c27 from the stable
branch as the bug fixed by these patches existed for longer periods.
554d6fcc3c8, "strip single backslash before quotation mark in quoted template",
should be superseded by this patch. I'll remove it later.
2015-06-25 16:07:38 +03:00
|
|
|
[255]
|
|
|
|
$ hg log -r 2 -T '{if(rev, r\"\\"")}\n'
|
2015-09-10 00:43:45 +03:00
|
|
|
hg: parse error: trailing \ in string
|
templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)
As of Mercurial 3.4, there were several syntax rules to process nested
template strings. Unfortunately, they were inconsistent and conflicted
each other.
a. buildmap() rule
- template string is _parsed_ as string, and parsed as template
- <\"> is not allowed in nested template:
{xs % "{f(\"{x}\")}"} -> parse error
- template escaping <\{> is handled consistently:
{xs % "\{x}"} -> escaped
b. _evalifliteral() rule
- template string is _interpreted_ as string, and parsed as template
in crafted environment to avoid double processing of escape sequences
- <\"> is allowed in nested template:
{if(x, "{f(\"{x}\")}")}
- <\{> and escape sequences in string literal in nested template are not
handled well
c. pad() rule
- template string is first interpreted as string, and parsed as template,
which means escape sequences are processed twice
- <\"> is allowed in nested template:
{pad("{xs % \"{x}\"}', 10)}
Because of the issue of template escaping, issue4714, 56e0b66a4c27 (in stable)
unified the rule (b) to (a). Then, 41e044cfb1ef (in default) unified the rule
(c) to (b) = (a). But they disabled the following syntax that was somewhat
considered valid.
{if(rev, "{if(rev, \"{rev}\")}")}
{pad("{files % \"{file}\"}", 10)}
So, this patch introduces \"...\" literal to work around the escaped-quoted
nested template strings. Because this parsing rule exists only for the backward
compatibility, it is designed to copy the behavior of old _evalifliteral() as
possible.
Future patches will introduce a better parsing rule similar to a command
substitution of POSIX shells or a string interpolation of Ruby, where extra
escapes won't be necessary at all.
{pad("{files % "{file}"}", 10)}
~~~~~~~~~~~~~~~~~~
parsed as a template, not as a string
Because <\> character wasn't allowed in a template fragment, this patch won't
introduce more breakages. But the syntax of nested templates are interpreted
differently by people, there might be unknown issues. So if we want, we could
instead remove e926f2ef639a, 72be08a15d8d and 56e0b66a4c27 from the stable
branch as the bug fixed by these patches existed for longer periods.
554d6fcc3c8, "strip single backslash before quotation mark in quoted template",
should be superseded by this patch. I'll remove it later.
2015-06-25 16:07:38 +03:00
|
|
|
[255]
|
|
|
|
|
templater: strip single backslash before quotation mark in quoted template
e926f2ef639a fixed the issue of double escapes, but it made the following
template fail with syntax error because of <\">. Strictly speaking, <\">
appears to be invalid in non-string part, but we are likely to escape <">
if surrounded by quotes, and we are used to write such templates by trial
and error.
[templates]
sl = "{tags % \"{ifeq(tag,'tip','',label('log.tag', ' {tag}'))}\"}"
So, for backward compatibility between 2.8.1 and 3.4, a single backslash
before quotation mark is stripped only in quoted template. We don't care
for <\"> in string literal in quoted template, which never worked as expected
before.
template result
--------- ------------------------
{\"\"} parse error
"{""}" {""} -> <>
"{\"\"}" {""} -> <>
{"\""} {"\""} -> <">
'{"\""}' {"\""} -> <">
"{"\""}" parse error (don't care)
2015-05-08 12:11:26 +03:00
|
|
|
$ cd ..
|
|
|
|
|
2015-05-04 04:17:34 +03:00
|
|
|
Test leading backslashes:
|
|
|
|
|
|
|
|
$ cd latesttag
|
2015-06-10 15:44:43 +03:00
|
|
|
$ hg log -r 2 -T '\{rev} {files % "\{file}"}\n'
|
|
|
|
{rev} {file}
|
|
|
|
$ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n'
|
|
|
|
\2 \head1
|
|
|
|
$ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n'
|
|
|
|
\{rev} \{file}
|
2015-05-04 04:17:34 +03:00
|
|
|
$ cd ..
|
|
|
|
|
2015-06-08 12:14:22 +03:00
|
|
|
Test leading backslashes in "if" expression (issue4714):
|
|
|
|
|
|
|
|
$ cd latesttag
|
|
|
|
$ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n'
|
2015-06-10 15:44:43 +03:00
|
|
|
{rev} \{rev}
|
2015-06-08 12:14:22 +03:00
|
|
|
$ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n'
|
2015-06-10 15:44:43 +03:00
|
|
|
\2 \\{rev}
|
2015-06-08 12:14:22 +03:00
|
|
|
$ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n'
|
2015-06-10 15:44:43 +03:00
|
|
|
\{rev} \\\{rev}
|
2015-06-08 12:14:22 +03:00
|
|
|
$ cd ..
|
|
|
|
|
templater: make strings in template expressions be "string-escape"-ed correctly
Changeset 83ff877959a6 (released with 2.8.1) fixed "recursively
evaluate string literals as templates" problem (issue4102) by moving
the location of "string-escape"-ing from "tokenizer()" to
"compiletemplate()".
But some parts in template expressions below are not processed by
"compiletemplate()", and it may cause unexpected result.
- 'expr' of 'if(expr, then, else)'
- 'expr's of 'ifeq(expr, expr, then, else)'
- 'sep' of 'join(list, sep)'
- 'text' and 'style' of 'rstdoc(text, style)'
- 'text' and 'chars' of 'strip(text, chars)'
- 'pat' and 'repl' of 'sub(pat, repl, expr)'
For example, '\n' of "{join(extras, '\n')}" is not "string-escape"-ed
and treated as a literal '\n'. This breaks "Display the contents of
the 'extra' field, one per line" example in "hg help templates".
Just "string-escape"-ing on each parts above may not work correctly,
because inside expression of nested ones already applies
"string-escape" on string literals. For example:
- "{join(files, '\n')}" doesn't return "string-escape"-ed string, but
- "{join(files, if(branch, '\n', '\n'))}" does
To fix this problem, this patch does:
- introduce "rawstring" token and "runrawstring" method to handle
strings not to be "string-escape"-ed correctly, and
- make "runstring" method return "string-escape"-ed string, and
delay "string-escape"-ing until evaluation
This patch invokes "compiletemplate()" with "strtoken=exp[0]" in
"gettemplate()", because "exp[1]" is not yet evaluated. This code path
is tested via mapping ("expr % '{template}'").
In the other hand, this patch invokes it with "strtoken='rawstring'"
in "_evalifliteral()", because "t" is the result of "arg" evaluation
and it should be "string-escape"-ed if "arg" is "string" expression.
This patch doesn't test "string-escape"-ing on 'expr' of 'if(expr,
then, else)', because it doesn't affect the result.
2014-03-09 20:01:43 +04:00
|
|
|
"string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice)
|
|
|
|
|
|
|
|
$ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n'
|
|
|
|
\x6e
|
|
|
|
$ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n'
|
|
|
|
\x5c\x786e
|
|
|
|
$ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n'
|
|
|
|
\x6e
|
|
|
|
$ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n'
|
|
|
|
\x5c\x786e
|
|
|
|
|
|
|
|
$ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n'
|
|
|
|
\x6e
|
|
|
|
$ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n'
|
|
|
|
\x5c\x786e
|
|
|
|
$ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n'
|
|
|
|
\x6e
|
|
|
|
$ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n'
|
|
|
|
\x5c\x786e
|
|
|
|
|
|
|
|
$ hg log -R a -r 8 --template '{join(files, "\n")}\n'
|
|
|
|
fourth
|
|
|
|
second
|
|
|
|
third
|
|
|
|
$ hg log -R a -r 8 --template '{join(files, r"\n")}\n'
|
|
|
|
fourth\nsecond\nthird
|
|
|
|
|
|
|
|
$ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}'
|
|
|
|
<p>
|
|
|
|
1st
|
|
|
|
</p>
|
|
|
|
<p>
|
|
|
|
2nd
|
|
|
|
</p>
|
|
|
|
$ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}'
|
|
|
|
<p>
|
|
|
|
1st\n\n2nd
|
|
|
|
</p>
|
|
|
|
$ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}'
|
|
|
|
1st
|
|
|
|
|
|
|
|
2nd
|
|
|
|
|
|
|
|
$ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n'
|
|
|
|
o perso
|
|
|
|
$ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n'
|
|
|
|
no person
|
|
|
|
$ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n'
|
|
|
|
o perso
|
|
|
|
$ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n'
|
|
|
|
no perso
|
|
|
|
|
|
|
|
$ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n'
|
|
|
|
-o perso-
|
|
|
|
$ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n'
|
|
|
|
no person
|
|
|
|
$ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n'
|
|
|
|
\x2do perso\x2d
|
|
|
|
$ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n'
|
|
|
|
-o perso-
|
|
|
|
$ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n'
|
|
|
|
\x2do perso\x6e
|
|
|
|
|
|
|
|
$ hg log -R a -r 8 --template '{files % "{file}\n"}'
|
|
|
|
fourth
|
|
|
|
second
|
|
|
|
third
|
|
|
|
|
2014-04-13 21:01:00 +04:00
|
|
|
Test string escaping in nested expression:
|
templater: make strings in template expressions be "string-escape"-ed correctly
Changeset 83ff877959a6 (released with 2.8.1) fixed "recursively
evaluate string literals as templates" problem (issue4102) by moving
the location of "string-escape"-ing from "tokenizer()" to
"compiletemplate()".
But some parts in template expressions below are not processed by
"compiletemplate()", and it may cause unexpected result.
- 'expr' of 'if(expr, then, else)'
- 'expr's of 'ifeq(expr, expr, then, else)'
- 'sep' of 'join(list, sep)'
- 'text' and 'style' of 'rstdoc(text, style)'
- 'text' and 'chars' of 'strip(text, chars)'
- 'pat' and 'repl' of 'sub(pat, repl, expr)'
For example, '\n' of "{join(extras, '\n')}" is not "string-escape"-ed
and treated as a literal '\n'. This breaks "Display the contents of
the 'extra' field, one per line" example in "hg help templates".
Just "string-escape"-ing on each parts above may not work correctly,
because inside expression of nested ones already applies
"string-escape" on string literals. For example:
- "{join(files, '\n')}" doesn't return "string-escape"-ed string, but
- "{join(files, if(branch, '\n', '\n'))}" does
To fix this problem, this patch does:
- introduce "rawstring" token and "runrawstring" method to handle
strings not to be "string-escape"-ed correctly, and
- make "runstring" method return "string-escape"-ed string, and
delay "string-escape"-ing until evaluation
This patch invokes "compiletemplate()" with "strtoken=exp[0]" in
"gettemplate()", because "exp[1]" is not yet evaluated. This code path
is tested via mapping ("expr % '{template}'").
In the other hand, this patch invokes it with "strtoken='rawstring'"
in "_evalifliteral()", because "t" is the result of "arg" evaluation
and it should be "string-escape"-ed if "arg" is "string" expression.
This patch doesn't test "string-escape"-ing on 'expr' of 'if(expr,
then, else)', because it doesn't affect the result.
2014-03-09 20:01:43 +04:00
|
|
|
|
|
|
|
$ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n'
|
|
|
|
fourth\x6esecond\x6ethird
|
|
|
|
$ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n'
|
|
|
|
fourth\x6esecond\x6ethird
|
|
|
|
|
|
|
|
$ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n'
|
|
|
|
fourth\x6esecond\x6ethird
|
|
|
|
$ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n'
|
|
|
|
fourth\x5c\x786esecond\x5c\x786ethird
|
|
|
|
|
|
|
|
$ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n'
|
|
|
|
3:\x6eo user, \x6eo domai\x6e
|
|
|
|
4:\x5c\x786eew bra\x5c\x786ech
|
|
|
|
|
2015-06-15 17:11:35 +03:00
|
|
|
Test quotes in nested expression are evaluated just like a $(command)
|
|
|
|
substitution in POSIX shells:
|
|
|
|
|
|
|
|
$ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n'
|
|
|
|
8:95c24699272e
|
|
|
|
$ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n'
|
|
|
|
{8} "95c24699272e"
|
|
|
|
|
2013-11-19 00:37:09 +04:00
|
|
|
Test recursive evaluation:
|
|
|
|
|
|
|
|
$ hg init r
|
|
|
|
$ cd r
|
|
|
|
$ echo a > a
|
|
|
|
$ hg ci -Am '{rev}'
|
|
|
|
adding a
|
|
|
|
$ hg log -r 0 --template '{if(rev, desc)}\n'
|
|
|
|
{rev}
|
|
|
|
$ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n'
|
|
|
|
test 0
|
2013-11-21 21:30:52 +04:00
|
|
|
|
2014-03-09 20:01:42 +04:00
|
|
|
$ hg branch -q 'text.{rev}'
|
|
|
|
$ echo aa >> aa
|
|
|
|
$ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
|
|
|
|
|
2014-03-12 01:19:08 +04:00
|
|
|
$ hg log -l1 --template '{fill(desc, "20", author, branch)}'
|
2014-03-09 20:01:42 +04:00
|
|
|
{node|short}desc to
|
|
|
|
text.{rev}be wrapped
|
|
|
|
text.{rev}desc to be
|
|
|
|
text.{rev}wrapped (no-eol)
|
2014-03-12 01:19:08 +04:00
|
|
|
$ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}'
|
2014-03-09 20:01:42 +04:00
|
|
|
bcc7ff960b8e:desc to
|
|
|
|
text.1:be wrapped
|
|
|
|
text.1:desc to be
|
|
|
|
text.1:wrapped (no-eol)
|
2016-02-14 06:48:14 +03:00
|
|
|
$ hg log -l1 -T '{fill(desc, date, "", "")}\n'
|
|
|
|
hg: parse error: fill expects an integer width
|
|
|
|
[255]
|
2014-03-09 20:01:42 +04:00
|
|
|
|
2016-10-08 12:26:48 +03:00
|
|
|
$ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}'
|
|
|
|
bcc7ff960b8e:desc to be
|
|
|
|
termwidth.1:wrapped desc
|
|
|
|
termwidth.1:to be wrapped (no-eol)
|
|
|
|
|
2014-03-12 01:19:08 +04:00
|
|
|
$ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}'
|
2014-03-09 20:01:42 +04:00
|
|
|
{node|short} (no-eol)
|
2014-03-12 01:19:08 +04:00
|
|
|
$ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}'
|
2014-03-09 20:01:42 +04:00
|
|
|
bcc-ff---b-e (no-eol)
|
|
|
|
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> color=
|
|
|
|
> [color]
|
|
|
|
> mode=ansi
|
|
|
|
> text.{rev} = red
|
|
|
|
> text.1 = green
|
|
|
|
> EOF
|
2014-03-12 01:19:08 +04:00
|
|
|
$ hg log --color=always -l 1 --template '{label(branch, "text\n")}'
|
2014-03-09 20:01:42 +04:00
|
|
|
\x1b[0;31mtext\x1b[0m (esc)
|
2014-03-12 01:19:08 +04:00
|
|
|
$ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}'
|
2014-03-09 20:01:42 +04:00
|
|
|
\x1b[0;32mtext\x1b[0m (esc)
|
|
|
|
|
2015-06-11 16:58:27 +03:00
|
|
|
color effect can be specified without quoting:
|
|
|
|
|
|
|
|
$ hg log --color=always -l 1 --template '{label(red, "text\n")}'
|
|
|
|
\x1b[0;31mtext\x1b[0m (esc)
|
|
|
|
|
2017-03-18 14:11:15 +03:00
|
|
|
color effects can be nested (issue5413)
|
|
|
|
|
|
|
|
$ hg debugtemplate --color=always \
|
|
|
|
> '{label(red, "red{label(magenta, "ma{label(cyan, "cyan")}{label(yellow, "yellow")}genta")}")}\n'
|
|
|
|
\x1b[0;31mred\x1b[0;35mma\x1b[0;36mcyan\x1b[0m\x1b[0;31m\x1b[0;35m\x1b[0;33myellow\x1b[0m\x1b[0;31m\x1b[0;35mgenta\x1b[0m (esc)
|
|
|
|
|
2017-03-18 15:02:20 +03:00
|
|
|
pad() should interact well with color codes (issue5416)
|
|
|
|
|
|
|
|
$ hg debugtemplate --color=always \
|
|
|
|
> '{pad(label(red, "red"), 5, label(cyan, "-"))}\n'
|
|
|
|
\x1b[0;31mred\x1b[0m\x1b[0;36m-\x1b[0m\x1b[0;36m-\x1b[0m (esc)
|
|
|
|
|
2015-06-11 17:04:14 +03:00
|
|
|
label should be no-op if color is disabled:
|
|
|
|
|
|
|
|
$ hg log --color=never -l 1 --template '{label(red, "text\n")}'
|
|
|
|
text
|
|
|
|
$ hg log --config extensions.color=! -l 1 --template '{label(red, "text\n")}'
|
|
|
|
text
|
|
|
|
|
2013-11-21 21:30:52 +04:00
|
|
|
Test branches inside if statement:
|
|
|
|
|
|
|
|
$ hg log -r 0 --template '{if(branches, "yes", "no")}\n'
|
|
|
|
no
|
2014-01-17 12:10:37 +04:00
|
|
|
|
2017-04-03 16:54:06 +03:00
|
|
|
Test dict constructor:
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{dict(y=node|short, x=rev)}\n'
|
|
|
|
y=f7769ec2ab97 x=0
|
|
|
|
$ hg log -r 0 -T '{dict(x=rev, y=node|short) % "{key}={value}\n"}'
|
|
|
|
x=0
|
|
|
|
y=f7769ec2ab97
|
|
|
|
$ hg log -r 0 -T '{dict(x=rev, y=node|short)|json}\n'
|
|
|
|
{"x": 0, "y": "f7769ec2ab97"}
|
|
|
|
$ hg log -r 0 -T '{dict()|json}\n'
|
|
|
|
{}
|
|
|
|
|
2017-04-03 17:13:49 +03:00
|
|
|
$ hg log -r 0 -T '{dict(rev, node=node|short)}\n'
|
|
|
|
rev=0 node=f7769ec2ab97
|
|
|
|
$ hg log -r 0 -T '{dict(rev, node|short)}\n'
|
|
|
|
rev=0 node=f7769ec2ab97
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{dict(rev, rev=rev)}\n'
|
|
|
|
hg: parse error: duplicated dict key 'rev' inferred
|
|
|
|
[255]
|
|
|
|
$ hg log -r 0 -T '{dict(node, node|short)}\n'
|
|
|
|
hg: parse error: duplicated dict key 'node' inferred
|
|
|
|
[255]
|
|
|
|
$ hg log -r 0 -T '{dict(1 + 2)}'
|
|
|
|
hg: parse error: dict key cannot be inferred
|
|
|
|
[255]
|
|
|
|
|
2017-04-03 16:54:06 +03:00
|
|
|
$ hg log -r 0 -T '{dict(x=rev, x=node)}'
|
|
|
|
hg: parse error: dict got multiple values for keyword argument 'x'
|
|
|
|
[255]
|
|
|
|
|
2015-02-18 17:17:52 +03:00
|
|
|
Test get function:
|
|
|
|
|
|
|
|
$ hg log -r 0 --template '{get(extras, "branch")}\n'
|
|
|
|
default
|
2016-02-13 18:05:58 +03:00
|
|
|
$ hg log -r 0 --template '{get(extras, "br{"anch"}")}\n'
|
|
|
|
default
|
2015-02-18 17:17:52 +03:00
|
|
|
$ hg log -r 0 --template '{get(files, "should_fail")}\n'
|
|
|
|
hg: parse error: get() expects a dict as first argument
|
|
|
|
[255]
|
|
|
|
|
2017-04-04 16:31:59 +03:00
|
|
|
Test json filter applied to hybrid object:
|
|
|
|
|
|
|
|
$ hg log -r0 -T '{files|json}\n'
|
|
|
|
["a"]
|
|
|
|
$ hg log -r0 -T '{extras|json}\n'
|
|
|
|
{"branch": "default"}
|
|
|
|
|
2015-08-18 16:15:46 +03:00
|
|
|
Test localdate(date, tz) function:
|
|
|
|
|
|
|
|
$ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n'
|
|
|
|
1970-01-01 09:00 +0900
|
|
|
|
$ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n'
|
|
|
|
1970-01-01 00:00 +0000
|
2016-07-27 23:14:19 +03:00
|
|
|
$ TZ=JST-09 hg log -r0 -T '{localdate(date, "blahUTC")|isodate}\n'
|
|
|
|
hg: parse error: localdate expects a timezone
|
|
|
|
[255]
|
2015-08-18 16:15:46 +03:00
|
|
|
$ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n'
|
|
|
|
1970-01-01 02:00 +0200
|
|
|
|
$ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n'
|
|
|
|
1970-01-01 00:00 +0000
|
|
|
|
$ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n'
|
|
|
|
1970-01-01 00:00 +0000
|
|
|
|
$ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n'
|
|
|
|
hg: parse error: localdate expects a timezone
|
|
|
|
[255]
|
|
|
|
$ hg log -r0 -T '{localdate(date, date)|isodate}\n'
|
|
|
|
hg: parse error: localdate expects a timezone
|
|
|
|
[255]
|
|
|
|
|
2014-01-17 12:10:37 +04:00
|
|
|
Test shortest(node) function:
|
|
|
|
|
|
|
|
$ echo b > b
|
|
|
|
$ hg ci -qAm b
|
|
|
|
$ hg log --template '{shortest(node)}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
e777
|
|
|
|
bcc7
|
2014-01-17 12:10:37 +04:00
|
|
|
f776
|
|
|
|
$ hg log --template '{shortest(node, 10)}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
e777603221
|
|
|
|
bcc7ff960b
|
2014-01-17 12:10:37 +04:00
|
|
|
f7769ec2ab
|
2015-07-04 10:03:36 +03:00
|
|
|
$ hg log --template '{node|shortest}\n' -l1
|
|
|
|
e777
|
2014-01-17 12:16:48 +04:00
|
|
|
|
2016-02-14 07:09:17 +03:00
|
|
|
$ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n'
|
|
|
|
f7769ec2ab
|
|
|
|
$ hg log -r 0 -T '{shortest(node, "not an int")}\n'
|
|
|
|
hg: parse error: shortest() expects an integer minlength
|
|
|
|
[255]
|
|
|
|
|
2016-08-19 12:26:04 +03:00
|
|
|
$ hg log -r 'wdir()' -T '{node|shortest}\n'
|
|
|
|
ffff
|
|
|
|
|
2016-10-23 08:05:23 +03:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Test shortest(node) with the repo having short hash collision:
|
|
|
|
|
|
|
|
$ hg init hashcollision
|
|
|
|
$ cd hashcollision
|
|
|
|
$ cat <<EOF >> .hg/hgrc
|
|
|
|
> [experimental]
|
2017-09-28 20:19:06 +03:00
|
|
|
> evolution.createmarkers=True
|
2016-10-23 08:05:23 +03:00
|
|
|
> EOF
|
|
|
|
$ echo 0 > a
|
|
|
|
$ hg ci -qAm 0
|
|
|
|
$ for i in 17 129 248 242 480 580 617 1057 2857 4025; do
|
|
|
|
> hg up -q 0
|
|
|
|
> echo $i > a
|
|
|
|
> hg ci -qm $i
|
|
|
|
> done
|
|
|
|
$ hg up -q null
|
|
|
|
$ hg log -r0: -T '{rev}:{node}\n'
|
|
|
|
0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
|
|
|
|
1:11424df6dc1dd4ea255eae2b58eaca7831973bbc
|
|
|
|
2:11407b3f1b9c3e76a79c1ec5373924df096f0499
|
|
|
|
3:11dd92fe0f39dfdaacdaa5f3997edc533875cfc4
|
|
|
|
4:10776689e627b465361ad5c296a20a487e153ca4
|
|
|
|
5:a00be79088084cb3aff086ab799f8790e01a976b
|
|
|
|
6:a0b0acd79b4498d0052993d35a6a748dd51d13e6
|
|
|
|
7:a0457b3450b8e1b778f1163b31a435802987fe5d
|
|
|
|
8:c56256a09cd28e5764f32e8e2810d0f01e2e357a
|
|
|
|
9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
|
|
|
|
10:c562ddd9c94164376c20b86b0b4991636a3bf84f
|
|
|
|
$ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
|
2017-07-16 03:33:14 +03:00
|
|
|
obsoleted 1 changesets
|
2016-10-23 08:05:23 +03:00
|
|
|
$ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
|
2017-07-16 03:33:14 +03:00
|
|
|
obsoleted 1 changesets
|
2016-10-23 08:05:23 +03:00
|
|
|
$ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
|
2017-07-16 03:33:14 +03:00
|
|
|
obsoleted 1 changesets
|
2016-10-23 08:05:23 +03:00
|
|
|
|
|
|
|
nodes starting with '11' (we don't have the revision number '11' though)
|
|
|
|
|
|
|
|
$ hg log -r 1:3 -T '{rev}:{shortest(node, 0)}\n'
|
|
|
|
1:1142
|
|
|
|
2:1140
|
|
|
|
3:11d
|
|
|
|
|
|
|
|
'5:a00' is hidden, but still we have two nodes starting with 'a0'
|
|
|
|
|
|
|
|
$ hg log -r 6:7 -T '{rev}:{shortest(node, 0)}\n'
|
|
|
|
6:a0b
|
|
|
|
7:a04
|
|
|
|
|
|
|
|
node '10' conflicts with the revision number '10' even if it is hidden
|
|
|
|
(we could exclude hidden revision numbers, but currently we don't)
|
|
|
|
|
|
|
|
$ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n'
|
|
|
|
4:107
|
|
|
|
$ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden
|
|
|
|
4:107
|
|
|
|
|
|
|
|
node 'c562' should be unique if the other 'c562' nodes are hidden
|
2016-10-25 15:49:30 +03:00
|
|
|
(but we don't try the slow path to filter out hidden nodes for now)
|
2016-10-23 08:05:23 +03:00
|
|
|
|
|
|
|
$ hg log -r 8 -T '{rev}:{node|shortest}\n'
|
2016-10-25 15:49:30 +03:00
|
|
|
8:c5625
|
2016-10-23 08:05:23 +03:00
|
|
|
$ hg log -r 8:10 -T '{rev}:{node|shortest}\n' --hidden
|
|
|
|
8:c5625
|
|
|
|
9:c5623
|
|
|
|
10:c562d
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2014-01-17 12:16:48 +04:00
|
|
|
Test pad function
|
|
|
|
|
2016-10-23 08:05:23 +03:00
|
|
|
$ cd r
|
|
|
|
|
2014-01-17 12:16:48 +04:00
|
|
|
$ hg log --template '{pad(rev, 20)} {author|user}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
2 test
|
|
|
|
1 {node|short}
|
2014-01-17 12:16:48 +04:00
|
|
|
0 test
|
|
|
|
|
|
|
|
$ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
2 test
|
|
|
|
1 {node|short}
|
2014-01-17 12:16:48 +04:00
|
|
|
0 test
|
|
|
|
|
|
|
|
$ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
2------------------- test
|
|
|
|
1------------------- {node|short}
|
2014-01-17 12:16:48 +04:00
|
|
|
0------------------- test
|
2014-02-12 09:10:00 +04:00
|
|
|
|
2015-06-08 12:48:45 +03:00
|
|
|
Test template string in pad function
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n'
|
|
|
|
{0} test
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n'
|
2015-06-10 15:44:43 +03:00
|
|
|
\{rev} test
|
2015-06-08 12:48:45 +03:00
|
|
|
|
2016-02-14 07:05:09 +03:00
|
|
|
Test width argument passed to pad function
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad(rev, "1{"0"}")} {author|user}\n'
|
|
|
|
0 test
|
|
|
|
$ hg log -r 0 -T '{pad(rev, "not an int")}\n'
|
|
|
|
hg: parse error: pad() expects an integer width
|
|
|
|
[255]
|
|
|
|
|
2017-03-18 14:38:44 +03:00
|
|
|
Test invalid fillchar passed to pad function
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "")}\n'
|
|
|
|
hg: parse error: pad() expects a single fill character
|
|
|
|
[255]
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "--")}\n'
|
|
|
|
hg: parse error: pad() expects a single fill character
|
|
|
|
[255]
|
|
|
|
|
2016-04-22 15:29:13 +03:00
|
|
|
Test boolean argument passed to pad function
|
|
|
|
|
|
|
|
no crash
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "-", "f{"oo"}")}\n'
|
|
|
|
---------0
|
|
|
|
|
|
|
|
string/literal
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "-", "false")}\n'
|
|
|
|
---------0
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "-", false)}\n'
|
|
|
|
0---------
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "-", "")}\n'
|
|
|
|
0---------
|
|
|
|
|
|
|
|
unknown keyword is evaluated to ''
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{pad(rev, 10, "-", unknownkeyword)}\n'
|
|
|
|
0---------
|
|
|
|
|
2016-05-03 19:49:54 +03:00
|
|
|
Test separate function
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{separate("-", "", "a", "b", "", "", "c", "")}\n'
|
|
|
|
a-b-c
|
|
|
|
$ hg log -r 0 -T '{separate(" ", "{rev}:{node|short}", author|user, branch)}\n'
|
|
|
|
0:f7769ec2ab97 test default
|
|
|
|
$ hg log -r 0 --color=always -T '{separate(" ", "a", label(red, "b"), "c", label(red, ""), "d")}\n'
|
|
|
|
a \x1b[0;31mb\x1b[0m c d (esc)
|
|
|
|
|
2016-04-22 15:29:13 +03:00
|
|
|
Test boolean expression/literal passed to if function
|
|
|
|
|
|
|
|
$ hg log -r 0 -T '{if(rev, "rev 0 is True")}\n'
|
|
|
|
rev 0 is True
|
|
|
|
$ hg log -r 0 -T '{if(0, "literal 0 is True as well")}\n'
|
|
|
|
literal 0 is True as well
|
|
|
|
$ hg log -r 0 -T '{if("", "", "empty string is False")}\n'
|
|
|
|
empty string is False
|
|
|
|
$ hg log -r 0 -T '{if(revset(r"0 - 0"), "", "empty list is False")}\n'
|
|
|
|
empty list is False
|
|
|
|
$ hg log -r 0 -T '{if(true, "true is True")}\n'
|
|
|
|
true is True
|
|
|
|
$ hg log -r 0 -T '{if(false, "", "false is False")}\n'
|
|
|
|
false is False
|
|
|
|
$ hg log -r 0 -T '{if("false", "non-empty string is True")}\n'
|
|
|
|
non-empty string is True
|
|
|
|
|
2014-02-12 09:10:00 +04:00
|
|
|
Test ifcontains function
|
|
|
|
|
2014-10-10 20:38:00 +04:00
|
|
|
$ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n'
|
|
|
|
2 is in the string
|
|
|
|
1 is not
|
|
|
|
0 is in the string
|
|
|
|
|
2016-02-13 18:18:12 +03:00
|
|
|
$ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n'
|
|
|
|
2 is in the string
|
|
|
|
1 is not
|
|
|
|
0 is in the string
|
|
|
|
|
2014-02-12 09:10:00 +04:00
|
|
|
$ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
2 did not add a
|
2014-02-12 09:10:00 +04:00
|
|
|
1 did not add a
|
|
|
|
0 added a
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
|
2016-02-12 13:16:09 +03:00
|
|
|
$ hg log --debug -T '{rev}{ifcontains(1, parents, " is parent of 1")}\n'
|
|
|
|
2 is parent of 1
|
|
|
|
1
|
|
|
|
0
|
|
|
|
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
Test revset function
|
|
|
|
|
|
|
|
$ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
2 current rev
|
|
|
|
1 not current rev
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
0 not current rev
|
|
|
|
|
2014-05-24 03:25:55 +04:00
|
|
|
$ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n'
|
|
|
|
2 match rev
|
|
|
|
1 match rev
|
|
|
|
0 not match rev
|
|
|
|
|
2017-10-12 16:09:11 +03:00
|
|
|
$ hg log -T '{ifcontains(desc, revset(":"), "", "type not match")}\n' -l1
|
|
|
|
type not match
|
|
|
|
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
$ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
2 Parents: 1
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
1 Parents: 0
|
|
|
|
0 Parents:
|
|
|
|
|
2014-08-23 16:23:02 +04:00
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
|
|
> [revsetalias]
|
|
|
|
> myparents(\$1) = parents(\$1)
|
|
|
|
> EOF
|
|
|
|
$ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n'
|
|
|
|
2 Parents: 1
|
|
|
|
1 Parents: 0
|
|
|
|
0 Parents:
|
|
|
|
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
$ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n'
|
2014-03-12 01:19:08 +04:00
|
|
|
Rev: 2
|
|
|
|
Ancestor: 0
|
|
|
|
Ancestor: 1
|
|
|
|
Ancestor: 2
|
|
|
|
|
template: add revset() template function
Adds a template function that executes a revset and returns the list of
revisions as the result. It has the signature 'revset(query [, args...])'. The
args are optional and are applied to the query string using the standard
python string.format(args) pattern. This allows things like:
'{revset("parents({0})", rev)}' to produce the parents of each individual
commit in the log output. If no args are specified, the revset result is
cached for the duration of the templater; so it's better to not use args if
performance is a concern.
By itself, revset() can be used to print commit parents, print the common
ancestor of a commit with the main branch, etc.
It can be used with the ifcontains() function to do things like
'{ifcontains(rev, revset('.'), label(...), ...)}' to color the working copy
parent, to color certain branches, to color draft commits, etc.
2014-02-12 09:04:12 +04:00
|
|
|
Rev: 1
|
|
|
|
Ancestor: 0
|
|
|
|
Ancestor: 1
|
|
|
|
|
|
|
|
Rev: 0
|
|
|
|
Ancestor: 0
|
|
|
|
|
2015-06-20 17:13:34 +03:00
|
|
|
$ hg log --template '{revset("TIP"|lower)}\n' -l1
|
|
|
|
2
|
|
|
|
|
2016-02-13 18:27:09 +03:00
|
|
|
$ hg log -T '{revset("%s", "t{"ip"}")}\n' -l1
|
|
|
|
2
|
|
|
|
|
2016-02-12 13:16:09 +03:00
|
|
|
a list template is evaluated for each item of revset/parents
|
2015-09-11 18:21:41 +03:00
|
|
|
|
|
|
|
$ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n'
|
|
|
|
2 p: 1:bcc7ff960b8e
|
|
|
|
1 p: 0:f7769ec2ab97
|
|
|
|
0 p:
|
|
|
|
|
2016-02-12 13:16:09 +03:00
|
|
|
$ hg log --debug -T '{rev} p:{parents % " {rev}:{node|short}"}\n'
|
|
|
|
2 p: 1:bcc7ff960b8e -1:000000000000
|
|
|
|
1 p: 0:f7769ec2ab97 -1:000000000000
|
|
|
|
0 p: -1:000000000000 -1:000000000000
|
|
|
|
|
2015-09-11 18:21:41 +03:00
|
|
|
therefore, 'revcache' should be recreated for each rev
|
|
|
|
|
|
|
|
$ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n'
|
|
|
|
2 aa b
|
|
|
|
p
|
|
|
|
1
|
|
|
|
p a
|
|
|
|
0 a
|
|
|
|
p
|
|
|
|
|
2016-02-12 13:16:09 +03:00
|
|
|
$ hg log --debug -T '{rev} {file_adds}\np {parents % "{file_adds}"}\n'
|
|
|
|
2 aa b
|
|
|
|
p
|
|
|
|
1
|
|
|
|
p a
|
|
|
|
0 a
|
|
|
|
p
|
|
|
|
|
2016-02-12 12:08:53 +03:00
|
|
|
a revset item must be evaluated as an integer revision, not an offset from tip
|
|
|
|
|
|
|
|
$ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n'
|
|
|
|
-1:000000000000
|
|
|
|
$ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n'
|
|
|
|
-1:000000000000
|
|
|
|
|
2016-07-22 16:00:46 +03:00
|
|
|
join() should pick '{rev}' from revset items:
|
|
|
|
|
|
|
|
$ hg log -R ../a -T '{join(revset("parents(%d)", rev), ", ")}\n' -r6
|
|
|
|
4, 5
|
|
|
|
|
2016-07-22 16:12:12 +03:00
|
|
|
on the other hand, parents are formatted as '{rev}:{node|formatnode}' by
|
|
|
|
default. join() should agree with the default formatting:
|
|
|
|
|
|
|
|
$ hg log -R ../a -T '{join(parents, ", ")}\n' -r6
|
|
|
|
5:13207e5a10d9, 4:bbe44766e73d
|
|
|
|
|
|
|
|
$ hg log -R ../a -T '{join(parents, ",\n")}\n' -r6 --debug
|
|
|
|
5:13207e5a10d9fd28ec424934298e176197f2c67f,
|
|
|
|
4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
|
|
|
|
|
2016-09-23 11:15:05 +03:00
|
|
|
Test files function
|
|
|
|
|
|
|
|
$ hg log -T "{rev}\n{join(files('*'), '\n')}\n"
|
|
|
|
2
|
|
|
|
a
|
|
|
|
aa
|
|
|
|
b
|
|
|
|
1
|
|
|
|
a
|
|
|
|
0
|
|
|
|
a
|
|
|
|
|
|
|
|
$ hg log -T "{rev}\n{join(files('aa'), '\n')}\n"
|
|
|
|
2
|
|
|
|
aa
|
|
|
|
1
|
|
|
|
|
|
|
|
0
|
|
|
|
|
|
|
|
|
2016-10-08 16:24:26 +03:00
|
|
|
Test relpath function
|
|
|
|
|
|
|
|
$ hg log -r0 -T '{files % "{file|relpath}\n"}'
|
|
|
|
a
|
|
|
|
$ cd ..
|
|
|
|
$ hg log -R r -r0 -T '{files % "{file|relpath}\n"}'
|
2017-01-08 21:49:53 +03:00
|
|
|
r/a
|
2016-10-08 16:24:26 +03:00
|
|
|
$ cd r
|
|
|
|
|
2015-05-29 06:06:19 +03:00
|
|
|
Test active bookmark templating
|
2014-02-12 09:40:33 +04:00
|
|
|
|
|
|
|
$ hg book foo
|
|
|
|
$ hg book bar
|
2015-05-29 06:03:42 +03:00
|
|
|
$ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n"
|
2014-03-12 01:19:08 +04:00
|
|
|
2 bar* foo
|
|
|
|
1
|
2014-02-12 09:40:33 +04:00
|
|
|
0
|
2015-04-15 18:19:36 +03:00
|
|
|
$ hg log --template "{rev} {activebookmark}\n"
|
2014-07-15 18:34:13 +04:00
|
|
|
2 bar
|
|
|
|
1
|
|
|
|
0
|
|
|
|
$ hg bookmarks --inactive bar
|
2015-04-15 18:19:36 +03:00
|
|
|
$ hg log --template "{rev} {activebookmark}\n"
|
2014-07-15 18:34:13 +04:00
|
|
|
2
|
|
|
|
1
|
|
|
|
0
|
2015-02-18 16:17:35 +03:00
|
|
|
$ hg book -r1 baz
|
|
|
|
$ hg log --template "{rev} {join(bookmarks, ' ')}\n"
|
|
|
|
2 bar foo
|
|
|
|
1 baz
|
|
|
|
0
|
2015-02-18 17:01:33 +03:00
|
|
|
$ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n"
|
|
|
|
2 t
|
|
|
|
1 f
|
|
|
|
0 f
|
2014-03-09 20:01:43 +04:00
|
|
|
|
2016-01-12 17:56:48 +03:00
|
|
|
Test namespaces dict
|
|
|
|
|
2017-06-25 00:52:15 +03:00
|
|
|
$ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n {join(names, ",")}\n"}\n'
|
2017-06-24 23:39:20 +03:00
|
|
|
2
|
2017-06-25 00:52:15 +03:00
|
|
|
bookmarks color=bookmark builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
bar,foo
|
2017-06-25 00:52:15 +03:00
|
|
|
tags color=tag builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
tip
|
2017-06-25 00:52:15 +03:00
|
|
|
branches color=branch builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
text.{rev}
|
2017-06-25 00:52:15 +03:00
|
|
|
revnames color=revname builtin=False
|
|
|
|
r2
|
2017-06-24 23:39:20 +03:00
|
|
|
|
|
|
|
1
|
2017-06-25 00:52:15 +03:00
|
|
|
bookmarks color=bookmark builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
baz
|
2017-06-25 00:52:15 +03:00
|
|
|
tags color=tag builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
|
2017-06-25 00:52:15 +03:00
|
|
|
branches color=branch builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
text.{rev}
|
2017-06-25 00:52:15 +03:00
|
|
|
revnames color=revname builtin=False
|
|
|
|
r1
|
2017-06-24 23:39:20 +03:00
|
|
|
|
|
|
|
0
|
2017-06-25 00:52:15 +03:00
|
|
|
bookmarks color=bookmark builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
|
2017-06-25 00:52:15 +03:00
|
|
|
tags color=tag builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
|
2017-06-25 00:52:15 +03:00
|
|
|
branches color=branch builtin=True
|
2017-06-24 23:39:20 +03:00
|
|
|
default
|
2017-06-25 00:52:15 +03:00
|
|
|
revnames color=revname builtin=False
|
|
|
|
r0
|
2017-06-24 23:39:20 +03:00
|
|
|
|
2016-01-12 17:56:48 +03:00
|
|
|
$ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}'
|
|
|
|
bookmarks: bar foo
|
|
|
|
tags: tip
|
|
|
|
branches: text.{rev}
|
|
|
|
$ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}'
|
|
|
|
bookmarks:
|
|
|
|
bar
|
|
|
|
foo
|
|
|
|
tags:
|
|
|
|
tip
|
|
|
|
branches:
|
|
|
|
text.{rev}
|
|
|
|
$ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}'
|
|
|
|
bar
|
|
|
|
foo
|
2017-09-30 10:57:50 +03:00
|
|
|
$ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}'
|
|
|
|
bar
|
|
|
|
foo
|
2016-01-12 17:56:48 +03:00
|
|
|
|
2014-03-09 20:01:43 +04:00
|
|
|
Test stringify on sub expressions
|
|
|
|
|
2014-03-12 01:19:08 +04:00
|
|
|
$ cd ..
|
2014-03-09 20:01:43 +04:00
|
|
|
$ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n'
|
|
|
|
fourth, second, third
|
|
|
|
$ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n'
|
|
|
|
abc
|
2014-03-12 01:19:08 +04:00
|
|
|
|
2014-06-13 04:45:41 +04:00
|
|
|
Test splitlines
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}"
|
2015-05-05 21:45:09 +03:00
|
|
|
@ foo Modify, add, remove, rename
|
|
|
|
|
|
|
|
|
o foo future
|
2014-06-13 04:45:41 +04:00
|
|
|
|
|
|
|
|
o foo third
|
|
|
|
|
|
|
|
|
o foo second
|
|
|
|
|
|
|
|
o foo merge
|
|
|
|
|\
|
|
|
|
| o foo new head
|
|
|
|
| |
|
|
|
|
o | foo new branch
|
|
|
|
|/
|
|
|
|
o foo no user, no domain
|
|
|
|
|
|
|
|
|
o foo no person
|
|
|
|
|
|
|
|
|
o foo other 1
|
|
|
|
| foo other 2
|
|
|
|
| foo
|
|
|
|
| foo other 3
|
|
|
|
o foo line 1
|
|
|
|
foo line 2
|
2014-06-13 04:53:37 +04:00
|
|
|
|
2017-04-15 04:51:17 +03:00
|
|
|
$ hg log -R a -r0 -T '{desc|splitlines}\n'
|
|
|
|
line 1 line 2
|
|
|
|
$ hg log -R a -r0 -T '{join(desc|splitlines, "|")}\n'
|
|
|
|
line 1|line 2
|
|
|
|
|
2014-06-13 04:53:37 +04:00
|
|
|
Test startswith
|
|
|
|
$ hg log -Gv -R a --template "{startswith(desc)}"
|
|
|
|
hg: parse error: startswith expects two arguments
|
|
|
|
[255]
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template "{startswith('line', desc)}"
|
|
|
|
@
|
|
|
|
|
|
|
|
|
o
|
|
|
|
|
|
|
|
|
o
|
2015-05-05 21:45:09 +03:00
|
|
|
|
|
|
|
|
o
|
2014-06-13 04:53:37 +04:00
|
|
|
|
|
|
|
o
|
|
|
|
|\
|
|
|
|
| o
|
|
|
|
| |
|
|
|
|
o |
|
|
|
|
|/
|
|
|
|
o
|
|
|
|
|
|
|
|
|
o
|
|
|
|
|
|
|
|
|
o
|
|
|
|
|
|
|
|
|
o line 1
|
|
|
|
line 2
|
2014-06-13 05:07:21 +04:00
|
|
|
|
|
|
|
Test bad template with better error message
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template '{desc|user()}'
|
|
|
|
hg: parse error: expected a symbol, got 'func'
|
|
|
|
[255]
|
2014-06-13 05:02:23 +04:00
|
|
|
|
|
|
|
Test word function (including index out of bounds graceful failure)
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template "{word('1', desc)}"
|
2015-05-05 21:45:09 +03:00
|
|
|
@ add,
|
|
|
|
|
|
|
|
|
o
|
2014-06-13 05:02:23 +04:00
|
|
|
|
|
|
|
|
o
|
|
|
|
|
|
|
|
|
o
|
|
|
|
|
|
|
|
o
|
|
|
|
|\
|
|
|
|
| o head
|
|
|
|
| |
|
|
|
|
o | branch
|
|
|
|
|/
|
|
|
|
o user,
|
|
|
|
|
|
|
|
|
o person
|
|
|
|
|
|
|
|
|
o 1
|
|
|
|
|
|
|
|
|
o 1
|
|
|
|
|
|
|
|
|
|
|
|
Test word third parameter used as splitter
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template "{word('0', desc, 'o')}"
|
2015-05-05 21:45:09 +03:00
|
|
|
@ M
|
|
|
|
|
|
|
|
|
o future
|
2014-06-13 05:02:23 +04:00
|
|
|
|
|
|
|
|
o third
|
|
|
|
|
|
|
|
|
o sec
|
|
|
|
|
|
|
|
o merge
|
|
|
|
|\
|
|
|
|
| o new head
|
|
|
|
| |
|
|
|
|
o | new branch
|
|
|
|
|/
|
|
|
|
o n
|
|
|
|
|
|
|
|
|
o n
|
|
|
|
|
|
|
|
|
o
|
|
|
|
|
|
|
|
|
o line 1
|
|
|
|
line 2
|
|
|
|
|
|
|
|
Test word error messages for not enough and too many arguments
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template "{word('0')}"
|
|
|
|
hg: parse error: word expects two or three arguments, got 1
|
|
|
|
[255]
|
|
|
|
|
|
|
|
$ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}"
|
|
|
|
hg: parse error: word expects two or three arguments, got 7
|
|
|
|
[255]
|
2015-04-30 22:33:36 +03:00
|
|
|
|
2015-05-01 14:43:55 +03:00
|
|
|
Test word for integer literal
|
|
|
|
|
|
|
|
$ hg log -R a --template "{word(2, desc)}\n" -r0
|
|
|
|
line
|
|
|
|
|
2015-04-30 22:33:36 +03:00
|
|
|
Test word for invalid numbers
|
|
|
|
|
2015-05-01 14:43:55 +03:00
|
|
|
$ hg log -Gv -R a --template "{word('a', desc)}"
|
2015-05-02 09:49:38 +03:00
|
|
|
hg: parse error: word expects an integer index
|
2015-04-30 22:33:36 +03:00
|
|
|
[255]
|
2015-04-04 11:03:52 +03:00
|
|
|
|
2015-10-05 19:37:26 +03:00
|
|
|
Test word for out of range
|
|
|
|
|
|
|
|
$ hg log -R a --template "{word(10000, desc)}"
|
|
|
|
$ hg log -R a --template "{word(-10000, desc)}"
|
|
|
|
|
2015-04-04 11:03:52 +03:00
|
|
|
Test indent and not adding to empty lines
|
|
|
|
|
|
|
|
$ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a
|
|
|
|
-----
|
|
|
|
> line 1
|
|
|
|
>> line 2
|
|
|
|
-----
|
|
|
|
> other 1
|
|
|
|
>> other 2
|
|
|
|
|
|
|
|
>> other 3
|
|
|
|
|
|
|
|
Test with non-strings like dates
|
|
|
|
|
|
|
|
$ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a
|
|
|
|
1200000.00
|
|
|
|
1300000.00
|
2015-09-10 00:43:45 +03:00
|
|
|
|
|
|
|
Test broken string escapes:
|
|
|
|
|
|
|
|
$ hg log -T "bogus\\" -R a
|
|
|
|
hg: parse error: trailing \ in string
|
|
|
|
[255]
|
|
|
|
$ hg log -T "\\xy" -R a
|
|
|
|
hg: parse error: invalid \x escape
|
|
|
|
[255]
|
2015-11-04 17:48:15 +03:00
|
|
|
|
2015-12-27 11:59:57 +03:00
|
|
|
json filter should escape HTML tags so that the output can be embedded in hgweb:
|
|
|
|
|
|
|
|
$ hg log -T "{'<foo@example.org>'|json}\n" -R a -l1
|
|
|
|
"\u003cfoo@example.org\u003e"
|
|
|
|
|
2016-03-27 14:31:56 +03:00
|
|
|
Templater supports aliases of symbol and func() styles:
|
|
|
|
|
|
|
|
$ hg clone -q a aliases
|
|
|
|
$ cd aliases
|
|
|
|
$ cat <<EOF >> .hg/hgrc
|
|
|
|
> [templatealias]
|
|
|
|
> r = rev
|
|
|
|
> rn = "{r}:{node|short}"
|
|
|
|
> status(c, files) = files % "{c} {file}\n"
|
|
|
|
> utcdate(d) = localdate(d, "UTC")
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg debugtemplate -vr0 '{rn} {utcdate(date)|isodate}\n'
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'rn')
|
|
|
|
(string ' ')
|
2016-03-27 14:31:56 +03:00
|
|
|
(|
|
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'utcdate')
|
|
|
|
(symbol 'date'))
|
|
|
|
(symbol 'isodate'))
|
|
|
|
(string '\n'))
|
2016-03-27 14:31:56 +03:00
|
|
|
* expanded:
|
|
|
|
(template
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'rev')
|
|
|
|
(string ':')
|
2016-03-27 14:31:56 +03:00
|
|
|
(|
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'node')
|
|
|
|
(symbol 'short')))
|
|
|
|
(string ' ')
|
2016-03-27 14:31:56 +03:00
|
|
|
(|
|
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'localdate')
|
2016-03-27 14:31:56 +03:00
|
|
|
(list
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'date')
|
|
|
|
(string 'UTC')))
|
|
|
|
(symbol 'isodate'))
|
|
|
|
(string '\n'))
|
2016-03-27 14:59:36 +03:00
|
|
|
0:1e4e1b8f71e0 1970-01-12 13:46 +0000
|
2016-03-27 14:31:56 +03:00
|
|
|
|
|
|
|
$ hg debugtemplate -vr0 '{status("A", file_adds)}'
|
|
|
|
(template
|
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'status')
|
2016-03-27 14:31:56 +03:00
|
|
|
(list
|
2017-09-03 15:17:25 +03:00
|
|
|
(string 'A')
|
|
|
|
(symbol 'file_adds'))))
|
2016-03-27 14:31:56 +03:00
|
|
|
* expanded:
|
|
|
|
(template
|
|
|
|
(%
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'file_adds')
|
2016-03-27 14:31:56 +03:00
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(string 'A')
|
|
|
|
(string ' ')
|
|
|
|
(symbol 'file')
|
|
|
|
(string '\n'))))
|
2016-03-27 14:59:36 +03:00
|
|
|
A a
|
2016-03-27 14:31:56 +03:00
|
|
|
|
|
|
|
A unary function alias can be called as a filter:
|
|
|
|
|
|
|
|
$ hg debugtemplate -vr0 '{date|utcdate|isodate}\n'
|
|
|
|
(template
|
|
|
|
(|
|
|
|
|
(|
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'date')
|
|
|
|
(symbol 'utcdate'))
|
|
|
|
(symbol 'isodate'))
|
|
|
|
(string '\n'))
|
2016-03-27 14:31:56 +03:00
|
|
|
* expanded:
|
|
|
|
(template
|
|
|
|
(|
|
|
|
|
(func
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'localdate')
|
2016-03-27 14:31:56 +03:00
|
|
|
(list
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'date')
|
|
|
|
(string 'UTC')))
|
|
|
|
(symbol 'isodate'))
|
|
|
|
(string '\n'))
|
2016-03-27 14:59:36 +03:00
|
|
|
1970-01-12 13:46 +0000
|
|
|
|
|
|
|
|
Aliases should be applied only to command arguments and templates in hgrc.
|
|
|
|
Otherwise, our stock styles and web templates could be corrupted:
|
|
|
|
|
|
|
|
$ hg log -r0 -T '{rn} {utcdate(date)|isodate}\n'
|
|
|
|
0:1e4e1b8f71e0 1970-01-12 13:46 +0000
|
|
|
|
|
|
|
|
$ hg log -r0 --config ui.logtemplate='"{rn} {utcdate(date)|isodate}\n"'
|
|
|
|
0:1e4e1b8f71e0 1970-01-12 13:46 +0000
|
|
|
|
|
|
|
|
$ cat <<EOF > tmpl
|
|
|
|
> changeset = 'nothing expanded:{rn}\n'
|
|
|
|
> EOF
|
|
|
|
$ hg log -r0 --style ./tmpl
|
|
|
|
nothing expanded:
|
|
|
|
|
|
|
|
Aliases in formatter:
|
|
|
|
|
|
|
|
$ hg branches -T '{pad(branch, 7)} {rn}\n'
|
|
|
|
default 6:d41e714fe50d
|
|
|
|
foo 4:bbe44766e73d
|
2016-03-27 14:31:56 +03:00
|
|
|
|
2016-03-27 15:05:55 +03:00
|
|
|
Aliases should honor HGPLAIN:
|
|
|
|
|
|
|
|
$ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n'
|
|
|
|
nothing expanded:
|
|
|
|
$ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n'
|
|
|
|
0:1e4e1b8f71e0
|
|
|
|
|
2016-03-27 14:31:56 +03:00
|
|
|
Unparsable alias:
|
|
|
|
|
|
|
|
$ hg debugtemplate --config templatealias.bad='x(' -v '{bad}'
|
|
|
|
(template
|
2017-09-03 15:17:25 +03:00
|
|
|
(symbol 'bad'))
|
2016-04-17 06:31:06 +03:00
|
|
|
abort: bad definition of template alias "bad": at 2: not a prefix: end
|
2016-03-27 14:31:56 +03:00
|
|
|
[255]
|
2016-03-27 14:59:36 +03:00
|
|
|
$ hg log --config templatealias.bad='x(' -T '{bad}'
|
2016-04-17 06:31:06 +03:00
|
|
|
abort: bad definition of template alias "bad": at 2: not a prefix: end
|
2016-03-27 14:59:36 +03:00
|
|
|
[255]
|
2016-03-27 14:31:56 +03:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2015-11-04 17:48:15 +03:00
|
|
|
Set up repository for non-ascii encoding tests:
|
|
|
|
|
|
|
|
$ hg init nonascii
|
|
|
|
$ cd nonascii
|
2017-07-05 19:10:11 +03:00
|
|
|
$ $PYTHON <<EOF
|
2015-12-27 11:45:05 +03:00
|
|
|
> open('latin1', 'w').write('\xe9')
|
2015-11-04 17:48:15 +03:00
|
|
|
> open('utf-8', 'w').write('\xc3\xa9')
|
|
|
|
> EOF
|
|
|
|
$ HGENCODING=utf-8 hg branch -q `cat utf-8`
|
2015-12-27 14:21:37 +03:00
|
|
|
$ HGENCODING=utf-8 hg ci -qAm "non-ascii branch: `cat utf-8`" utf-8
|
2015-11-04 17:48:15 +03:00
|
|
|
|
|
|
|
json filter should try round-trip conversion to utf-8:
|
|
|
|
|
|
|
|
$ HGENCODING=ascii hg log -T "{branch|json}\n" -r0
|
|
|
|
"\u00e9"
|
2015-12-27 14:21:37 +03:00
|
|
|
$ HGENCODING=ascii hg log -T "{desc|json}\n" -r0
|
|
|
|
"non-ascii branch: \u00e9"
|
2015-11-04 17:48:15 +03:00
|
|
|
|
2015-12-27 11:59:57 +03:00
|
|
|
json filter takes input as utf-8b:
|
2015-11-04 17:48:15 +03:00
|
|
|
|
|
|
|
$ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1
|
2015-12-27 11:59:57 +03:00
|
|
|
"\u00e9"
|
|
|
|
$ HGENCODING=ascii hg log -T "{'`cat latin1`'|json}\n" -l1
|
|
|
|
"\udce9"
|
2015-11-04 17:48:15 +03:00
|
|
|
|
2015-12-27 11:45:05 +03:00
|
|
|
utf8 filter:
|
|
|
|
|
|
|
|
$ HGENCODING=ascii hg log -T "round-trip: {branch|utf8|hex}\n" -r0
|
|
|
|
round-trip: c3a9
|
|
|
|
$ HGENCODING=latin1 hg log -T "decoded: {'`cat latin1`'|utf8|hex}\n" -l1
|
|
|
|
decoded: c3a9
|
|
|
|
$ HGENCODING=ascii hg log -T "replaced: {'`cat latin1`'|utf8|hex}\n" -l1
|
|
|
|
abort: decoding near * (glob)
|
|
|
|
[255]
|
|
|
|
$ hg log -T "invalid type: {rev|utf8}\n" -r0
|
|
|
|
abort: template filter 'utf8' is not compatible with keyword 'rev'
|
|
|
|
[255]
|
|
|
|
|
2017-03-18 14:50:15 +03:00
|
|
|
pad width:
|
|
|
|
|
|
|
|
$ HGENCODING=utf-8 hg debugtemplate "{pad('`cat utf-8`', 2, '-')}\n"
|
|
|
|
\xc3\xa9- (esc)
|
|
|
|
|
2015-11-04 17:48:15 +03:00
|
|
|
$ cd ..
|
2016-03-29 20:10:44 +03:00
|
|
|
|
|
|
|
Test that template function in extension is registered as expected
|
|
|
|
|
|
|
|
$ cd a
|
|
|
|
|
|
|
|
$ cat <<EOF > $TESTTMP/customfunc.py
|
|
|
|
> from mercurial import registrar
|
|
|
|
>
|
|
|
|
> templatefunc = registrar.templatefunc()
|
|
|
|
>
|
|
|
|
> @templatefunc('custom()')
|
|
|
|
> def custom(context, mapping, args):
|
|
|
|
> return 'custom'
|
|
|
|
> EOF
|
|
|
|
$ cat <<EOF > .hg/hgrc
|
|
|
|
> [extensions]
|
|
|
|
> customfunc = $TESTTMP/customfunc.py
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg log -r . -T "{custom()}\n" --config customfunc.enabled=true
|
|
|
|
custom
|
|
|
|
|
|
|
|
$ cd ..
|
2017-08-15 20:15:31 +03:00
|
|
|
|
|
|
|
Test 'graphwidth' in 'hg log' on various topologies. The key here is that the
|
|
|
|
printed graphwidths 3, 5, 7, etc. should all line up in their respective
|
|
|
|
columns. We don't care about other aspects of the graph rendering here.
|
|
|
|
|
|
|
|
$ hg init graphwidth
|
|
|
|
$ cd graphwidth
|
|
|
|
|
|
|
|
$ wrappabletext="a a a a a a a a a a a a"
|
|
|
|
|
|
|
|
$ printf "first\n" > file
|
|
|
|
$ hg add file
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ printf "first\nsecond\n" > file
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ hg checkout 0
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ printf "third\nfirst\n" > file
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ hg merge
|
|
|
|
merging file
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}"
|
|
|
|
@ 3
|
|
|
|
|
|
|
|
|
| @ 5
|
|
|
|
|/
|
|
|
|
o 3
|
|
|
|
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}"
|
|
|
|
@ 5
|
|
|
|
|\
|
|
|
|
| o 5
|
|
|
|
| |
|
|
|
|
o | 5
|
|
|
|
|/
|
|
|
|
o 3
|
|
|
|
|
|
|
|
|
|
|
|
$ hg checkout 0
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ printf "third\nfirst\nsecond\n" > file
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}"
|
|
|
|
@ 3
|
|
|
|
|
|
|
|
|
| o 7
|
|
|
|
| |\
|
|
|
|
+---o 7
|
|
|
|
| |
|
|
|
|
| o 5
|
|
|
|
|/
|
|
|
|
o 3
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}" -r 3
|
|
|
|
o 5
|
|
|
|
|\
|
|
|
|
~ ~
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}" -r 1
|
|
|
|
o 3
|
|
|
|
|
|
|
|
|
~
|
|
|
|
|
|
|
|
$ hg merge
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ printf "seventh\n" >> file
|
|
|
|
$ hg commit -m "$wrappabletext"
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}"
|
|
|
|
@ 3
|
|
|
|
|
|
|
|
|
o 5
|
|
|
|
|\
|
|
|
|
| o 5
|
|
|
|
| |
|
|
|
|
o | 7
|
|
|
|
|\ \
|
|
|
|
| o | 7
|
|
|
|
| |/
|
|
|
|
o / 5
|
|
|
|
|/
|
|
|
|
o 3
|
|
|
|
|
|
|
|
|
|
|
|
The point of graphwidth is to allow wrapping that accounts for the space taken
|
|
|
|
by the graph.
|
|
|
|
|
|
|
|
$ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}"
|
|
|
|
@ a a a a
|
|
|
|
| a a a a
|
|
|
|
| a a a a
|
|
|
|
o a a a
|
|
|
|
|\ a a a
|
|
|
|
| | a a a
|
|
|
|
| | a a a
|
|
|
|
| o a a a
|
|
|
|
| | a a a
|
|
|
|
| | a a a
|
|
|
|
| | a a a
|
|
|
|
o | a a
|
|
|
|
|\ \ a a
|
|
|
|
| | | a a
|
|
|
|
| | | a a
|
|
|
|
| | | a a
|
|
|
|
| | | a a
|
|
|
|
| o | a a
|
|
|
|
| |/ a a
|
|
|
|
| | a a
|
|
|
|
| | a a
|
|
|
|
| | a a
|
|
|
|
| | a a
|
|
|
|
o | a a a
|
|
|
|
|/ a a a
|
|
|
|
| a a a
|
|
|
|
| a a a
|
|
|
|
o a a a a
|
|
|
|
a a a a
|
|
|
|
a a a a
|
|
|
|
|
|
|
|
Something tricky happens when there are elided nodes; the next drawn row of
|
|
|
|
edges can be more than one column wider, but the graph width only increases by
|
|
|
|
one column. The remaining columns are added in between the nodes.
|
|
|
|
|
|
|
|
$ hg log --graph -T "{graphwidth}" -r "0|2|4|5"
|
|
|
|
o 5
|
|
|
|
|\
|
|
|
|
| \
|
|
|
|
| :\
|
|
|
|
o : : 7
|
|
|
|
:/ /
|
|
|
|
: o 5
|
|
|
|
:/
|
|
|
|
o 3
|
|
|
|
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2018-01-26 19:59:41 +03:00
|
|
|
Confirm that truncation does the right thing
|
|
|
|
|
|
|
|
$ hg debugtemplate '{truncatelonglines("abcdefghijklmnopqrst\n", 10)}'
|
|
|
|
abcdefghij
|
|
|
|
$ hg debugtemplate '{truncatelonglines("abcdefghijklmnopqrst\n", 10, "…")}'
|
|
|
|
abcdefghi\xe2\x80\xa6 (esc)
|
|
|
|
$ hg debugtemplate '{truncate("a\nb\nc\n", 2)}'
|
|
|
|
a
|
|
|
|
b
|
|
|
|
$ hg debugtemplate '{truncate("a\nb\nc\n", 2, "truncated\n")}'
|
|
|
|
a
|
|
|
|
truncated
|