annotate tests/test-log.t @ 27054:fe458d078ed7

test-import: don't use printf to append an extension to $HGRCPATH The extension was failing to load on Windows because $TESTTMP contains a path component 'test', prefixed by a path separator '\'. That combination ends up converted to "...<tab>est...".
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 16 Nov 2015 14:12:27 -0500
parents ef1eb6df7071
children c407583cf5f6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18991
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
1 Log on empty repository: checking consistency
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
2
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
3 $ hg init empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
4 $ cd empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
5 $ hg log
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
6 $ hg log -r 1
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
7 abort: unknown revision '1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
8 [255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
9 $ hg log -r -1:0
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
10 abort: unknown revision '-1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
11 [255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
12 $ hg log -r 'branch(name)'
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
13 abort: unknown revision 'name'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
14 [255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
15 $ hg log -r null -q
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
16 -1:000000000000
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
17
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
18 The g is crafted to have 2 filelog topological heads in a linear
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
19 changeset graph
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
20
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
21 $ hg init a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
22 $ cd a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
23 $ echo a > a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
24 $ echo f > f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
25 $ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
26 adding a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
27 adding f
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
28
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
29 $ hg cp a b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
30 $ hg cp f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
31 $ hg ci -mb -d '2 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
32
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
33 $ mkdir dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
34 $ hg mv b dir
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
35 $ echo g >> g
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
36 $ echo f >> f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
37 $ hg ci -mc -d '3 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
38
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
39 $ hg mv a b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
40 $ hg cp -f f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
41 $ echo a > d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
42 $ hg add d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
43 $ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
44
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
45 $ hg mv dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
46 $ hg ci -me -d '5 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
47
23976
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
48 Make sure largefiles doesn't interfere with logging a regular file
24207
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
49 $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
50 updated patterns: ['.hglf/a', 'a']
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
51 0: a
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
52 $ hg log a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
53 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
54 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
55 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
56 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
57
24206
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
58 $ hg log glob:a*
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
59 changeset: 3:2ca5ba701980
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
60 user: test
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
61 date: Thu Jan 01 00:00:04 1970 +0000
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
62 summary: d
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
63
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
64 changeset: 0:9161b9aeaf16
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
65 user: test
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
66 date: Thu Jan 01 00:00:01 1970 +0000
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
67 summary: a
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
68
24207
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
69 $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
70 updated patterns: ['glob:.hglf/a*', 'glob:a*']
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
71 3: d
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
72 0: a
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
73
18340
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
74 log on directory
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
75
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
76 $ hg log dir
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
77 changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
78 tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
79 user: test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
80 date: Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
81 summary: e
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
82
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
83 changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
84 user: test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
85 date: Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
86 summary: c
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
87
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
88 $ hg log somethingthatdoesntexist dir
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
89 changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
90 tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
91 user: test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
92 date: Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
93 summary: e
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
94
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
95 changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
96 user: test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
97 date: Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
98 summary: c
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
99
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
100
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
101 -f, non-existent directory
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
102
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
103 $ hg log -f dir
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
104 abort: cannot follow file not in parent revision: "dir"
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
105 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
106
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
107 -f, directory
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
108
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
109 $ hg up -q 3
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
110 $ hg log -f dir
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
111 changeset: 2:f8954cd4dc1f
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
112 user: test
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
113 date: Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
114 summary: c
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
115
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
116 -f, directory with --patch
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
117
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
118 $ hg log -f dir -p
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
119 changeset: 2:f8954cd4dc1f
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
120 user: test
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
121 date: Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
122 summary: c
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
123
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
124 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
125 --- /dev/null* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
126 +++ b/dir/b* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
127 @@ -0,0 +1,1 @@
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
128 +a
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
129
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
130
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
131 -f, pattern
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
132
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
133 $ hg log -f -I 'dir**' -p
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
134 changeset: 2:f8954cd4dc1f
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
135 user: test
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
136 date: Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
137 summary: c
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
138
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
139 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
140 --- /dev/null* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
141 +++ b/dir/b* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
142 @@ -0,0 +1,1 @@
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
143 +a
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
144
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
145 $ hg up -q 4
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
146
19125
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
147 -f, a wrong style
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
148
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
149 $ hg log -f -l1 --style something
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
150 abort: style 'something' not found
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 24603
diff changeset
151 (available styles: bisect, changelog, compact, default, phases, status, xml)
19125
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
152 [255]
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
153
19126
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
154 -f, phases style
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
155
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
156
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
157 $ hg log -f -l1 --style phases
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
158 changeset: 4:7e4639b4691b
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
159 tag: tip
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
160 phase: draft
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
161 user: test
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
162 date: Thu Jan 01 00:00:05 1970 +0000
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
163 summary: e
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
164
19125
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
165
24493
e810c7da1cae templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
166 $ hg log -f -l1 --style phases -q
e810c7da1cae templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
167 4:7e4639b4691b
e810c7da1cae templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
168
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
169 -f, but no args
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
170
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
171 $ hg log -f
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
172 changeset: 4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
173 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
174 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
175 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
176 summary: e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
177
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
178 changeset: 3:2ca5ba701980
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
179 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
180 date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
181 summary: d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
182
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
183 changeset: 2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
184 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
185 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
186 summary: c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
187
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
188 changeset: 1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
189 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
190 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
191 summary: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
192
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
193 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
194 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
195 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
196 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
197
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
198
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
199 one rename
11562
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
200
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
201 $ hg up -q 2
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
202 $ hg log -vf a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
203 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
204 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
205 date: Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
206 files: a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
207 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
208 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
209
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
210
3197
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2901
diff changeset
211
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
212 many renames
10776
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10061
diff changeset
213
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
214 $ hg up -q tip
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
215 $ hg log -vf e
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
216 changeset: 4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
217 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
218 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
219 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
220 files: dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
221 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
222 e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
223
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
224
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
225 changeset: 2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
226 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
227 date: Thu Jan 01 00:00:03 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
228 files: b dir/b f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
229 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
230 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
231
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
232
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
233 changeset: 1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
234 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
235 date: Thu Jan 01 00:00:02 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
236 files: b g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
237 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
238 b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
239
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
240
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
241 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
242 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
243 date: Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
244 files: a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
245 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
246 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
247
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
248
5811
180a3eee4b75 Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4510
diff changeset
249
3837
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
250
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
251 log -pf dir/b
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
252
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
253 $ hg up -q 3
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
254 $ hg log -pf dir/b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
255 changeset: 2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
256 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
257 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
258 summary: c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
259
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
260 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
261 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
262 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
263 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
264 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
265
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
266 changeset: 1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
267 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
268 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
269 summary: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
270
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
271 diff -r 9161b9aeaf16 -r d89b0a12d229 b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
272 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
273 +++ b/b Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
274 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
275 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
276
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
277 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
278 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
279 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
280 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
281
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
282 diff -r 000000000000 -r 9161b9aeaf16 a
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
283 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
284 +++ b/a Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
285 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
286 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
287
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
288
21876
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
289 log -pf b inside dir
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
290
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
291 $ hg --cwd=dir log -pf b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
292 changeset: 2:f8954cd4dc1f
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
293 user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
294 date: Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
295 summary: c
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
296
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
297 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
298 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
299 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
300 @@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
301 +a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
302
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
303 changeset: 1:d89b0a12d229
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
304 user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
305 date: Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
306 summary: b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
307
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
308 diff -r 9161b9aeaf16 -r d89b0a12d229 b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
309 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
310 +++ b/b Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
311 @@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
312 +a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
313
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
314 changeset: 0:9161b9aeaf16
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
315 user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
316 date: Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
317 summary: a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
318
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
319 diff -r 000000000000 -r 9161b9aeaf16 a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
320 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
321 +++ b/a Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
322 @@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
323 +a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
324
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
325
21966
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
326 log -pf, but no args
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
327
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
328 $ hg log -pf
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
329 changeset: 3:2ca5ba701980
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
330 user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
331 date: Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
332 summary: d
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
333
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
334 diff -r f8954cd4dc1f -r 2ca5ba701980 a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
335 --- a/a Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
336 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
337 @@ -1,1 +0,0 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
338 -a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
339 diff -r f8954cd4dc1f -r 2ca5ba701980 b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
340 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
341 +++ b/b Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
342 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
343 +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
344 diff -r f8954cd4dc1f -r 2ca5ba701980 d
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
345 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
346 +++ b/d Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
347 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
348 +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
349 diff -r f8954cd4dc1f -r 2ca5ba701980 g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
350 --- a/g Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
351 +++ b/g Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
352 @@ -1,2 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
353 f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
354 -g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
355 +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
356
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
357 changeset: 2:f8954cd4dc1f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
358 user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
359 date: Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
360 summary: c
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
361
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
362 diff -r d89b0a12d229 -r f8954cd4dc1f b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
363 --- a/b Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
364 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
365 @@ -1,1 +0,0 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
366 -a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
367 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
368 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
369 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
370 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
371 +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
372 diff -r d89b0a12d229 -r f8954cd4dc1f f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
373 --- a/f Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
374 +++ b/f Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
375 @@ -1,1 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
376 f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
377 +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
378 diff -r d89b0a12d229 -r f8954cd4dc1f g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
379 --- a/g Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
380 +++ b/g Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
381 @@ -1,1 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
382 f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
383 +g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
384
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
385 changeset: 1:d89b0a12d229
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
386 user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
387 date: Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
388 summary: b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
389
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
390 diff -r 9161b9aeaf16 -r d89b0a12d229 b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
391 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
392 +++ b/b Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
393 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
394 +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
395 diff -r 9161b9aeaf16 -r d89b0a12d229 g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
396 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
397 +++ b/g Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
398 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
399 +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
400
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
401 changeset: 0:9161b9aeaf16
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
402 user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
403 date: Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
404 summary: a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
405
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
406 diff -r 000000000000 -r 9161b9aeaf16 a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
407 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
408 +++ b/a Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
409 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
410 +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
411 diff -r 000000000000 -r 9161b9aeaf16 f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
412 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
413 +++ b/f Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
414 @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
415 +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
416
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
417
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
418 log -vf dir/b
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
419
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
420 $ hg log -vf dir/b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
421 changeset: 2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
422 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
423 date: Thu Jan 01 00:00:03 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
424 files: b dir/b f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
425 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
426 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
427
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
428
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
429 changeset: 1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
430 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
431 date: Thu Jan 01 00:00:02 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
432 files: b g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
433 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
434 b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
435
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
436
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
437 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
438 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
439 date: Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
440 files: a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
441 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
442 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
443
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
444
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
445
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
446
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
447 -f and multiple filelog heads
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
448
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
449 $ hg up -q 2
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
450 $ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
451 2
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
452 1
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
453 0
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
454 $ hg up -q tip
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
455 $ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
456 3
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
457 2
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
458 0
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
459
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
460
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
461 log copies with --copies
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
462
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
463 $ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
464 4 e (dir/b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
465 3 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
466 2 dir/b (b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
467 1 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
468 0
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
469
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
470 log copies switch without --copies, with old filecopy template
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
471
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
472 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
473 4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
474 3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
475 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
476 1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
477 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
478
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
479 log copies switch with --copies
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
480
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
481 $ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
482 4 e (dir/b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
483 3 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
484 2 dir/b (b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
485 1 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
486 0
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
487
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
488
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
489 log copies with hardcoded style and with --style=default
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
490
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
491 $ hg log -vC -r4
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
492 changeset: 4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
493 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
494 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
495 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
496 files: dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
497 copies: e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
498 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
499 e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
500
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
501
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
502 $ hg log -vC -r4 --style=default
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
503 changeset: 4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
504 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
505 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
506 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
507 files: dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
508 copies: e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
509 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
510 e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
511
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
512
24013
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
513 $ hg log -vC -r4 -Tjson
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
514 [
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
515 {
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
516 "rev": 4,
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
517 "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
518 "branch": "default",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
519 "phase": "draft",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
520 "user": "test",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
521 "date": [5, 0],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
522 "desc": "e",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
523 "bookmarks": [],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
524 "tags": ["tip"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
525 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
526 "files": ["dir/b", "e"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
527 "copies": {"e": "dir/b"}
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
528 }
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
529 ]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
530
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
531 log copies, non-linear manifest
7762
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7062
diff changeset
532
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
533 $ hg up -C 3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
534 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
535 $ hg mv dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
536 $ echo foo > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
537 $ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
538 adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
539 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
540 $ hg log -v --template '{rev} {file_copies}\n' -r 5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
541 5 e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
542
3718
7db88b094b14 fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3383
diff changeset
543
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
544 log copies, execute bit set
9373
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
545
16887
91e417e9f4b0 test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 16165
diff changeset
546 #if execbit
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
547 $ chmod +x e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
548 $ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
549 $ hg log -v --template '{rev} {file_copies}\n' -r 6
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
550 6
16887
91e417e9f4b0 test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 16165
diff changeset
551 #endif
9421
c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents: 9373
diff changeset
552
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
553
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
554 log -p d
10826
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
555
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
556 $ hg log -pv d
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
557 changeset: 3:2ca5ba701980
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
558 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
559 date: Thu Jan 01 00:00:04 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
560 files: a b d g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
561 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
562 d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
563
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
564
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
565 diff -r f8954cd4dc1f -r 2ca5ba701980 d
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
566 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
567 +++ b/d Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
568 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
569 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
570
11061
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
571
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
572
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
573 log --removed file
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
574
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
575 $ hg log --removed -v a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
576 changeset: 3:2ca5ba701980
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
577 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
578 date: Thu Jan 01 00:00:04 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
579 files: a b d g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
580 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
581 d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
582
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
583
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
584 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
585 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
586 date: Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
587 files: a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
588 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
589 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
590
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
591
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
592
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
593 log --removed revrange file
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
594
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
595 $ hg log --removed -v -r0:2 a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
596 changeset: 0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
597 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
598 date: Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
599 files: a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
600 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
601 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
602
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
603
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
604 $ cd ..
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
605
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
606 log --follow tests
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
607
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
608 $ hg init follow
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
609 $ cd follow
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
610
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
611 $ echo base > base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
612 $ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
613 adding base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
614
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
615 $ echo r1 >> base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
616 $ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
617 $ echo r2 >> base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
618 $ hg ci -Amr2 -d '1 0'
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
619
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
620 $ hg up -C 1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
621 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
622 $ echo b1 > b1
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
623
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
624 log -r "follow('set:clean()')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
625
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
626 $ hg log -r "follow('set:clean()')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
627 changeset: 0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
628 user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
629 date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
630 summary: base
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
631
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
632 changeset: 1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
633 user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
634 date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
635 summary: r1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
636
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
637
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
638 $ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
639 adding b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
640 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
641
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
642
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
643 log -f
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
644
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
645 $ hg log -f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
646 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
647 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
648 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
649 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
650 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
651 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
652
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
653 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
654 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
655 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
656 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
657
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
658 changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
659 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
660 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
661 summary: base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
662
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
663
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
664 log -r follow('glob:b*')
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
665
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
666 $ hg log -r "follow('glob:b*')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
667 changeset: 0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
668 user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
669 date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
670 summary: base
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
671
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
672 changeset: 1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
673 user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
674 date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
675 summary: r1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
676
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
677 changeset: 3:e62f78d544b4
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
678 tag: tip
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
679 parent: 1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
680 user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
681 date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
682 summary: b1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
683
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
684 log -f -r '1 + 4'
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
685
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
686 $ hg up -C 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
687 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
688 $ echo b2 > b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
689 $ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
690 adding b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
691 created new head
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
692 $ hg log -f -r '1 + 4'
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
693 changeset: 4:ddb82e70d1a1
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
694 tag: tip
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
695 parent: 0:67e992f2c4f3
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
696 user: test
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
697 date: Thu Jan 01 00:00:01 1970 +0000
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
698 summary: b2
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
699
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
700 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
701 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
702 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
703 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
704
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
705 changeset: 0:67e992f2c4f3
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
706 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
707 date: Thu Jan 01 00:00:01 1970 +0000
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
708 summary: base
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
709
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
710 log -r "follow('set:grep(b2)')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
711
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
712 $ hg log -r "follow('set:grep(b2)')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
713 changeset: 4:ddb82e70d1a1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
714 tag: tip
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
715 parent: 0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
716 user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
717 date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
718 summary: b2
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
719
23956
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
720 log -f -r null
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
721
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
722 $ hg log -f -r null
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
723 changeset: -1:000000000000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
724 user:
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
725 date: Thu Jan 01 00:00:00 1970 +0000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
726
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
727 $ hg log -f -r null -G
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
728 o changeset: -1:000000000000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
729 user:
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
730 date: Thu Jan 01 00:00:00 1970 +0000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
731
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
732
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
733
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
734 log -f with null parent
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
735
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
736 $ hg up -C null
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
737 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
738 $ hg log -f
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
739
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
740
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
741 log -r . with two parents
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
742
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
743 $ hg up -C 3
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
744 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
745 $ hg merge tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
746 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
747 (branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
748 $ hg log -r .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
749 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
750 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
751 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
752 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
753 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
754
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
755
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
756
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
757 log -r . with one parent
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
758
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
759 $ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
760 $ hg log -r .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
761 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
762 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
763 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
764 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
765 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
766 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
767 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
768
11508
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11141
diff changeset
769
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
770 $ echo postm >> b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
771 $ hg ci -Amb1.1 -d'1 0'
11509
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
772
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
773
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
774 log --follow-first
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
775
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
776 $ hg log --follow-first
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
777 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
778 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
779 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
780 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
781 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
782
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
783 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
784 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
785 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
786 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
787 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
788 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
789
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
790 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
791 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
792 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
793 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
794 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
795
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
796 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
797 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
798 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
799 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
800
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
801 changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
802 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
803 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
804 summary: base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
805
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
806
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
807
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
808 log -P 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
809
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
810 $ hg log -P 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
811 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
812 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
813 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
814 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
815 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
816
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
817 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
818 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
819 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
820 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
821 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
822 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
823
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
824 changeset: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
825 parent: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
826 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
827 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
828 summary: b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
829
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
830 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
831 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
832 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
833 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
834 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
835
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
836
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
837
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
838 log -r tip -p --git
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
839
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
840 $ hg log -r tip -p --git
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
841 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
842 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
843 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
844 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
845 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
846
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
847 diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
848 --- a/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
849 +++ b/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
850 @@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
851 b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
852 +postm
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
853
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
854
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
856 log -r ""
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
857
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
858 $ hg log -r ''
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
859 hg: parse error: empty query
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
860 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
861
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
862 log -r <some unknown node id>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
863
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
864 $ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
865 abort: unknown revision '1000000000000000000000000000000000000000'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
866 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
867
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
868 log -k r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
869
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
870 $ hg log -k r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
871 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
872 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
873 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
874 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
875
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
876 log -p -l2 --color=always
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
877
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
878 $ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
879 > log -p -l2 --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
880 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
881 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
882 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
883 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
884 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
885
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
886 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
887 \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
888 \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
889 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
890 b1
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
891 \x1b[0;32m+postm\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
892
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
893 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
894 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
895 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
896 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
897 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
898 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
899
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
900 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
901 \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
902 \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
903 \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
904 \x1b[0;32m+b2\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
905
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
906
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
907
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
908 log -r tip --stat
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
909
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
910 $ hg log -r tip --stat
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
911 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
912 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
913 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
914 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
915 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
916
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
917 b1 | 1 +
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
918 1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
919
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
920
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
921 $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
922
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
923
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
924 User
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
925
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
926 $ hg init usertest
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
927 $ cd usertest
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
928
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
929 $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
930 $ hg ci -A -m "a" -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
931 adding a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
932 $ echo b > b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
933 $ hg ci -A -m "b" -u "User Two <user2@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
934 adding b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
935
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
936 $ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
937 changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
938 user: User One <user1@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
939 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
940 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
941
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
942 $ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
943 changeset: 1:e834b5e69c0e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
944 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
945 user: User Two <user2@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
946 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
947 summary: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
948
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
949 changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
950 user: User One <user1@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
951 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
952 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
953
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
954 $ hg log -u "user3"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
955
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
956 $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
957
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
958 $ hg init branches
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
959 $ cd branches
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
960
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
961 $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
962 $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
963 adding a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
964 $ hg branch test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
965 marked working directory as branch test
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 14645
diff changeset
966 (branches are permanent and global, did you want a bookmark?)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
967 $ echo b > b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
968 $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
969 adding b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
970
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
971 $ hg up default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
972 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
973 $ echo c > c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
974 $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
975 adding c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
976 $ hg up test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
977 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
978 $ echo c > c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
979 $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
980 adding c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
981
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
982
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
983 log -b default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
984
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
985 $ hg log -b default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
986 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
987 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
988 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
989 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
990 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
991
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
992 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
993 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
994 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
995 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
996
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
997
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
998
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
999 log -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1001 $ hg log -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1002 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1003 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1004 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1005 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1006 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1007 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1008 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1009
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1010 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1011 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1012 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1013 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1014 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1015
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1016
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1017
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1018 log -b dummy
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1019
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1020 $ hg log -b dummy
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1021 abort: unknown revision 'dummy'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
1022 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1023
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1024
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1025 log -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1026
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1027 $ hg log -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1028 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1029 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1030 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1031 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1032 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1033 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1034 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1035
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1036 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1037 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1038 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1039 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1040 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1041
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1042
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1043
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1044 log -b default -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1045
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1046 $ hg log -b default -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1047 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1048 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1049 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1050 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1051 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1052 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1053 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1054
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1055 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1056 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1057 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1058 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1059 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1060
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1061 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1062 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1063 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1064 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1065 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1066
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1067 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1068 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1069 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1070 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1071
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1072
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1073
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1074 log -b default -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1075
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1076 $ hg log -b default -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1077 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1078 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1079 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1080 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1081 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1082 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1083 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1084
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1085 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1086 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1087 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1088 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1089 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1090
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1091 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1092 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1093 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1094 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1095 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1096
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1097 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1098 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1099 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1100 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1101
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1102
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1103
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1104 log -b . -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1105
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1106 $ hg log -b . -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1107 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1108 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1109 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1110 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1111 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1112 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1113 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1114
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1115 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1116 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1117 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1118 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1119 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1120
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1121
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1122
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1123 log -b 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1124
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1125 $ hg log -b 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1126 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1127 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1128 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1129 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1130 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1131
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1132 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1133 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1134 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1135 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1136
23771
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1137 #if gettext
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1138
23771
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1139 Test that all log names are translated (e.g. branches, bookmarks, tags):
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1140
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1141 $ hg bookmark babar -r tip
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1142
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1143 $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1144 \xc3\x84nderung: 3:f5d8de11c2e2 (esc)
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1145 Zweig: test
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1146 Lesezeichen: babar
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1147 Marke: tip
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1148 Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1149 Nutzer: test
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1150 Datum: Thu Jan 01 00:00:00 1970 +0000
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1151 Zusammenfassung: commit on test
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1152
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1153 $ hg bookmark -d babar
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1154
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
1155 #endif
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1156
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1157 log -p --cwd dir (in subdir)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1158
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1159 $ mkdir dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1160 $ hg log -p --cwd dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1161 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1162 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1163 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1164 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1165 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1166 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1167 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1168
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1169 diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1170 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1171 +++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1172 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1173 +c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1174
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1175 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1176 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1177 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1178 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1179 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1180
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1181 diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1182 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1183 +++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1184 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1185 +c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1186
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1187 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1188 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1189 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1190 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1191 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1192
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1193 diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1194 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1195 +++ b/b Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1196 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1197 +b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1198
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1199 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1200 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1201 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1202 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1203
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1204 diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1205 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1206 +++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1207 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1208 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1209
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1210
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1211
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1212 log -p -R repo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1213
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1214 $ cd dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1215 $ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1216 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1217 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1218 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1219 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1220
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1221 diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1222 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1223 +++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1224 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1225 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1226
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1227
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
1228 $ cd ../..
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1229
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1230 $ hg init follow2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1231 $ cd follow2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1232
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1233 # Build the following history:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1234 # tip - o - x - o - x - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1235 # \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1236 # o - o - o - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1237 # \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1238 # o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1239 #
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1240 # Where "o" is a revision containing "foo" and
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1241 # "x" is a revision without "foo"
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1242
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1243 $ touch init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1244 $ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1245 adding init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1246 $ echo 'foo' > init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1247 $ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1248 $ echo 'foo' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1249 $ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1250 adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1251 $ hg rm foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1252 $ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1253 $ echo 'related' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1254 $ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1255 adding foo
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1256
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1257 $ hg up 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1258 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1259 $ touch branch
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1260 $ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1261 adding branch
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1262 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1263 $ touch foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1264 $ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1265 adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1266 $ echo 'change' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1267 $ hg ci -m "change foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1268
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1269 $ hg up 6
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1270 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1271 $ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1272 $ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1273 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1274 $ hg merge 7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1275 merging foo
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26102
diff changeset
1276 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1277 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314
f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents: 11900
diff changeset
1278 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
1279 [1]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1280 $ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1281 $ hg resolve -m foo
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21877
diff changeset
1282 (no more unresolved files)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1283 $ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1284
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1285 $ hg merge 4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1286 merging foo
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26102
diff changeset
1287 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1288 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314
f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents: 11900
diff changeset
1289 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
1290 [1]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1291 $ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1292 $ hg resolve -m foo
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21877
diff changeset
1293 (no more unresolved files)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1294 $ hg ci -m "Last merge, related"
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1295
17181
6f71167292f2 log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents: 16923
diff changeset
1296 $ hg log --graph
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1297 @ changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1298 |\ tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1299 | | parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1300 | | parent: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1301 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1302 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1303 | | summary: Last merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1304 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1305 | o changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1306 | |\ parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1307 | | | parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1308 | | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1309 | | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1310 | | | summary: First merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1311 | | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1312 | | o changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1313 | | | parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1314 | | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1315 | | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1316 | | | summary: change foo in branch, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1317 | | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1318 | o | changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1319 | |/ user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1320 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1321 | | summary: change foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1322 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1323 | o changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1324 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1325 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1326 | | summary: create foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1327 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1328 | o changeset: 5:73db34516eb9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1329 | | parent: 0:e87515fd044a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1330 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1331 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1332 | | summary: first branch, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1333 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1334 o | changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1335 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1336 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1337 | | summary: add foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1338 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1339 o | changeset: 3:dd78ae4afb56
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1340 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1341 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1342 | | summary: delete foo, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1343 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1344 o | changeset: 2:c4c64aedf0f7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1345 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1346 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1347 | | summary: add unrelated old foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1348 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1349 o | changeset: 1:e5faa7440653
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1350 |/ user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1351 | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1352 | summary: change, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1353 |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1354 o changeset: 0:e87515fd044a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1355 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1356 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1357 summary: init, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1358
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
1359
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1360 $ hg --traceback log -f foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1361 changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1362 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1363 parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1364 parent: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1365 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1366 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1367 summary: Last merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1368
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1369 changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1370 parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1371 parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1372 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1373 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1374 summary: First merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1375
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1376 changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1377 parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1378 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1379 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1380 summary: change foo in branch, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1381
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1382 changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1383 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1384 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1385 summary: change foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1386
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1387 changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1388 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1389 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1390 summary: create foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1391
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1392 changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1393 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1394 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1395 summary: add foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1396
12383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1397
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1398 Also check when maxrev < lastrevfilelog
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1399
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1400 $ hg --traceback log -f -r4 foo
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1401 changeset: 4:88176d361b69
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1402 user: test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1403 date: Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1404 summary: add foo, related
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1405
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
1406 changeset: 2:c4c64aedf0f7
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
1407 user: test
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
1408 date: Thu Jan 01 00:00:00 1970 +0000
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
1409 summary: add unrelated old foo
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
1410
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
1411 $ cd ..
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1412
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12383
diff changeset
1413 Issue2383: hg log showing _less_ differences than hg diff
12383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1414
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1415 $ hg init issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1416 $ cd issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1417
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1418 Create a test repo:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1419
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1420 $ echo a > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1421 $ hg ci -Am0
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1422 adding a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1423 $ echo b > b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1424 $ hg ci -Am1
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1425 adding b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1426 $ hg co 0
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1427 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1428 $ echo b > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1429 $ hg ci -m2
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1430 created new head
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1431
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1432 Merge:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1433
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1434 $ hg merge
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1435 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1436 (branch merge, don't forget to commit)
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1437
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1438 Make sure there's a file listed in the merge to trigger the bug:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1439
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1440 $ echo c > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1441 $ hg ci -m3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1442
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1443 Two files shown here in diff:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1444
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1445 $ hg diff --rev 2:3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1446 diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1447 --- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1448 +++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1449 @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1450 -b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1451 +c
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1452 diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1453 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1454 +++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1455 @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1456 +b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1457
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1458 Diff here should be the same:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1459
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1460 $ hg log -vpr 3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1461 changeset: 3:8e07aafe1edc
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1462 tag: tip
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1463 parent: 2:b09be438c43a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1464 parent: 1:925d80f479bb
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1465 user: test
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1466 date: Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1467 files: a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1468 description:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1469 3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1470
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1471
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1472 diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1473 --- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1474 +++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1475 @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1476 -b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1477 +c
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1478 diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1479 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1480 +++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1481 @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1482 +b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1483
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1484 $ cd ..
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1485
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1486 'hg log -r rev fn' when last(filelog(fn)) != rev
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1487
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
1488 $ hg init simplelog
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
1489 $ cd simplelog
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1490 $ echo f > a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1491 $ hg ci -Am'a' -d '0 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1492 adding a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1493 $ echo f >> a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1494 $ hg ci -Am'a bis' -d '1 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1495
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1496 $ hg log -r0 a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1497 changeset: 0:9f758d63dcde
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1498 user: test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1499 date: Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1500 summary: a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
1501
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
1502 enable obsolete to test hidden feature
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
1503
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 21998
diff changeset
1504 $ cat >> $HGRCPATH << EOF
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 21998
diff changeset
1505 > [experimental]
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 21998
diff changeset
1506 > evolution=createmarkers
14645
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1507 > EOF
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
1508
14645
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1509 $ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1510 1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1511 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
1512 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
1513 $ hg up null -q
14645
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1514 $ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1515 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1516 $ hg log --template='{rev}:{node}\n' --hidden
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1517 1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
1518 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
19471
fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents: 19127
diff changeset
1519 $ hg log -r a
23046
c1aede895072 repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23045
diff changeset
1520 abort: hidden revision 'a'!
c1aede895072 repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23045
diff changeset
1521 (use --hidden to access hidden revisions)
19471
fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents: 19127
diff changeset
1522 [255]
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1523
18250
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1524 test that parent prevent a changeset to be hidden
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1525
18267
5bb610f87d1d clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18250
diff changeset
1526 $ hg up 1 -q --hidden
18250
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1527 $ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1528 1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1529 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1530
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1531 test that second parent prevent a changeset to be hidden too
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1532
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1533 $ hg debugsetparents 0 1 # nothing suitable to merge here
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1534 $ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1535 1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1536 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18494
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1537 $ hg debugsetparents 1
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1538 $ hg up -q null
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1539
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1540 bookmarks prevent a changeset being hidden
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1541
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1542 $ hg bookmark --hidden -r 1 X
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1543 $ hg log --template '{rev}:{node}\n'
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1544 1:a765632148dc55d38c35c4f247c618701886cb2f
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
1545 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1546 $ hg bookmark -d X
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1547
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1548 divergent bookmarks are not hidden
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1549
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1550 $ hg bookmark --hidden -r 1 X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1551 $ hg log --template '{rev}:{node}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1552 1:a765632148dc55d38c35c4f247c618701886cb2f
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
1553 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18250
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
1554
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1555 clear extensions configuration
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1556 $ echo '[extensions]' >> $HGRCPATH
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
1557 $ echo "obs=!" >> $HGRCPATH
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1558 $ cd ..
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1559
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1560 test -u/-k for problematic encoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1561 # unicode: cp932:
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1562 # u30A2 0x83 0x41(= 'A')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1563 # u30C2 0x83 0x61(= 'a')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1564
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1565 $ hg init problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1566 $ cd problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1567
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1568 $ python > setup.sh <<EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1569 > print u'''
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1570 > echo a > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1571 > hg add text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1572 > hg --encoding utf-8 commit -u '\u30A2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1573 > echo b > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1574 > hg --encoding utf-8 commit -u '\u30C2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1575 > echo c > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1576 > hg --encoding utf-8 commit -u none -m '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1577 > echo d > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1578 > hg --encoding utf-8 commit -u none -m '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1579 > '''.encode('utf-8')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1580 > EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1581 $ sh < setup.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1582
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1583 test in problematic encoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1584 $ python > test.sh <<EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1585 > print u'''
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1586 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1587 > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1588 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1589 > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1590 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1591 > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1592 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1593 > '''.encode('cp932')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1594 > EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1595 $ sh < test.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1596 0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1597 ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1598 1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1599 ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1600 2
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1601 0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1602 ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1603 3
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1604 1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1605
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
1606 $ cd ..
17746
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1607
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1608 test hg log on non-existent files and on directories
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1609 $ hg init issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1610 $ cd issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1611 $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1612 $ echo 1 > d1/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1613 $ echo 1 > D2/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1614 $ echo 1 > D3.i/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1615 $ echo 1 > d4.hg/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1616 $ echo 1 > d5.d/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1617 $ echo 1 > .d6/f1
17781
8ce535745500 test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b
Adrian Buehlmann <adrian@cadifra.com>
parents: 17746
diff changeset
1618 $ hg -q add .
17746
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1619 $ hg commit -m "a bunch of weird directories"
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1620 $ hg log -l1 d1/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1621 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1622 $ hg log -l1 f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1623 $ hg log -l1 . | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1624 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1625 $ hg log -l1 ./ | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1626 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1627 $ hg log -l1 d1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1628 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1629 $ hg log -l1 D2 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1630 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1631 $ hg log -l1 D2/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1632 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1633 $ hg log -l1 D3.i | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1634 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1635 $ hg log -l1 D3.i/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1636 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1637 $ hg log -l1 d4.hg | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1638 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1639 $ hg log -l1 d4.hg/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1640 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1641 $ hg log -l1 d5.d | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1642 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1643 $ hg log -l1 d5.d/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1644 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1645 $ hg log -l1 .d6 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1646 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1647 $ hg log -l1 .d6/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1648 changeset: 0:65624cd9070a
18466
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1649
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1650 issue3772: hg log -r :null showing revision 0 as well
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1651
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1652 $ hg log -r :null
20699
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
1653 changeset: 0:65624cd9070a
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
1654 tag: tip
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
1655 user: test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
1656 date: Thu Jan 01 00:00:00 1970 +0000
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
1657 summary: a bunch of weird directories
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
1658
18466
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1659 changeset: -1:000000000000
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1660 user:
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1661 date: Thu Jan 01 00:00:00 1970 +0000
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1662
18468
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
1663 $ hg log -r null:null
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
1664 changeset: -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
1665 user:
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
1666 date: Thu Jan 01 00:00:00 1970 +0000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
1667
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1668 working-directory revision requires special treatment
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1669
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1670 $ hg log -r 'wdir()'
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25739
diff changeset
1671 changeset: 2147483647:ffffffffffff
25739
3dabc9b7494a changeset_printer: use node.wdirrev to calculate meaningful parentrevs
Yuya Nishihara <yuya@tcha.org>
parents: 25688
diff changeset
1672 parent: 0:65624cd9070a
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1673 user: test
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1674 date: [A-Za-z0-9:+ ]+ (re)
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1675
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1676 $ hg log -r 'wdir()' -q
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25739
diff changeset
1677 2147483647:ffffffffffff
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
1678
24585
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1679 $ hg log -r 'wdir()' --debug
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25739
diff changeset
1680 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
24585
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1681 phase: draft
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1682 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1683 parent: -1:0000000000000000000000000000000000000000
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1684 user: test
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1685 date: [A-Za-z0-9:+ ]+ (re)
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1686 extra: branch=default
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
1687
24602
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1688 $ hg log -r 'wdir()' -Tjson
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1689 [
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1690 {
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1691 "rev": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1692 "node": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1693 "branch": "default",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1694 "phase": "draft",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1695 "user": "test",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1696 "date": [*, 0], (glob)
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1697 "desc": "",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1698 "bookmarks": [],
25688
24cda1dd45ff workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents: 25006
diff changeset
1699 "tags": [],
24602
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1700 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1701 }
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1702 ]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1703
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1704 $ hg log -r 'wdir()' -Tjson -q
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1705 [
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1706 {
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1707 "rev": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1708 "node": null
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1709 }
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1710 ]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
1711
24603
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1712 $ hg log -r 'wdir()' -Tjson --debug
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1713 [
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1714 {
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1715 "rev": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1716 "node": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1717 "branch": "default",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1718 "phase": "draft",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1719 "user": "test",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1720 "date": [*, 0], (glob)
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1721 "desc": "",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1722 "bookmarks": [],
25688
24cda1dd45ff workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents: 25006
diff changeset
1723 "tags": [],
24603
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1724 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1725 "manifest": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1726 "extra": {"branch": "default"},
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1727 "modified": [],
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1728 "added": [],
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1729 "removed": []
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1730 }
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1731 ]
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
1732
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1733 Check that adding an arbitrary name shows up in log automatically
18466
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
1734
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1735 $ cat > ../names.py <<EOF
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1736 > """A small extension to test adding arbitrary names to a repo"""
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1737 > from mercurial.namespaces import namespace
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1738 >
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1739 > def reposetup(ui, repo):
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1740 > foo = {'foo': repo[0].node()}
23873
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
1741 > names = lambda r: foo.keys()
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
1742 > namemap = lambda r, name: foo.get(name)
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
1743 > nodemap = lambda r, node: [name for name, n in foo.iteritems()
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
1744 > if n == node]
23876
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1745 > ns = namespace("bars", templatename="bar", logname="barlog",
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1746 > colorname="barcolor", listnames=names, namemap=namemap,
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1747 > nodemap=nodemap)
23873
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
1748 >
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1749 > repo.names.addnamespace(ns)
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1750 > EOF
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1751
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1752 $ hg --config extensions.names=../names.py log -r 0
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1753 changeset: 0:65624cd9070a
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1754 tag: tip
23876
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1755 barlog: foo
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1756 user: test
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1757 date: Thu Jan 01 00:00:00 1970 +0000
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1758 summary: a bunch of weird directories
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
1759
23876
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1760 $ hg --config extensions.names=../names.py \
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1761 > --config extensions.color= --config color.log.barcolor=red \
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1762 > --color=always log -r 0
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1763 \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc)
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1764 tag: tip
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1765 \x1b[0;31mbarlog: foo\x1b[0m (esc)
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1766 user: test
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1767 date: Thu Jan 01 00:00:00 1970 +0000
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1768 summary: a bunch of weird directories
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1769
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1770 $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1771 foo
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
1772
17746
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
1773 $ cd ..
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1774
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1775 hg log -f dir across branches
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1776
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1777 $ hg init acrossbranches
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1778 $ cd acrossbranches
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1779 $ mkdir d
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1780 $ echo a > d/a && hg ci -Aqm a
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1781 $ echo b > d/a && hg ci -Aqm b
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1782 $ hg up -q 0
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1783 $ echo b > d/a && hg ci -Aqm c
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1784 $ hg log -f d -T '{desc}' -G
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1785 @ c
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1786 |
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1787 o a
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1788
24180
d8e0c591781c spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 24064
diff changeset
1789 Ensure that largefiles doesn't interfere with following a normal file
23976
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
1790 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
1791 @ c
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
1792 |
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
1793 o a
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
1794
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1795 $ hg log -f d/a -T '{desc}' -G
23704
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1796 @ c
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1797 |
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1798 o a
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1799
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
1800 $ cd ..
23702
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1801
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1802 hg log -f with linkrev pointing to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1803 -------------------------------------------------
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1804
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1805 create history with a filerev whose linkrev points to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1806
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1807 $ hg init branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1808 $ cd branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1809 $ echo 1 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1810 $ hg commit -Am 'content1'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1811 adding a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1812 $ echo 2 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1813 $ hg commit -m 'content2'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1814 $ hg up --rev 'desc(content1)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1815 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1816 $ echo unrelated > unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1817 $ hg commit -Am 'unrelated'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1818 adding unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1819 created new head
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1820 $ hg graft -r 'desc(content2)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1821 grafting 1:2294ae80ad84 "content2"
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1822 $ echo 3 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1823 $ hg commit -m 'content3'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1824 $ hg log -G
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1825 @ changeset: 4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1826 | tag: tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1827 | user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1828 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1829 | summary: content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1830 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1831 o changeset: 3:15b2327059e5
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1832 | user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1833 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1834 | summary: content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1835 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1836 o changeset: 2:2029acd1168c
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1837 | parent: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1838 | user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1839 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1840 | summary: unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1841 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1842 | o changeset: 1:2294ae80ad84
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1843 |/ user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1844 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1845 | summary: content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1846 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1847 o changeset: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1848 user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1849 date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1850 summary: content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1851
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1852
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1853 log -f on the file should list the graft result.
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1854
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1855 $ hg log -Gf a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1856 @ changeset: 4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1857 | tag: tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1858 | user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1859 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1860 | summary: content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1861 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1862 o changeset: 3:15b2327059e5
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1863 | user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1864 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1865 | summary: content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1866 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1867 o changeset: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1868 user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1869 date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1870 summary: content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1871
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1872
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1873 plain log lists the original version
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1874 (XXX we should probably list both)
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1875
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1876 $ hg log -G a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1877 @ changeset: 4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1878 | tag: tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1879 | user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1880 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1881 | summary: content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1882 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1883 | o changeset: 1:2294ae80ad84
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1884 |/ user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1885 | date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1886 | summary: content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1887 |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1888 o changeset: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1889 user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1890 date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1891 summary: content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1892
23704
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1893
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1894 hg log -f from the grafted changeset
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1895 (The bootstrap should properly take the topology in account)
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1896
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1897 $ hg up 'desc(content3)^'
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1898 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1899 $ hg log -Gf a
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1900 @ changeset: 3:15b2327059e5
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1901 | user: test
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1902 | date: Thu Jan 01 00:00:00 1970 +0000
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1903 | summary: content2
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1904 |
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1905 o changeset: 0:ae0a3c9f9e95
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1906 user: test
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1907 date: Thu Jan 01 00:00:00 1970 +0000
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1908 summary: content1
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
1909
23719
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1910
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1911 Test that we use the first non-hidden changeset in that case.
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1912
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1913 (hide the changeset)
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1914
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1915 $ hg log -T '{node}\n' -r 1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1916 2294ae80ad8447bc78383182eeac50cb049df623
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1917 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1918 $ hg log -G
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1919 o changeset: 4:50b9b36e9c5d
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1920 | tag: tip
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1921 | user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1922 | date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1923 | summary: content3
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1924 |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1925 @ changeset: 3:15b2327059e5
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1926 | user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1927 | date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1928 | summary: content2
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1929 |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1930 o changeset: 2:2029acd1168c
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1931 | parent: 0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1932 | user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1933 | date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1934 | summary: unrelated
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1935 |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1936 o changeset: 0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1937 user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1938 date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1939 summary: content1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1940
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1941
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1942 Check that log on the file does not drop the file revision.
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1943
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1944 $ hg log -G a
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1945 o changeset: 4:50b9b36e9c5d
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1946 | tag: tip
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1947 | user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1948 | date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1949 | summary: content3
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1950 |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1951 @ changeset: 3:15b2327059e5
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1952 | user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1953 | date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1954 | summary: content2
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1955 |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1956 o changeset: 0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1957 user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1958 date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1959 summary: content1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1960
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
1961
23720
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1962 Even when a head revision is linkrev-shadowed.
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1963
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1964 $ hg log -T '{node}\n' -r 4
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1965 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1966 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1967 $ hg log -G a
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1968 @ changeset: 3:15b2327059e5
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1969 | tag: tip
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1970 | user: test
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1971 | date: Thu Jan 01 00:00:00 1970 +0000
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1972 | summary: content2
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1973 |
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1974 o changeset: 0:ae0a3c9f9e95
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1975 user: test
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1976 date: Thu Jan 01 00:00:00 1970 +0000
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1977 summary: content1
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1978
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
1979
23702
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
1980 $ cd ..
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1981
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1982 Even when the file revision is missing from some head:
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1983
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1984 $ hg init issue4490
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1985 $ cd issue4490
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1986 $ echo '[experimental]' >> .hg/hgrc
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1987 $ echo 'evolution=createmarkers' >> .hg/hgrc
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1988 $ echo a > a
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1989 $ hg ci -Am0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1990 adding a
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1991 $ echo b > b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1992 $ hg ci -Am1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1993 adding b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1994 $ echo B > b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1995 $ hg ci --amend -m 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1996 $ hg up 0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1997 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1998 $ echo c > c
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
1999 $ hg ci -Am2
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2000 adding c
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2001 created new head
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2002 $ hg up 'head() and not .'
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2003 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2004 $ hg log -G
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2005 o changeset: 4:db815d6d32e6
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2006 | tag: tip
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2007 | parent: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2008 | user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2009 | date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2010 | summary: 2
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2011 |
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2012 | @ changeset: 3:9bc8ce7f9356
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2013 |/ parent: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2014 | user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2015 | date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2016 | summary: 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2017 |
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2018 o changeset: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2019 user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2020 date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2021 summary: 0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2022
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2023 $ hg log -f -G b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2024 @ changeset: 3:9bc8ce7f9356
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2025 | parent: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2026 | user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2027 | date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2028 | summary: 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2029 |
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2030 $ hg log -G b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2031 @ changeset: 3:9bc8ce7f9356
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2032 | parent: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2033 | user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2034 | date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2035 | summary: 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
2036 |
23865
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2037 $ cd ..
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2038
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2039 Check proper report when the manifest changes but not the file issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2040 ------------------------------------------------------------------------
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2041
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2042 $ hg init issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2043 $ cd issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2044 $ for f in A B C D F E G H I J K L M N O P Q R S T U; do
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2045 > echo 1 > $f;
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2046 > hg add $f;
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2047 > done
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2048 $ hg commit -m 'A1B1C1'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2049 $ echo 2 > A
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2050 $ echo 2 > B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2051 $ echo 2 > C
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2052 $ hg commit -m 'A2B2C2'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2053 $ hg up 0
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2054 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2055 $ echo 3 > A
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2056 $ echo 2 > B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2057 $ echo 2 > C
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2058 $ hg commit -m 'A3B2C2'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2059 created new head
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2060
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2061 $ hg log -G
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2062 @ changeset: 2:fe5fc3d0eb17
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2063 | tag: tip
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2064 | parent: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2065 | user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2066 | date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2067 | summary: A3B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2068 |
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2069 | o changeset: 1:07dcc6b312c0
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2070 |/ user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2071 | date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2072 | summary: A2B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2073 |
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2074 o changeset: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2075 user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2076 date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2077 summary: A1B1C1
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2078
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2079
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2080 Log -f on B should reports current changesets
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2081
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2082 $ hg log -fG B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2083 @ changeset: 2:fe5fc3d0eb17
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2084 | tag: tip
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2085 | parent: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2086 | user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2087 | date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2088 | summary: A3B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2089 |
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2090 o changeset: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2091 user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2092 date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2093 summary: A1B1C1
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2094
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
2095 $ cd ..