| author | Yuya Nishihara <yuya@tcha.org> |
| Fri, 01 Aug 2014 21:36:56 +0900 | |
| branch | stable |
| changeset 21966 | be94ed4baa5d |
| parent 21947 | b081decd9062 |
| child 21998 | 739095270f48 |
| permissions | -rw-r--r-- |
|
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 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
48 |
$ hg log a |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
49 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
50 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
51 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
52 |
summary: a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
53 |
|
|
18340
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
54 |
log on directory |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
55 |
|
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
56 |
$ hg log dir |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
57 |
changeset: 4:7e4639b4691b |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
58 |
tag: tip |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
59 |
user: test |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
60 |
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
|
61 |
summary: e |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
62 |
|
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
63 |
changeset: 2:f8954cd4dc1f |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
64 |
user: test |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
65 |
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
|
66 |
summary: c |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
67 |
|
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
68 |
$ 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
|
69 |
changeset: 4:7e4639b4691b |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
70 |
tag: tip |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
71 |
user: test |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
72 |
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
|
73 |
summary: e |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
74 |
|
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
75 |
changeset: 2:f8954cd4dc1f |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
76 |
user: test |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
77 |
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
|
78 |
summary: c |
|
8802277c40ee
log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents:
18267
diff
changeset
|
79 |
|
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
80 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
81 |
-f, directory |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
82 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
83 |
$ hg log -f dir |
|
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
84 |
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
|
85 |
[255] |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
86 |
|
|
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
|
87 |
-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
|
88 |
|
|
6ba6e345961e
templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents:
18991
diff
changeset
|
89 |
$ 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
|
90 |
abort: style 'something' not found |
|
19127
d982edcfe7f0
templater: fix output instability from gsoc patches
Augie Fackler <raf@durin42.com>
parents:
19126
diff
changeset
|
91 |
(available styles: bisect, changelog, compact, default, phases, 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
|
92 |
[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
|
93 |
|
|
19126
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
94 |
-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
|
95 |
|
|
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
96 |
|
|
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
97 |
$ 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
|
98 |
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
|
99 |
tag: tip |
|
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
100 |
phase: draft |
|
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
101 |
user: test |
|
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
102 |
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
|
103 |
summary: e |
|
5c5152af0d15
log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents:
19125
diff
changeset
|
104 |
|
|
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
|
105 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
106 |
-f, but no args |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
107 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
108 |
$ hg log -f |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
109 |
changeset: 4:7e4639b4691b |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
110 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
111 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
112 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
113 |
summary: e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
114 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
115 |
changeset: 3:2ca5ba701980 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
116 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
117 |
date: Thu Jan 01 00:00:04 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
118 |
summary: d |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
119 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
120 |
changeset: 2:f8954cd4dc1f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
121 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
122 |
date: Thu Jan 01 00:00:03 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
123 |
summary: c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
124 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
125 |
changeset: 1:d89b0a12d229 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
126 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
127 |
date: Thu Jan 01 00:00:02 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
128 |
summary: b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
129 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
130 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
131 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
132 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
133 |
summary: a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
134 |
|
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
135 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
136 |
one rename |
|
11562
efbc09fdefd8
test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents:
11509
diff
changeset
|
137 |
|
|
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
138 |
$ hg up -q 2 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
139 |
$ hg log -vf a |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
140 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
141 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
142 |
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
|
143 |
files: a f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
144 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
145 |
a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
146 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
147 |
|
| 3197 | 148 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
149 |
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
|
150 |
|
|
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
151 |
$ hg up -q tip |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
152 |
$ hg log -vf e |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
153 |
changeset: 4:7e4639b4691b |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
154 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
155 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
156 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
157 |
files: dir/b e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
158 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
159 |
e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
160 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
161 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
162 |
changeset: 2:f8954cd4dc1f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
163 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
164 |
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
|
165 |
files: b dir/b f g |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
166 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
167 |
c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
168 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
169 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
170 |
changeset: 1:d89b0a12d229 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
171 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
172 |
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
|
173 |
files: b g |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
174 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
175 |
b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
176 |
|
|
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: 0:9161b9aeaf16 |
|
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:01 1970 +0000 |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
181 |
files: a f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
182 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
183 |
a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
184 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
185 |
|
|
5811
180a3eee4b75
Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4510
diff
changeset
|
186 |
|
|
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
187 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
188 |
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
|
189 |
|
|
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
190 |
$ hg up -q 3 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
191 |
$ 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
|
192 |
changeset: 2:f8954cd4dc1f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
193 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
194 |
date: Thu Jan 01 00:00:03 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
195 |
summary: c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
196 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
197 |
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
198 |
--- /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
|
199 |
+++ 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
|
200 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
201 |
+a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
202 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
203 |
changeset: 1:d89b0a12d229 |
|
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:02 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
206 |
summary: b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
207 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
208 |
diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
209 |
--- /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
|
210 |
+++ 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
|
211 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
212 |
+a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
213 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
214 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
215 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
216 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
217 |
summary: a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
218 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
219 |
diff -r 000000000000 -r 9161b9aeaf16 a |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
220 |
--- /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
|
221 |
+++ 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
|
222 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
223 |
+a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
224 |
|
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
225 |
|
|
21876
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
226 |
log -pf b inside dir |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
227 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
228 |
$ hg --cwd=dir log -pf b |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
229 |
changeset: 2:f8954cd4dc1f |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
230 |
user: test |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
231 |
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
|
232 |
summary: c |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
233 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
234 |
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
|
235 |
--- /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
|
236 |
+++ 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
|
237 |
@@ -0,0 +1,1 @@ |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
238 |
+a |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
239 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
240 |
changeset: 1:d89b0a12d229 |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
241 |
user: test |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
242 |
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
|
243 |
summary: b |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
244 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
245 |
diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
246 |
--- /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
|
247 |
+++ 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
|
248 |
@@ -0,0 +1,1 @@ |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
249 |
+a |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
250 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
251 |
changeset: 0:9161b9aeaf16 |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
252 |
user: test |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
253 |
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
|
254 |
summary: a |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
255 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
256 |
diff -r 000000000000 -r 9161b9aeaf16 a |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
257 |
--- /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
|
258 |
+++ 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
|
259 |
@@ -0,0 +1,1 @@ |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
260 |
+a |
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
261 |
|
|
584bbfd1b50d
log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
20699
diff
changeset
|
262 |
|
|
21966
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
263 |
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
|
264 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
265 |
$ 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
|
266 |
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
|
267 |
user: test |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
268 |
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
|
269 |
summary: d |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
270 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
271 |
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
|
272 |
--- 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
|
273 |
+++ /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
|
274 |
@@ -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
|
275 |
-a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
276 |
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
|
277 |
--- /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
|
278 |
+++ 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
|
279 |
@@ -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
|
280 |
+a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
281 |
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
|
282 |
--- /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
|
283 |
+++ 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
|
284 |
@@ -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
|
285 |
+a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
286 |
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
|
287 |
--- 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
|
288 |
+++ 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
|
289 |
@@ -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
|
290 |
f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
291 |
-g |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
292 |
+f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
293 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
294 |
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
|
295 |
user: test |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
296 |
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
|
297 |
summary: c |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
298 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
299 |
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
|
300 |
--- 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
|
301 |
+++ /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
|
302 |
@@ -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
|
303 |
-a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
304 |
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
|
305 |
--- /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
|
306 |
+++ 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
|
307 |
@@ -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
|
308 |
+a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
309 |
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
|
310 |
--- 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
|
311 |
+++ 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
|
312 |
@@ -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
|
313 |
f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
314 |
+f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
315 |
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
|
316 |
--- 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
|
317 |
+++ 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
|
318 |
@@ -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
|
319 |
f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
320 |
+g |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
321 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
322 |
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
|
323 |
user: test |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
324 |
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
|
325 |
summary: b |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
326 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
327 |
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
|
328 |
--- /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
|
329 |
+++ 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
|
330 |
@@ -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
|
331 |
+a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
332 |
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
|
333 |
--- /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
|
334 |
+++ 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
|
335 |
@@ -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
|
336 |
+f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
337 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
338 |
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
|
339 |
user: test |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
340 |
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
|
341 |
summary: a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
342 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
343 |
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
|
344 |
--- /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
|
345 |
+++ 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
|
346 |
@@ -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
|
347 |
+a |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
348 |
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
|
349 |
--- /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
|
350 |
+++ 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
|
351 |
@@ -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
|
352 |
+f |
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
353 |
|
|
be94ed4baa5d
log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents:
21947
diff
changeset
|
354 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
355 |
log -vf dir/b |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
356 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
357 |
$ 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
|
358 |
changeset: 2:f8954cd4dc1f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
359 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
360 |
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
|
361 |
files: b dir/b f g |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
362 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
363 |
c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
364 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
365 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
366 |
changeset: 1:d89b0a12d229 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
367 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
368 |
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
|
369 |
files: b g |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
370 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
371 |
b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
372 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
373 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
374 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
375 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
376 |
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
|
377 |
files: a f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
378 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
379 |
a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
380 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
381 |
|
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
382 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
383 |
|
|
16165
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
384 |
-f and multiple filelog heads |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
385 |
|
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
386 |
$ hg up -q 2 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
387 |
$ hg log -f g --template '{rev}\n' |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
388 |
2 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
389 |
1 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
390 |
0 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
391 |
$ hg up -q tip |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
392 |
$ hg log -f g --template '{rev}\n' |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
393 |
3 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
394 |
2 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
395 |
0 |
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
396 |
|
|
60101427d618
log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents:
16164
diff
changeset
|
397 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
398 |
log copies with --copies |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
399 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
400 |
$ hg log -vC --template '{rev} {file_copies}\n' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
401 |
4 e (dir/b) |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
402 |
3 b (a)g (f) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
403 |
2 dir/b (b) |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
404 |
1 b (a)g (f) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
405 |
0 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
406 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
407 |
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
|
408 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
409 |
$ 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
|
410 |
4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
411 |
3 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
412 |
2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
413 |
1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
414 |
0 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
415 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
416 |
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
|
417 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
418 |
$ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
419 |
4 e (dir/b) |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
420 |
3 b (a)g (f) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
421 |
2 dir/b (b) |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
422 |
1 b (a)g (f) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
423 |
0 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
424 |
|
|
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
425 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
426 |
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
|
427 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
428 |
$ hg log -vC -r4 |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
429 |
changeset: 4:7e4639b4691b |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
430 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
431 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
432 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
433 |
files: dir/b e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
434 |
copies: e (dir/b) |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
435 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
436 |
e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
437 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
438 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
439 |
$ 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
|
440 |
changeset: 4:7e4639b4691b |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
441 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
442 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
443 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
444 |
files: dir/b e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
445 |
copies: e (dir/b) |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
446 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
447 |
e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
448 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
449 |
|
|
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
450 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
451 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
452 |
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
|
453 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
454 |
$ hg up -C 3 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
455 |
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
|
456 |
$ hg mv dir/b e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
457 |
$ echo foo > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
458 |
$ hg ci -Ame2 -d '6 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
459 |
adding foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
460 |
created new head |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
461 |
$ 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
|
462 |
5 e (dir/b) |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
463 |
|
|
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
464 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
465 |
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
|
466 |
|
|
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
467 |
#if execbit |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
468 |
$ chmod +x e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
469 |
$ hg ci -me3 -d '7 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
470 |
$ 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
|
471 |
6 |
|
16887
91e417e9f4b0
test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16165
diff
changeset
|
472 |
#endif |
|
9421
c8e4dc218aaf
log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents:
9373
diff
changeset
|
473 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
474 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
475 |
log -p d |
|
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
10776
diff
changeset
|
476 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
477 |
$ hg log -pv d |
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
478 |
changeset: 3:2ca5ba701980 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
479 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
480 |
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
|
481 |
files: a b d g |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
482 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
483 |
d |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
484 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
485 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
486 |
diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
487 |
--- /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
|
488 |
+++ 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
|
489 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
490 |
+a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
491 |
|
|
11061
51d0387523c6
log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents:
10960
diff
changeset
|
492 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
493 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
494 |
log --removed file |
|
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
495 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
496 |
$ 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
|
497 |
changeset: 3:2ca5ba701980 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
498 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
499 |
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
|
500 |
files: a b d g |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
501 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
502 |
d |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
503 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
504 |
|
|
16164
18743c4d1989
test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents:
15725
diff
changeset
|
505 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
506 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
507 |
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
|
508 |
files: a f |
|
11900
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 |
a |
|
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 |
|
|
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
513 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
514 |
log --removed revrange file |
|
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
515 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
516 |
$ 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
|
517 |
changeset: 0:9161b9aeaf16 |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
518 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
519 |
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
|
520 |
files: a f |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
521 |
description: |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
522 |
a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
523 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
524 |
|
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
525 |
$ cd .. |
|
8020
777a9efdae2d
log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents:
7762
diff
changeset
|
526 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
527 |
log --follow tests |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
528 |
|
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
529 |
$ 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
|
530 |
$ cd follow |
|
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
531 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
532 |
$ echo base > base |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
533 |
$ hg ci -Ambase -d '1 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
534 |
adding base |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
535 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
536 |
$ echo r1 >> base |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
537 |
$ hg ci -Amr1 -d '1 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
538 |
$ echo r2 >> base |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
539 |
$ 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
|
540 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
541 |
$ hg up -C 1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
542 |
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
|
543 |
$ echo b1 > b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
544 |
$ hg ci -Amb1 -d '1 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
545 |
adding b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
546 |
created new head |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
547 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
548 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
549 |
log -f |
|
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
550 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
551 |
$ hg log -f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
552 |
changeset: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
553 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
554 |
parent: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
555 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
556 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
557 |
summary: b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
558 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
559 |
changeset: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
560 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
561 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
562 |
summary: r1 |
|
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 |
changeset: 0:67e992f2c4f3 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
565 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
566 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
567 |
summary: base |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
568 |
|
|
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
569 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
570 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
571 |
log -f -r 1:tip |
|
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
572 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
573 |
$ hg up -C 0 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
574 |
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
|
575 |
$ echo b2 > b2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
576 |
$ hg ci -Amb2 -d '1 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
577 |
adding b2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
578 |
created new head |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
579 |
$ hg log -f -r 1:tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
580 |
changeset: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
581 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
582 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
583 |
summary: r1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
584 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
585 |
changeset: 2:60c670bf5b30 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
586 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
587 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
588 |
summary: r2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
589 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
590 |
changeset: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
591 |
parent: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
592 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
593 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
594 |
summary: b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
595 |
|
|
10957
0d5f139b23c1
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents:
10826
diff
changeset
|
596 |
|
|
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
597 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
598 |
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
|
599 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
600 |
$ hg up -C 3 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
601 |
2 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
|
602 |
$ hg merge tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
603 |
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
|
604 |
(branch merge, don't forget to commit) |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
605 |
$ hg log -r . |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
606 |
changeset: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
607 |
parent: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
608 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
609 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
610 |
summary: b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
611 |
|
|
10960
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
612 |
|
|
ca739acf1a98
commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents:
10957
diff
changeset
|
613 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
614 |
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
|
615 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
616 |
$ hg ci -mm12 -d '1 0' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
617 |
$ hg log -r . |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
618 |
changeset: 5:302e9dd6890d |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
619 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
620 |
parent: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
621 |
parent: 4:ddb82e70d1a1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
622 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
623 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
624 |
summary: m12 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
625 |
|
|
11508
fbab0875fd09
log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents:
11141
diff
changeset
|
626 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
627 |
$ echo postm >> b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
628 |
$ 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
|
629 |
|
|
2eaaad99f2f0
test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents:
11508
diff
changeset
|
630 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
631 |
log --follow-first |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
632 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
633 |
$ hg log --follow-first |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
634 |
changeset: 6:2404bbcab562 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
635 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
636 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
637 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
638 |
summary: b1.1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
639 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
640 |
changeset: 5:302e9dd6890d |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
641 |
parent: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
642 |
parent: 4:ddb82e70d1a1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
643 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
644 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
645 |
summary: m12 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
646 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
647 |
changeset: 3:e62f78d544b4 |
|
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 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
663 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
664 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
665 |
log -P 2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
666 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
667 |
$ hg log -P 2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
668 |
changeset: 6:2404bbcab562 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
669 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
670 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
671 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
672 |
summary: b1.1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
673 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
674 |
changeset: 5:302e9dd6890d |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
675 |
parent: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
676 |
parent: 4:ddb82e70d1a1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
677 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
678 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
679 |
summary: m12 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
680 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
681 |
changeset: 4:ddb82e70d1a1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
682 |
parent: 0:67e992f2c4f3 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
683 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
684 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
685 |
summary: b2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
686 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
687 |
changeset: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
688 |
parent: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
689 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
690 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
691 |
summary: b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
692 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
693 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
694 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
695 |
log -r tip -p --git |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
696 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
697 |
$ hg log -r tip -p --git |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
698 |
changeset: 6:2404bbcab562 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
699 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
700 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
701 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
702 |
summary: b1.1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
703 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
704 |
diff --git a/b1 b/b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
705 |
--- a/b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
706 |
+++ b/b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
707 |
@@ -1,1 +1,2 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
708 |
b1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
709 |
+postm |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
710 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
711 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
712 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
713 |
log -r "" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
714 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
715 |
$ hg log -r '' |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
716 |
hg: parse error: empty query |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
717 |
[255] |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
718 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
719 |
log -r <some unknown node id> |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
720 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
721 |
$ hg log -r 1000000000000000000000000000000000000000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
722 |
abort: unknown revision '1000000000000000000000000000000000000000'! |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
723 |
[255] |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
724 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
725 |
log -k r1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
726 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
727 |
$ hg log -k r1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
728 |
changeset: 1:3d5bf5654eda |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
729 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
730 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
731 |
summary: r1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
732 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
733 |
log -p -l2 --color=always |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
734 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
735 |
$ hg --config extensions.color= --config color.mode=ansi \ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
736 |
> 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
|
737 |
\x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
738 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
739 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
740 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
741 |
summary: b1.1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
742 |
|
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
743 |
\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
|
744 |
\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
|
745 |
\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
|
746 |
\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
|
747 |
b1 |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
748 |
\x1b[0;32m+postm\x1b[0m (esc) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
749 |
|
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
750 |
\x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
751 |
parent: 3:e62f78d544b4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
752 |
parent: 4:ddb82e70d1a1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
753 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
754 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
755 |
summary: m12 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
756 |
|
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12399
diff
changeset
|
757 |
\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
|
758 |
\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
|
759 |
\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
|
760 |
\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
|
761 |
\x1b[0;32m+b2\x1b[0m (esc) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
762 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
763 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
764 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
765 |
log -r tip --stat |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
766 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
767 |
$ hg log -r tip --stat |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
768 |
changeset: 6:2404bbcab562 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
769 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
770 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
771 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
772 |
summary: b1.1 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
773 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
774 |
b1 | 1 + |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
775 |
1 files changed, 1 insertions(+), 0 deletions(-) |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
776 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
777 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
778 |
$ cd .. |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
779 |
|
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
780 |
|
|
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
781 |
User |
|
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
782 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
783 |
$ hg init usertest |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
784 |
$ cd usertest |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
785 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
786 |
$ echo a > a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
787 |
$ 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
|
788 |
adding a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
789 |
$ echo b > b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
790 |
$ 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
|
791 |
adding b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
792 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
793 |
$ hg log -u "User One <user1@example.org>" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
794 |
changeset: 0:29a4c94f1924 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
795 |
user: User One <user1@example.org> |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
796 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
797 |
summary: a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
798 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
799 |
$ hg log -u "user1" -u "user2" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
800 |
changeset: 1:e834b5e69c0e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
801 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
802 |
user: User Two <user2@example.org> |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
803 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
804 |
summary: b |
|
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 |
changeset: 0:29a4c94f1924 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
807 |
user: User One <user1@example.org> |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
808 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
809 |
summary: a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
810 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
811 |
$ hg log -u "user3" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
812 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
813 |
$ cd .. |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
814 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
815 |
$ hg init branches |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
816 |
$ cd branches |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
817 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
818 |
$ echo a > a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
819 |
$ hg ci -A -m "commit on default" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
820 |
adding a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
821 |
$ hg branch test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
822 |
marked working directory as branch test |
| 15615 | 823 |
(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
|
824 |
$ echo b > b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
825 |
$ hg ci -A -m "commit on test" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
826 |
adding b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
827 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
828 |
$ hg up default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
829 |
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
|
830 |
$ echo c > c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
831 |
$ hg ci -A -m "commit on default" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
832 |
adding c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
833 |
$ hg up test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
834 |
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
|
835 |
$ echo c > c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
836 |
$ hg ci -A -m "commit on test" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
837 |
adding c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
838 |
|
|
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 |
log -b default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
841 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
842 |
$ hg log -b default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
843 |
changeset: 2:c3a4f03cc9a7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
844 |
parent: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
845 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
846 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
847 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
848 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
849 |
changeset: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
850 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
851 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
852 |
summary: commit on default |
|
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 -b test |
|
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 -b test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
859 |
changeset: 3:f5d8de11c2e2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
860 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
861 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
862 |
parent: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
863 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
864 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
865 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
866 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
867 |
changeset: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
868 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
869 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
870 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
871 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
872 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
873 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
874 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
875 |
log -b dummy |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
876 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
877 |
$ hg log -b dummy |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
878 |
abort: unknown revision 'dummy'! |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
879 |
[255] |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
880 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
881 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
882 |
log -b . |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
883 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
884 |
$ hg log -b . |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
885 |
changeset: 3:f5d8de11c2e2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
886 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
887 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
888 |
parent: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
889 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
890 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
891 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
892 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
893 |
changeset: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
894 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
895 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
896 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
897 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
898 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
899 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
900 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
901 |
log -b default -b test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
902 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
903 |
$ hg log -b default -b test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
904 |
changeset: 3:f5d8de11c2e2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
905 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
906 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
907 |
parent: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
908 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
909 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
910 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
911 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
912 |
changeset: 2:c3a4f03cc9a7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
913 |
parent: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
914 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
915 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
916 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
917 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
918 |
changeset: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
919 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
920 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
921 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
922 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
923 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
924 |
changeset: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
925 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
926 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
927 |
summary: commit on default |
|
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 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
930 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
931 |
log -b default -b . |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
932 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
933 |
$ hg log -b default -b . |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
934 |
changeset: 3:f5d8de11c2e2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
935 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
936 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
937 |
parent: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
938 |
user: test |
|
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: commit on test |
|
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 |
changeset: 2:c3a4f03cc9a7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
943 |
parent: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
944 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
945 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
946 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
947 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
948 |
changeset: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
949 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
950 |
user: test |
|
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: commit on test |
|
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 |
changeset: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
955 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
956 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
957 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
958 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
959 |
|
|
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 |
log -b . -b test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
962 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
963 |
$ hg log -b . -b test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
964 |
changeset: 3:f5d8de11c2e2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
965 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
966 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
967 |
parent: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
968 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
969 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
970 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
971 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
972 |
changeset: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
973 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
974 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
975 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
976 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
977 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
978 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
979 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
980 |
log -b 2 |
|
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 |
$ hg log -b 2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
983 |
changeset: 2:c3a4f03cc9a7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
984 |
parent: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
985 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
986 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
987 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
988 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
989 |
changeset: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
990 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
991 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
992 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
993 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
994 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
995 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
996 |
log -p --cwd dir (in subdir) |
|
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 |
$ mkdir dir |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
999 |
$ hg log -p --cwd dir |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1000 |
changeset: 3:f5d8de11c2e2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1001 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1002 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1003 |
parent: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1004 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1005 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1006 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1007 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1008 |
diff -r d32277701ccb -r f5d8de11c2e2 c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1009 |
--- /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
|
1010 |
+++ 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
|
1011 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1012 |
+c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1013 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1014 |
changeset: 2:c3a4f03cc9a7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1015 |
parent: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1016 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1017 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1018 |
summary: commit on default |
|
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 |
diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1021 |
--- /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
|
1022 |
+++ 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
|
1023 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1024 |
+c |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1025 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1026 |
changeset: 1:d32277701ccb |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1027 |
branch: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1028 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1029 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1030 |
summary: commit on test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1031 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1032 |
diff -r 24427303d56f -r d32277701ccb b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1033 |
--- /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
|
1034 |
+++ 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
|
1035 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1036 |
+b |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1037 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1038 |
changeset: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1039 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1040 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1041 |
summary: commit on default |
|
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 |
diff -r 000000000000 -r 24427303d56f a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1044 |
--- /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
|
1045 |
+++ 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
|
1046 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1047 |
+a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1048 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1049 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1050 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1051 |
log -p -R repo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1052 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1053 |
$ cd dir |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1054 |
$ hg log -p -R .. ../a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1055 |
changeset: 0:24427303d56f |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1056 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1057 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1058 |
summary: commit on default |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1059 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1060 |
diff -r 000000000000 -r 24427303d56f a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1061 |
--- /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
|
1062 |
+++ 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
|
1063 |
@@ -0,0 +1,1 @@ |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1064 |
+a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1065 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1066 |
|
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1067 |
$ cd ../.. |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1068 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1069 |
$ hg init follow2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1070 |
$ cd follow2 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1071 |
|
|
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1072 |
# 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
|
1073 |
# 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
|
1074 |
# \ / |
|
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1075 |
# 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
|
1076 |
# \ / |
|
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1077 |
# o |
|
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1078 |
# |
|
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1079 |
# 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
|
1080 |
# "x" is a revision without "foo" |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1081 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1082 |
$ touch init |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1083 |
$ hg ci -A -m "init, unrelated" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1084 |
adding init |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1085 |
$ echo 'foo' > init |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1086 |
$ hg ci -m "change, unrelated" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1087 |
$ echo 'foo' > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1088 |
$ hg ci -A -m "add unrelated old foo" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1089 |
adding foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1090 |
$ hg rm foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1091 |
$ hg ci -m "delete foo, unrelated" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1092 |
$ echo 'related' > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1093 |
$ hg ci -A -m "add foo, related" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1094 |
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
|
1095 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1096 |
$ hg up 0 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1097 |
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
|
1098 |
$ touch branch |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1099 |
$ hg ci -A -m "first branch, unrelated" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1100 |
adding branch |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1101 |
created new head |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1102 |
$ touch foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1103 |
$ hg ci -A -m "create foo, related" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1104 |
adding foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1105 |
$ echo 'change' > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1106 |
$ hg ci -m "change foo, related" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1107 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1108 |
$ hg up 6 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1109 |
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
|
1110 |
$ echo 'change foo in branch' > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1111 |
$ hg ci -m "change foo in branch, related" |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1112 |
created new head |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1113 |
$ hg merge 7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1114 |
merging foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1115 |
warning: conflicts during merge. |
|
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15442
diff
changeset
|
1116 |
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1117 |
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
|
1118 |
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
|
1119 |
[1] |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1120 |
$ echo 'merge 1' > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1121 |
$ 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
|
1122 |
(no more unresolved files) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1123 |
$ hg ci -m "First merge, related" |
|
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 merge 4 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1126 |
merging foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1127 |
warning: conflicts during merge. |
|
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15442
diff
changeset
|
1128 |
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1129 |
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
|
1130 |
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
|
1131 |
[1] |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1132 |
$ echo 'merge 2' > foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1133 |
$ 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
|
1134 |
(no more unresolved files) |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1135 |
$ 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
|
1136 |
|
|
17181
6f71167292f2
log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents:
16923
diff
changeset
|
1137 |
$ hg log --graph |
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1138 |
@ changeset: 10:4dae8563d2c5 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1139 |
|\ tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1140 |
| | parent: 9:7b35701b003e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1141 |
| | parent: 4:88176d361b69 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1142 |
| | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1143 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1144 |
| | summary: Last merge, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1145 |
| | |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1146 |
| o changeset: 9:7b35701b003e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1147 |
| |\ parent: 8:e5416ad8a855 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1148 |
| | | parent: 7:87fe3144dcfa |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1149 |
| | | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1150 |
| | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1151 |
| | | summary: First merge, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1152 |
| | | |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1153 |
| | o changeset: 8:e5416ad8a855 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1154 |
| | | parent: 6:dc6c325fe5ee |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1155 |
| | | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1156 |
| | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1157 |
| | | summary: change foo in branch, related |
|
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 |
| o | changeset: 7:87fe3144dcfa |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1160 |
| |/ user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1161 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1162 |
| | summary: change foo, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1163 |
| | |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1164 |
| o changeset: 6:dc6c325fe5ee |
|
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: create foo, related |
|
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 |
| o changeset: 5:73db34516eb9 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1170 |
| | parent: 0:e87515fd044a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1171 |
| | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1172 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1173 |
| | summary: first branch, unrelated |
|
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 |
o | changeset: 4:88176d361b69 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1176 |
| | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1177 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1178 |
| | summary: add foo, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1179 |
| | |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1180 |
o | changeset: 3:dd78ae4afb56 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1181 |
| | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1182 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1183 |
| | summary: delete foo, unrelated |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1184 |
| | |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1185 |
o | changeset: 2:c4c64aedf0f7 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1186 |
| | user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1187 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1188 |
| | summary: add unrelated old foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1189 |
| | |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1190 |
o | changeset: 1:e5faa7440653 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1191 |
|/ user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1192 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1193 |
| summary: change, unrelated |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1194 |
| |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1195 |
o changeset: 0:e87515fd044a |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1196 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1197 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1198 |
summary: init, unrelated |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1199 |
|
|
11899
99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11631
diff
changeset
|
1200 |
|
|
11900
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1201 |
$ hg --traceback log -f foo |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1202 |
changeset: 10:4dae8563d2c5 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1203 |
tag: tip |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1204 |
parent: 9:7b35701b003e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1205 |
parent: 4:88176d361b69 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1206 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1207 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1208 |
summary: Last merge, related |
|
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 |
changeset: 9:7b35701b003e |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1211 |
parent: 8:e5416ad8a855 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1212 |
parent: 7:87fe3144dcfa |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1213 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1214 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1215 |
summary: First merge, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1216 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1217 |
changeset: 8:e5416ad8a855 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1218 |
parent: 6:dc6c325fe5ee |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1219 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1220 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1221 |
summary: change foo in branch, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1222 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1223 |
changeset: 7:87fe3144dcfa |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1224 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1225 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1226 |
summary: change foo, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1227 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1228 |
changeset: 6:dc6c325fe5ee |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1229 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1230 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1231 |
summary: create foo, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1232 |
|
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1233 |
changeset: 4:88176d361b69 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1234 |
user: test |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1235 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1236 |
summary: add foo, related |
|
cd7182358d9f
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11899
diff
changeset
|
1237 |
|
| 12383 | 1238 |
|
|
12972
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1239 |
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
|
1240 |
|
|
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1241 |
$ 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
|
1242 |
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
|
1243 |
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
|
1244 |
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
|
1245 |
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
|
1246 |
|
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1247 |
$ 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
|
1248 |
|
|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12383
diff
changeset
|
1249 |
Issue2383: hg log showing _less_ differences than hg diff |
| 12383 | 1250 |
|
1251 |
$ hg init issue2383 |
|
1252 |
$ cd issue2383 |
|
1253 |
||
1254 |
Create a test repo: |
|
1255 |
||
1256 |
$ echo a > a |
|
1257 |
$ hg ci -Am0 |
|
1258 |
adding a |
|
1259 |
$ echo b > b |
|
1260 |
$ hg ci -Am1 |
|
1261 |
adding b |
|
1262 |
$ hg co 0 |
|
1263 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1264 |
$ echo b > a |
|
1265 |
$ hg ci -m2 |
|
1266 |
created new head |
|
1267 |
||
1268 |
Merge: |
|
1269 |
||
1270 |
$ hg merge |
|
1271 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1272 |
(branch merge, don't forget to commit) |
|
1273 |
||
1274 |
Make sure there's a file listed in the merge to trigger the bug: |
|
1275 |
||
1276 |
$ echo c > a |
|
1277 |
$ hg ci -m3 |
|
1278 |
||
1279 |
Two files shown here in diff: |
|
1280 |
||
1281 |
$ hg diff --rev 2:3 |
|
1282 |
diff -r b09be438c43a -r 8e07aafe1edc a |
|
1283 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1284 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1285 |
@@ -1,1 +1,1 @@ |
|
1286 |
-b |
|
1287 |
+c |
|
1288 |
diff -r b09be438c43a -r 8e07aafe1edc b |
|
1289 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1290 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1291 |
@@ -0,0 +1,1 @@ |
|
1292 |
+b |
|
1293 |
||
1294 |
Diff here should be the same: |
|
1295 |
||
1296 |
$ hg log -vpr 3 |
|
1297 |
changeset: 3:8e07aafe1edc |
|
1298 |
tag: tip |
|
1299 |
parent: 2:b09be438c43a |
|
1300 |
parent: 1:925d80f479bb |
|
1301 |
user: test |
|
1302 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
1303 |
files: a |
|
1304 |
description: |
|
1305 |
3 |
|
1306 |
|
|
1307 |
|
|
1308 |
diff -r b09be438c43a -r 8e07aafe1edc a |
|
1309 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1310 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1311 |
@@ -1,1 +1,1 @@ |
|
1312 |
-b |
|
1313 |
+c |
|
1314 |
diff -r b09be438c43a -r 8e07aafe1edc b |
|
1315 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1316 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1317 |
@@ -0,0 +1,1 @@ |
|
1318 |
+b |
|
1319 |
|
|
1320 |
$ 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
|
1321 |
|
|
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1322 |
'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
|
1323 |
|
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16887
diff
changeset
|
1324 |
$ 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
|
1325 |
$ 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
|
1326 |
$ 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
|
1327 |
$ 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
|
1328 |
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
|
1329 |
$ 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
|
1330 |
$ 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
|
1331 |
|
|
7916a84c0758
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12942
diff
changeset
|
1332 |
$ 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
|
1333 |
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
|
1334 |
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
|
1335 |
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
|
1336 |
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
|
1337 |
|
|
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1338 |
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
|
1339 |
|
|
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1340 |
$ cat > ${TESTTMP}/obs.py << EOF |
|
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1341 |
> import mercurial.obsolete |
|
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1342 |
> mercurial.obsolete._enabled = True |
|
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1343 |
> EOF |
|
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1344 |
$ echo '[extensions]' >> $HGRCPATH |
|
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1345 |
$ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1346 |
|
|
14645
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1347 |
$ 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
|
1348 |
1:a765632148dc55d38c35c4f247c618701886cb2f |
|
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1349 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1350 |
$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1351 |
$ 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
|
1352 |
$ 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
|
1353 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1354 |
$ 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
|
1355 |
1:a765632148dc55d38c35c4f247c618701886cb2f |
|
e4cfdff6d3f4
log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
13889
diff
changeset
|
1356 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1357 |
$ hg log -r a |
|
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1358 |
abort: unknown revision 'a'! |
|
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19127
diff
changeset
|
1359 |
[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
|
1360 |
|
|
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1361 |
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
|
1362 |
|
|
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18250
diff
changeset
|
1363 |
$ 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
|
1364 |
$ 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
|
1365 |
1:a765632148dc55d38c35c4f247c618701886cb2f |
|
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1366 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1367 |
|
|
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1368 |
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
|
1369 |
|
|
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1370 |
$ 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
|
1371 |
$ 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
|
1372 |
1:a765632148dc55d38c35c4f247c618701886cb2f |
|
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1373 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
18494
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1374 |
$ hg debugsetparents 1 |
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1375 |
$ hg up -q null |
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1376 |
|
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1377 |
bookmarks prevent a changeset being hidden |
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1378 |
|
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1379 |
$ hg bookmark --hidden -r 1 X |
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1380 |
$ hg log --template '{rev}:{node}\n' |
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1381 |
1:a765632148dc55d38c35c4f247c618701886cb2f |
|
e945bcb87973
filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents:
18468
diff
changeset
|
1382 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1383 |
$ hg bookmark -d X |
|
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1384 |
|
|
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1385 |
divergent bookmarks are not hidden |
|
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1386 |
|
|
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1387 |
$ 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
|
1388 |
$ 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
|
1389 |
1:a765632148dc55d38c35c4f247c618701886cb2f |
|
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18494
diff
changeset
|
1390 |
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
18250
f54898526aad
hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18208
diff
changeset
|
1391 |
|
|
15725
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1392 |
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
|
1393 |
$ echo '[extensions]' >> $HGRCPATH |
|
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17781
diff
changeset
|
1394 |
$ 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
|
1395 |
$ cd .. |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1396 |
|
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1397 |
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
|
1398 |
# 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
|
1399 |
# 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
|
1400 |
# 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
|
1401 |
|
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1402 |
$ 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
|
1403 |
$ 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
|
1404 |
|
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1405 |
$ 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
|
1406 |
> 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
|
1407 |
> 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
|
1408 |
> 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
|
1409 |
> 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
|
1410 |
> 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
|
1411 |
> 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
|
1412 |
> 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
|
1413 |
> 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
|
1414 |
> 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
|
1415 |
> 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
|
1416 |
> '''.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
|
1417 |
> EOF |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1418 |
$ 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
|
1419 |
|
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1420 |
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
|
1421 |
$ 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
|
1422 |
> 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
|
1423 |
> 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
|
1424 |
> echo ==== |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1425 |
> 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
|
1426 |
> echo ==== |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1427 |
> 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
|
1428 |
> echo ==== |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1429 |
> 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
|
1430 |
> '''.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
|
1431 |
> EOF |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1432 |
$ 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
|
1433 |
0 |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1434 |
==== |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1435 |
1 |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1436 |
==== |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1437 |
2 |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1438 |
0 |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1439 |
==== |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1440 |
3 |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1441 |
1 |
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1442 |
|
|
988409e44a76
i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15623
diff
changeset
|
1443 |
$ cd .. |
|
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1444 |
|
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1445 |
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
|
1446 |
$ hg init issue1340 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1447 |
$ cd issue1340 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1448 |
$ 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
|
1449 |
$ echo 1 > d1/f1 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1450 |
$ echo 1 > D2/f1 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1451 |
$ echo 1 > D3.i/f1 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1452 |
$ echo 1 > d4.hg/f1 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1453 |
$ echo 1 > d5.d/f1 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1454 |
$ 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
|
1455 |
$ hg -q add . |
|
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1456 |
$ hg commit -m "a bunch of weird directories" |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1457 |
$ hg log -l1 d1/f1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1458 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1459 |
$ hg log -l1 f1 |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1460 |
$ hg log -l1 . | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1461 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1462 |
$ hg log -l1 ./ | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1463 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1464 |
$ hg log -l1 d1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1465 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1466 |
$ hg log -l1 D2 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1467 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1468 |
$ hg log -l1 D2/f1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1469 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1470 |
$ hg log -l1 D3.i | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1471 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1472 |
$ hg log -l1 D3.i/f1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1473 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1474 |
$ hg log -l1 d4.hg | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1475 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1476 |
$ hg log -l1 d4.hg/f1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1477 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1478 |
$ hg log -l1 d5.d | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1479 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1480 |
$ hg log -l1 d5.d/f1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1481 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1482 |
$ hg log -l1 .d6 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1483 |
changeset: 0:65624cd9070a |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1484 |
$ hg log -l1 .d6/f1 | grep changeset |
|
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1485 |
changeset: 0:65624cd9070a |
|
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1486 |
|
|
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1487 |
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
|
1488 |
|
|
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1489 |
$ 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
|
1490 |
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
|
1491 |
tag: tip |
|
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1492 |
user: test |
|
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
19471
diff
changeset
|
1493 |
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
|
1494 |
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
|
1495 |
|
|
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1496 |
changeset: -1:000000000000 |
|
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1497 |
user: |
|
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1498 |
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
|
1499 |
|
|
18468
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1500 |
$ hg log -r null:null |
|
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1501 |
changeset: -1:000000000000 |
|
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1502 |
user: |
|
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18466
diff
changeset
|
1503 |
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
|
1504 |
|
|
18466
ac0c12123743
log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents:
18340
diff
changeset
|
1505 |
|
|
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17207
diff
changeset
|
1506 |
$ cd .. |