Show More
@@ -1,2205 +1,2233 b'' | |||||
1 | Log on empty repository: checking consistency |
|
1 | Log on empty repository: checking consistency | |
2 |
|
2 | |||
3 | $ hg init empty |
|
3 | $ hg init empty | |
4 | $ cd empty |
|
4 | $ cd empty | |
5 | $ hg log |
|
5 | $ hg log | |
6 | $ hg log -r 1 |
|
6 | $ hg log -r 1 | |
7 | abort: unknown revision '1'! |
|
7 | abort: unknown revision '1'! | |
8 | [255] |
|
8 | [255] | |
9 | $ hg log -r -1:0 |
|
9 | $ hg log -r -1:0 | |
10 | abort: unknown revision '-1'! |
|
10 | abort: unknown revision '-1'! | |
11 | [255] |
|
11 | [255] | |
12 | $ hg log -r 'branch(name)' |
|
12 | $ hg log -r 'branch(name)' | |
13 | abort: unknown revision 'name'! |
|
13 | abort: unknown revision 'name'! | |
14 | [255] |
|
14 | [255] | |
15 | $ hg log -r null -q |
|
15 | $ hg log -r null -q | |
16 | -1:000000000000 |
|
16 | -1:000000000000 | |
17 |
|
17 | |||
18 | The g is crafted to have 2 filelog topological heads in a linear |
|
18 | The g is crafted to have 2 filelog topological heads in a linear | |
19 | changeset graph |
|
19 | changeset graph | |
20 |
|
20 | |||
21 | $ hg init a |
|
21 | $ hg init a | |
22 | $ cd a |
|
22 | $ cd a | |
23 | $ echo a > a |
|
23 | $ echo a > a | |
24 | $ echo f > f |
|
24 | $ echo f > f | |
25 | $ hg ci -Ama -d '1 0' |
|
25 | $ hg ci -Ama -d '1 0' | |
26 | adding a |
|
26 | adding a | |
27 | adding f |
|
27 | adding f | |
28 |
|
28 | |||
29 | $ hg cp a b |
|
29 | $ hg cp a b | |
30 | $ hg cp f g |
|
30 | $ hg cp f g | |
31 | $ hg ci -mb -d '2 0' |
|
31 | $ hg ci -mb -d '2 0' | |
32 |
|
32 | |||
33 | $ mkdir dir |
|
33 | $ mkdir dir | |
34 | $ hg mv b dir |
|
34 | $ hg mv b dir | |
35 | $ echo g >> g |
|
35 | $ echo g >> g | |
36 | $ echo f >> f |
|
36 | $ echo f >> f | |
37 | $ hg ci -mc -d '3 0' |
|
37 | $ hg ci -mc -d '3 0' | |
38 |
|
38 | |||
39 | $ hg mv a b |
|
39 | $ hg mv a b | |
40 | $ hg cp -f f g |
|
40 | $ hg cp -f f g | |
41 | $ echo a > d |
|
41 | $ echo a > d | |
42 | $ hg add d |
|
42 | $ hg add d | |
43 | $ hg ci -md -d '4 0' |
|
43 | $ hg ci -md -d '4 0' | |
44 |
|
44 | |||
45 | $ hg mv dir/b e |
|
45 | $ hg mv dir/b e | |
46 | $ hg ci -me -d '5 0' |
|
46 | $ hg ci -me -d '5 0' | |
47 |
|
47 | |||
48 | Make sure largefiles doesn't interfere with logging a regular file |
|
48 | Make sure largefiles doesn't interfere with logging a regular file | |
49 | $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles= |
|
49 | $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles= | |
50 | updated patterns: ['.hglf/a', 'a'] |
|
50 | updated patterns: ['.hglf/a', 'a'] | |
51 | 0: a |
|
51 | 0: a | |
52 | $ hg log a |
|
52 | $ hg log a | |
53 | changeset: 0:9161b9aeaf16 |
|
53 | changeset: 0:9161b9aeaf16 | |
54 | user: test |
|
54 | user: test | |
55 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
55 | date: Thu Jan 01 00:00:01 1970 +0000 | |
56 | summary: a |
|
56 | summary: a | |
57 |
|
57 | |||
58 | $ hg log glob:a* |
|
58 | $ hg log glob:a* | |
59 | changeset: 3:2ca5ba701980 |
|
59 | changeset: 3:2ca5ba701980 | |
60 | user: test |
|
60 | user: test | |
61 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
61 | date: Thu Jan 01 00:00:04 1970 +0000 | |
62 | summary: d |
|
62 | summary: d | |
63 |
|
63 | |||
64 | changeset: 0:9161b9aeaf16 |
|
64 | changeset: 0:9161b9aeaf16 | |
65 | user: test |
|
65 | user: test | |
66 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
66 | date: Thu Jan 01 00:00:01 1970 +0000 | |
67 | summary: a |
|
67 | summary: a | |
68 |
|
68 | |||
69 | $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles= |
|
69 | $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles= | |
70 | updated patterns: ['glob:.hglf/a*', 'glob:a*'] |
|
70 | updated patterns: ['glob:.hglf/a*', 'glob:a*'] | |
71 | 3: d |
|
71 | 3: d | |
72 | 0: a |
|
72 | 0: a | |
73 |
|
73 | |||
74 | log on directory |
|
74 | log on directory | |
75 |
|
75 | |||
76 | $ hg log dir |
|
76 | $ hg log dir | |
77 | changeset: 4:7e4639b4691b |
|
77 | changeset: 4:7e4639b4691b | |
78 | tag: tip |
|
78 | tag: tip | |
79 | user: test |
|
79 | user: test | |
80 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
80 | date: Thu Jan 01 00:00:05 1970 +0000 | |
81 | summary: e |
|
81 | summary: e | |
82 |
|
82 | |||
83 | changeset: 2:f8954cd4dc1f |
|
83 | changeset: 2:f8954cd4dc1f | |
84 | user: test |
|
84 | user: test | |
85 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
85 | date: Thu Jan 01 00:00:03 1970 +0000 | |
86 | summary: c |
|
86 | summary: c | |
87 |
|
87 | |||
88 | $ hg log somethingthatdoesntexist dir |
|
88 | $ hg log somethingthatdoesntexist dir | |
89 | changeset: 4:7e4639b4691b |
|
89 | changeset: 4:7e4639b4691b | |
90 | tag: tip |
|
90 | tag: tip | |
91 | user: test |
|
91 | user: test | |
92 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
92 | date: Thu Jan 01 00:00:05 1970 +0000 | |
93 | summary: e |
|
93 | summary: e | |
94 |
|
94 | |||
95 | changeset: 2:f8954cd4dc1f |
|
95 | changeset: 2:f8954cd4dc1f | |
96 | user: test |
|
96 | user: test | |
97 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
97 | date: Thu Jan 01 00:00:03 1970 +0000 | |
98 | summary: c |
|
98 | summary: c | |
99 |
|
99 | |||
100 |
|
100 | |||
101 | -f, non-existent directory |
|
101 | -f, non-existent directory | |
102 |
|
102 | |||
103 | $ hg log -f dir |
|
103 | $ hg log -f dir | |
104 | abort: cannot follow file not in parent revision: "dir" |
|
104 | abort: cannot follow file not in parent revision: "dir" | |
105 | [255] |
|
105 | [255] | |
106 |
|
106 | |||
107 | -f, directory |
|
107 | -f, directory | |
108 |
|
108 | |||
109 | $ hg up -q 3 |
|
109 | $ hg up -q 3 | |
110 | $ hg log -f dir |
|
110 | $ hg log -f dir | |
111 | changeset: 2:f8954cd4dc1f |
|
111 | changeset: 2:f8954cd4dc1f | |
112 | user: test |
|
112 | user: test | |
113 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
113 | date: Thu Jan 01 00:00:03 1970 +0000 | |
114 | summary: c |
|
114 | summary: c | |
115 |
|
115 | |||
116 | -f, directory with --patch |
|
116 | -f, directory with --patch | |
117 |
|
117 | |||
118 | $ hg log -f dir -p |
|
118 | $ hg log -f dir -p | |
119 | changeset: 2:f8954cd4dc1f |
|
119 | changeset: 2:f8954cd4dc1f | |
120 | user: test |
|
120 | user: test | |
121 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
121 | date: Thu Jan 01 00:00:03 1970 +0000 | |
122 | summary: c |
|
122 | summary: c | |
123 |
|
123 | |||
124 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
124 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
125 | --- /dev/null* (glob) |
|
125 | --- /dev/null* (glob) | |
126 | +++ b/dir/b* (glob) |
|
126 | +++ b/dir/b* (glob) | |
127 | @@ -0,0 +1,1 @@ |
|
127 | @@ -0,0 +1,1 @@ | |
128 | +a |
|
128 | +a | |
129 |
|
129 | |||
130 |
|
130 | |||
131 | -f, pattern |
|
131 | -f, pattern | |
132 |
|
132 | |||
133 | $ hg log -f -I 'dir**' -p |
|
133 | $ hg log -f -I 'dir**' -p | |
134 | changeset: 2:f8954cd4dc1f |
|
134 | changeset: 2:f8954cd4dc1f | |
135 | user: test |
|
135 | user: test | |
136 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
136 | date: Thu Jan 01 00:00:03 1970 +0000 | |
137 | summary: c |
|
137 | summary: c | |
138 |
|
138 | |||
139 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
139 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
140 | --- /dev/null* (glob) |
|
140 | --- /dev/null* (glob) | |
141 | +++ b/dir/b* (glob) |
|
141 | +++ b/dir/b* (glob) | |
142 | @@ -0,0 +1,1 @@ |
|
142 | @@ -0,0 +1,1 @@ | |
143 | +a |
|
143 | +a | |
144 |
|
144 | |||
145 | $ hg up -q 4 |
|
145 | $ hg up -q 4 | |
146 |
|
146 | |||
147 | -f, a wrong style |
|
147 | -f, a wrong style | |
148 |
|
148 | |||
149 | $ hg log -f -l1 --style something |
|
149 | $ hg log -f -l1 --style something | |
150 | abort: style 'something' not found |
|
150 | abort: style 'something' not found | |
151 | (available styles: bisect, changelog, compact, default, phases, status, xml) |
|
151 | (available styles: bisect, changelog, compact, default, phases, status, xml) | |
152 | [255] |
|
152 | [255] | |
153 |
|
153 | |||
154 | -f, phases style |
|
154 | -f, phases style | |
155 |
|
155 | |||
156 |
|
156 | |||
157 | $ hg log -f -l1 --style phases |
|
157 | $ hg log -f -l1 --style phases | |
158 | changeset: 4:7e4639b4691b |
|
158 | changeset: 4:7e4639b4691b | |
159 | tag: tip |
|
159 | tag: tip | |
160 | phase: draft |
|
160 | phase: draft | |
161 | user: test |
|
161 | user: test | |
162 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
162 | date: Thu Jan 01 00:00:05 1970 +0000 | |
163 | summary: e |
|
163 | summary: e | |
164 |
|
164 | |||
165 |
|
165 | |||
166 | $ hg log -f -l1 --style phases -q |
|
166 | $ hg log -f -l1 --style phases -q | |
167 | 4:7e4639b4691b |
|
167 | 4:7e4639b4691b | |
168 |
|
168 | |||
169 | -f, but no args |
|
169 | -f, but no args | |
170 |
|
170 | |||
171 | $ hg log -f |
|
171 | $ hg log -f | |
172 | changeset: 4:7e4639b4691b |
|
172 | changeset: 4:7e4639b4691b | |
173 | tag: tip |
|
173 | tag: tip | |
174 | user: test |
|
174 | user: test | |
175 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
175 | date: Thu Jan 01 00:00:05 1970 +0000 | |
176 | summary: e |
|
176 | summary: e | |
177 |
|
177 | |||
178 | changeset: 3:2ca5ba701980 |
|
178 | changeset: 3:2ca5ba701980 | |
179 | user: test |
|
179 | user: test | |
180 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
180 | date: Thu Jan 01 00:00:04 1970 +0000 | |
181 | summary: d |
|
181 | summary: d | |
182 |
|
182 | |||
183 | changeset: 2:f8954cd4dc1f |
|
183 | changeset: 2:f8954cd4dc1f | |
184 | user: test |
|
184 | user: test | |
185 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
185 | date: Thu Jan 01 00:00:03 1970 +0000 | |
186 | summary: c |
|
186 | summary: c | |
187 |
|
187 | |||
188 | changeset: 1:d89b0a12d229 |
|
188 | changeset: 1:d89b0a12d229 | |
189 | user: test |
|
189 | user: test | |
190 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
190 | date: Thu Jan 01 00:00:02 1970 +0000 | |
191 | summary: b |
|
191 | summary: b | |
192 |
|
192 | |||
193 | changeset: 0:9161b9aeaf16 |
|
193 | changeset: 0:9161b9aeaf16 | |
194 | user: test |
|
194 | user: test | |
195 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
195 | date: Thu Jan 01 00:00:01 1970 +0000 | |
196 | summary: a |
|
196 | summary: a | |
197 |
|
197 | |||
198 |
|
198 | |||
199 | one rename |
|
199 | one rename | |
200 |
|
200 | |||
201 | $ hg up -q 2 |
|
201 | $ hg up -q 2 | |
202 | $ hg log -vf a |
|
202 | $ hg log -vf a | |
203 | changeset: 0:9161b9aeaf16 |
|
203 | changeset: 0:9161b9aeaf16 | |
204 | user: test |
|
204 | user: test | |
205 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
205 | date: Thu Jan 01 00:00:01 1970 +0000 | |
206 | files: a f |
|
206 | files: a f | |
207 | description: |
|
207 | description: | |
208 | a |
|
208 | a | |
209 |
|
209 | |||
210 |
|
210 | |||
211 |
|
211 | |||
212 | many renames |
|
212 | many renames | |
213 |
|
213 | |||
214 | $ hg up -q tip |
|
214 | $ hg up -q tip | |
215 | $ hg log -vf e |
|
215 | $ hg log -vf e | |
216 | changeset: 4:7e4639b4691b |
|
216 | changeset: 4:7e4639b4691b | |
217 | tag: tip |
|
217 | tag: tip | |
218 | user: test |
|
218 | user: test | |
219 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
219 | date: Thu Jan 01 00:00:05 1970 +0000 | |
220 | files: dir/b e |
|
220 | files: dir/b e | |
221 | description: |
|
221 | description: | |
222 | e |
|
222 | e | |
223 |
|
223 | |||
224 |
|
224 | |||
225 | changeset: 2:f8954cd4dc1f |
|
225 | changeset: 2:f8954cd4dc1f | |
226 | user: test |
|
226 | user: test | |
227 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
227 | date: Thu Jan 01 00:00:03 1970 +0000 | |
228 | files: b dir/b f g |
|
228 | files: b dir/b f g | |
229 | description: |
|
229 | description: | |
230 | c |
|
230 | c | |
231 |
|
231 | |||
232 |
|
232 | |||
233 | changeset: 1:d89b0a12d229 |
|
233 | changeset: 1:d89b0a12d229 | |
234 | user: test |
|
234 | user: test | |
235 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
235 | date: Thu Jan 01 00:00:02 1970 +0000 | |
236 | files: b g |
|
236 | files: b g | |
237 | description: |
|
237 | description: | |
238 | b |
|
238 | b | |
239 |
|
239 | |||
240 |
|
240 | |||
241 | changeset: 0:9161b9aeaf16 |
|
241 | changeset: 0:9161b9aeaf16 | |
242 | user: test |
|
242 | user: test | |
243 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
243 | date: Thu Jan 01 00:00:01 1970 +0000 | |
244 | files: a f |
|
244 | files: a f | |
245 | description: |
|
245 | description: | |
246 | a |
|
246 | a | |
247 |
|
247 | |||
248 |
|
248 | |||
249 |
|
249 | |||
250 |
|
250 | |||
251 | log -pf dir/b |
|
251 | log -pf dir/b | |
252 |
|
252 | |||
253 | $ hg up -q 3 |
|
253 | $ hg up -q 3 | |
254 | $ hg log -pf dir/b |
|
254 | $ hg log -pf dir/b | |
255 | changeset: 2:f8954cd4dc1f |
|
255 | changeset: 2:f8954cd4dc1f | |
256 | user: test |
|
256 | user: test | |
257 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
257 | date: Thu Jan 01 00:00:03 1970 +0000 | |
258 | summary: c |
|
258 | summary: c | |
259 |
|
259 | |||
260 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
260 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
261 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
261 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
262 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
262 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
263 | @@ -0,0 +1,1 @@ |
|
263 | @@ -0,0 +1,1 @@ | |
264 | +a |
|
264 | +a | |
265 |
|
265 | |||
266 | changeset: 1:d89b0a12d229 |
|
266 | changeset: 1:d89b0a12d229 | |
267 | user: test |
|
267 | user: test | |
268 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
268 | date: Thu Jan 01 00:00:02 1970 +0000 | |
269 | summary: b |
|
269 | summary: b | |
270 |
|
270 | |||
271 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
271 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
272 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
272 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
273 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
273 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
274 | @@ -0,0 +1,1 @@ |
|
274 | @@ -0,0 +1,1 @@ | |
275 | +a |
|
275 | +a | |
276 |
|
276 | |||
277 | changeset: 0:9161b9aeaf16 |
|
277 | changeset: 0:9161b9aeaf16 | |
278 | user: test |
|
278 | user: test | |
279 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
279 | date: Thu Jan 01 00:00:01 1970 +0000 | |
280 | summary: a |
|
280 | summary: a | |
281 |
|
281 | |||
282 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
282 | diff -r 000000000000 -r 9161b9aeaf16 a | |
283 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
283 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
284 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
284 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
285 | @@ -0,0 +1,1 @@ |
|
285 | @@ -0,0 +1,1 @@ | |
286 | +a |
|
286 | +a | |
287 |
|
287 | |||
288 |
|
288 | |||
289 | log -pf b inside dir |
|
289 | log -pf b inside dir | |
290 |
|
290 | |||
291 | $ hg --cwd=dir log -pf b |
|
291 | $ hg --cwd=dir log -pf b | |
292 | changeset: 2:f8954cd4dc1f |
|
292 | changeset: 2:f8954cd4dc1f | |
293 | user: test |
|
293 | user: test | |
294 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
294 | date: Thu Jan 01 00:00:03 1970 +0000 | |
295 | summary: c |
|
295 | summary: c | |
296 |
|
296 | |||
297 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
297 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
298 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
298 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
299 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
299 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
300 | @@ -0,0 +1,1 @@ |
|
300 | @@ -0,0 +1,1 @@ | |
301 | +a |
|
301 | +a | |
302 |
|
302 | |||
303 | changeset: 1:d89b0a12d229 |
|
303 | changeset: 1:d89b0a12d229 | |
304 | user: test |
|
304 | user: test | |
305 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
305 | date: Thu Jan 01 00:00:02 1970 +0000 | |
306 | summary: b |
|
306 | summary: b | |
307 |
|
307 | |||
308 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
308 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
309 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
309 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
310 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
310 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
311 | @@ -0,0 +1,1 @@ |
|
311 | @@ -0,0 +1,1 @@ | |
312 | +a |
|
312 | +a | |
313 |
|
313 | |||
314 | changeset: 0:9161b9aeaf16 |
|
314 | changeset: 0:9161b9aeaf16 | |
315 | user: test |
|
315 | user: test | |
316 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
316 | date: Thu Jan 01 00:00:01 1970 +0000 | |
317 | summary: a |
|
317 | summary: a | |
318 |
|
318 | |||
319 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
319 | diff -r 000000000000 -r 9161b9aeaf16 a | |
320 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
320 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
321 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
321 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
322 | @@ -0,0 +1,1 @@ |
|
322 | @@ -0,0 +1,1 @@ | |
323 | +a |
|
323 | +a | |
324 |
|
324 | |||
325 |
|
325 | |||
326 | log -pf, but no args |
|
326 | log -pf, but no args | |
327 |
|
327 | |||
328 | $ hg log -pf |
|
328 | $ hg log -pf | |
329 | changeset: 3:2ca5ba701980 |
|
329 | changeset: 3:2ca5ba701980 | |
330 | user: test |
|
330 | user: test | |
331 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
331 | date: Thu Jan 01 00:00:04 1970 +0000 | |
332 | summary: d |
|
332 | summary: d | |
333 |
|
333 | |||
334 | diff -r f8954cd4dc1f -r 2ca5ba701980 a |
|
334 | diff -r f8954cd4dc1f -r 2ca5ba701980 a | |
335 | --- a/a Thu Jan 01 00:00:03 1970 +0000 |
|
335 | --- a/a Thu Jan 01 00:00:03 1970 +0000 | |
336 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
336 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
337 | @@ -1,1 +0,0 @@ |
|
337 | @@ -1,1 +0,0 @@ | |
338 | -a |
|
338 | -a | |
339 | diff -r f8954cd4dc1f -r 2ca5ba701980 b |
|
339 | diff -r f8954cd4dc1f -r 2ca5ba701980 b | |
340 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
340 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
341 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 |
|
341 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 | |
342 | @@ -0,0 +1,1 @@ |
|
342 | @@ -0,0 +1,1 @@ | |
343 | +a |
|
343 | +a | |
344 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
344 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
345 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
345 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
346 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
346 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
347 | @@ -0,0 +1,1 @@ |
|
347 | @@ -0,0 +1,1 @@ | |
348 | +a |
|
348 | +a | |
349 | diff -r f8954cd4dc1f -r 2ca5ba701980 g |
|
349 | diff -r f8954cd4dc1f -r 2ca5ba701980 g | |
350 | --- a/g Thu Jan 01 00:00:03 1970 +0000 |
|
350 | --- a/g Thu Jan 01 00:00:03 1970 +0000 | |
351 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
|
351 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 | |
352 | @@ -1,2 +1,2 @@ |
|
352 | @@ -1,2 +1,2 @@ | |
353 | f |
|
353 | f | |
354 | -g |
|
354 | -g | |
355 | +f |
|
355 | +f | |
356 |
|
356 | |||
357 | changeset: 2:f8954cd4dc1f |
|
357 | changeset: 2:f8954cd4dc1f | |
358 | user: test |
|
358 | user: test | |
359 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
359 | date: Thu Jan 01 00:00:03 1970 +0000 | |
360 | summary: c |
|
360 | summary: c | |
361 |
|
361 | |||
362 | diff -r d89b0a12d229 -r f8954cd4dc1f b |
|
362 | diff -r d89b0a12d229 -r f8954cd4dc1f b | |
363 | --- a/b Thu Jan 01 00:00:02 1970 +0000 |
|
363 | --- a/b Thu Jan 01 00:00:02 1970 +0000 | |
364 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
364 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
365 | @@ -1,1 +0,0 @@ |
|
365 | @@ -1,1 +0,0 @@ | |
366 | -a |
|
366 | -a | |
367 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
367 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
368 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
368 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
369 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
369 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
370 | @@ -0,0 +1,1 @@ |
|
370 | @@ -0,0 +1,1 @@ | |
371 | +a |
|
371 | +a | |
372 | diff -r d89b0a12d229 -r f8954cd4dc1f f |
|
372 | diff -r d89b0a12d229 -r f8954cd4dc1f f | |
373 | --- a/f Thu Jan 01 00:00:02 1970 +0000 |
|
373 | --- a/f Thu Jan 01 00:00:02 1970 +0000 | |
374 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
|
374 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 | |
375 | @@ -1,1 +1,2 @@ |
|
375 | @@ -1,1 +1,2 @@ | |
376 | f |
|
376 | f | |
377 | +f |
|
377 | +f | |
378 | diff -r d89b0a12d229 -r f8954cd4dc1f g |
|
378 | diff -r d89b0a12d229 -r f8954cd4dc1f g | |
379 | --- a/g Thu Jan 01 00:00:02 1970 +0000 |
|
379 | --- a/g Thu Jan 01 00:00:02 1970 +0000 | |
380 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 |
|
380 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 | |
381 | @@ -1,1 +1,2 @@ |
|
381 | @@ -1,1 +1,2 @@ | |
382 | f |
|
382 | f | |
383 | +g |
|
383 | +g | |
384 |
|
384 | |||
385 | changeset: 1:d89b0a12d229 |
|
385 | changeset: 1:d89b0a12d229 | |
386 | user: test |
|
386 | user: test | |
387 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
387 | date: Thu Jan 01 00:00:02 1970 +0000 | |
388 | summary: b |
|
388 | summary: b | |
389 |
|
389 | |||
390 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
390 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
391 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
391 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
392 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
392 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
393 | @@ -0,0 +1,1 @@ |
|
393 | @@ -0,0 +1,1 @@ | |
394 | +a |
|
394 | +a | |
395 | diff -r 9161b9aeaf16 -r d89b0a12d229 g |
|
395 | diff -r 9161b9aeaf16 -r d89b0a12d229 g | |
396 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
396 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
397 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 |
|
397 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 | |
398 | @@ -0,0 +1,1 @@ |
|
398 | @@ -0,0 +1,1 @@ | |
399 | +f |
|
399 | +f | |
400 |
|
400 | |||
401 | changeset: 0:9161b9aeaf16 |
|
401 | changeset: 0:9161b9aeaf16 | |
402 | user: test |
|
402 | user: test | |
403 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
403 | date: Thu Jan 01 00:00:01 1970 +0000 | |
404 | summary: a |
|
404 | summary: a | |
405 |
|
405 | |||
406 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
406 | diff -r 000000000000 -r 9161b9aeaf16 a | |
407 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
407 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
408 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
408 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
409 | @@ -0,0 +1,1 @@ |
|
409 | @@ -0,0 +1,1 @@ | |
410 | +a |
|
410 | +a | |
411 | diff -r 000000000000 -r 9161b9aeaf16 f |
|
411 | diff -r 000000000000 -r 9161b9aeaf16 f | |
412 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
412 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
413 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
|
413 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 | |
414 | @@ -0,0 +1,1 @@ |
|
414 | @@ -0,0 +1,1 @@ | |
415 | +f |
|
415 | +f | |
416 |
|
416 | |||
417 |
|
417 | |||
418 | log -vf dir/b |
|
418 | log -vf dir/b | |
419 |
|
419 | |||
420 | $ hg log -vf dir/b |
|
420 | $ hg log -vf dir/b | |
421 | changeset: 2:f8954cd4dc1f |
|
421 | changeset: 2:f8954cd4dc1f | |
422 | user: test |
|
422 | user: test | |
423 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
423 | date: Thu Jan 01 00:00:03 1970 +0000 | |
424 | files: b dir/b f g |
|
424 | files: b dir/b f g | |
425 | description: |
|
425 | description: | |
426 | c |
|
426 | c | |
427 |
|
427 | |||
428 |
|
428 | |||
429 | changeset: 1:d89b0a12d229 |
|
429 | changeset: 1:d89b0a12d229 | |
430 | user: test |
|
430 | user: test | |
431 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
431 | date: Thu Jan 01 00:00:02 1970 +0000 | |
432 | files: b g |
|
432 | files: b g | |
433 | description: |
|
433 | description: | |
434 | b |
|
434 | b | |
435 |
|
435 | |||
436 |
|
436 | |||
437 | changeset: 0:9161b9aeaf16 |
|
437 | changeset: 0:9161b9aeaf16 | |
438 | user: test |
|
438 | user: test | |
439 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
439 | date: Thu Jan 01 00:00:01 1970 +0000 | |
440 | files: a f |
|
440 | files: a f | |
441 | description: |
|
441 | description: | |
442 | a |
|
442 | a | |
443 |
|
443 | |||
444 |
|
444 | |||
445 |
|
445 | |||
446 |
|
446 | |||
447 | -f and multiple filelog heads |
|
447 | -f and multiple filelog heads | |
448 |
|
448 | |||
449 | $ hg up -q 2 |
|
449 | $ hg up -q 2 | |
450 | $ hg log -f g --template '{rev}\n' |
|
450 | $ hg log -f g --template '{rev}\n' | |
451 | 2 |
|
451 | 2 | |
452 | 1 |
|
452 | 1 | |
453 | 0 |
|
453 | 0 | |
454 | $ hg up -q tip |
|
454 | $ hg up -q tip | |
455 | $ hg log -f g --template '{rev}\n' |
|
455 | $ hg log -f g --template '{rev}\n' | |
456 | 3 |
|
456 | 3 | |
457 | 2 |
|
457 | 2 | |
458 | 0 |
|
458 | 0 | |
459 |
|
459 | |||
460 |
|
460 | |||
461 | log copies with --copies |
|
461 | log copies with --copies | |
462 |
|
462 | |||
463 | $ hg log -vC --template '{rev} {file_copies}\n' |
|
463 | $ hg log -vC --template '{rev} {file_copies}\n' | |
464 | 4 e (dir/b) |
|
464 | 4 e (dir/b) | |
465 | 3 b (a)g (f) |
|
465 | 3 b (a)g (f) | |
466 | 2 dir/b (b) |
|
466 | 2 dir/b (b) | |
467 | 1 b (a)g (f) |
|
467 | 1 b (a)g (f) | |
468 | 0 |
|
468 | 0 | |
469 |
|
469 | |||
470 | log copies switch without --copies, with old filecopy template |
|
470 | log copies switch without --copies, with old filecopy template | |
471 |
|
471 | |||
472 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
472 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' | |
473 | 4 |
|
473 | 4 | |
474 | 3 |
|
474 | 3 | |
475 | 2 |
|
475 | 2 | |
476 | 1 |
|
476 | 1 | |
477 | 0 |
|
477 | 0 | |
478 |
|
478 | |||
479 | log copies switch with --copies |
|
479 | log copies switch with --copies | |
480 |
|
480 | |||
481 | $ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
481 | $ hg log -vC --template '{rev} {file_copies_switch}\n' | |
482 | 4 e (dir/b) |
|
482 | 4 e (dir/b) | |
483 | 3 b (a)g (f) |
|
483 | 3 b (a)g (f) | |
484 | 2 dir/b (b) |
|
484 | 2 dir/b (b) | |
485 | 1 b (a)g (f) |
|
485 | 1 b (a)g (f) | |
486 | 0 |
|
486 | 0 | |
487 |
|
487 | |||
488 |
|
488 | |||
489 | log copies with hardcoded style and with --style=default |
|
489 | log copies with hardcoded style and with --style=default | |
490 |
|
490 | |||
491 | $ hg log -vC -r4 |
|
491 | $ hg log -vC -r4 | |
492 | changeset: 4:7e4639b4691b |
|
492 | changeset: 4:7e4639b4691b | |
493 | tag: tip |
|
493 | tag: tip | |
494 | user: test |
|
494 | user: test | |
495 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
495 | date: Thu Jan 01 00:00:05 1970 +0000 | |
496 | files: dir/b e |
|
496 | files: dir/b e | |
497 | copies: e (dir/b) |
|
497 | copies: e (dir/b) | |
498 | description: |
|
498 | description: | |
499 | e |
|
499 | e | |
500 |
|
500 | |||
501 |
|
501 | |||
502 | $ hg log -vC -r4 --style=default |
|
502 | $ hg log -vC -r4 --style=default | |
503 | changeset: 4:7e4639b4691b |
|
503 | changeset: 4:7e4639b4691b | |
504 | tag: tip |
|
504 | tag: tip | |
505 | user: test |
|
505 | user: test | |
506 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
506 | date: Thu Jan 01 00:00:05 1970 +0000 | |
507 | files: dir/b e |
|
507 | files: dir/b e | |
508 | copies: e (dir/b) |
|
508 | copies: e (dir/b) | |
509 | description: |
|
509 | description: | |
510 | e |
|
510 | e | |
511 |
|
511 | |||
512 |
|
512 | |||
513 | $ hg log -vC -r4 -Tjson |
|
513 | $ hg log -vC -r4 -Tjson | |
514 | [ |
|
514 | [ | |
515 | { |
|
515 | { | |
516 | "rev": 4, |
|
516 | "rev": 4, | |
517 | "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", |
|
517 | "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", | |
518 | "branch": "default", |
|
518 | "branch": "default", | |
519 | "phase": "draft", |
|
519 | "phase": "draft", | |
520 | "user": "test", |
|
520 | "user": "test", | |
521 | "date": [5, 0], |
|
521 | "date": [5, 0], | |
522 | "desc": "e", |
|
522 | "desc": "e", | |
523 | "bookmarks": [], |
|
523 | "bookmarks": [], | |
524 | "tags": ["tip"], |
|
524 | "tags": ["tip"], | |
525 | "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], |
|
525 | "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], | |
526 | "files": ["dir/b", "e"], |
|
526 | "files": ["dir/b", "e"], | |
527 | "copies": {"e": "dir/b"} |
|
527 | "copies": {"e": "dir/b"} | |
528 | } |
|
528 | } | |
529 | ] |
|
529 | ] | |
530 |
|
530 | |||
531 | log copies, non-linear manifest |
|
531 | log copies, non-linear manifest | |
532 |
|
532 | |||
533 | $ hg up -C 3 |
|
533 | $ hg up -C 3 | |
534 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
534 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
535 | $ hg mv dir/b e |
|
535 | $ hg mv dir/b e | |
536 | $ echo foo > foo |
|
536 | $ echo foo > foo | |
537 | $ hg ci -Ame2 -d '6 0' |
|
537 | $ hg ci -Ame2 -d '6 0' | |
538 | adding foo |
|
538 | adding foo | |
539 | created new head |
|
539 | created new head | |
540 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
540 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 | |
541 | 5 e (dir/b) |
|
541 | 5 e (dir/b) | |
542 |
|
542 | |||
543 |
|
543 | |||
544 | log copies, execute bit set |
|
544 | log copies, execute bit set | |
545 |
|
545 | |||
546 | #if execbit |
|
546 | #if execbit | |
547 | $ chmod +x e |
|
547 | $ chmod +x e | |
548 | $ hg ci -me3 -d '7 0' |
|
548 | $ hg ci -me3 -d '7 0' | |
549 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
549 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 | |
550 | 6 |
|
550 | 6 | |
551 | #endif |
|
551 | #endif | |
552 |
|
552 | |||
553 |
|
553 | |||
554 | log -p d |
|
554 | log -p d | |
555 |
|
555 | |||
556 | $ hg log -pv d |
|
556 | $ hg log -pv d | |
557 | changeset: 3:2ca5ba701980 |
|
557 | changeset: 3:2ca5ba701980 | |
558 | user: test |
|
558 | user: test | |
559 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
559 | date: Thu Jan 01 00:00:04 1970 +0000 | |
560 | files: a b d g |
|
560 | files: a b d g | |
561 | description: |
|
561 | description: | |
562 | d |
|
562 | d | |
563 |
|
563 | |||
564 |
|
564 | |||
565 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
565 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
566 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
566 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
567 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
567 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
568 | @@ -0,0 +1,1 @@ |
|
568 | @@ -0,0 +1,1 @@ | |
569 | +a |
|
569 | +a | |
570 |
|
570 | |||
571 |
|
571 | |||
572 |
|
572 | |||
573 | log --removed file |
|
573 | log --removed file | |
574 |
|
574 | |||
575 | $ hg log --removed -v a |
|
575 | $ hg log --removed -v a | |
576 | changeset: 3:2ca5ba701980 |
|
576 | changeset: 3:2ca5ba701980 | |
577 | user: test |
|
577 | user: test | |
578 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
578 | date: Thu Jan 01 00:00:04 1970 +0000 | |
579 | files: a b d g |
|
579 | files: a b d g | |
580 | description: |
|
580 | description: | |
581 | d |
|
581 | d | |
582 |
|
582 | |||
583 |
|
583 | |||
584 | changeset: 0:9161b9aeaf16 |
|
584 | changeset: 0:9161b9aeaf16 | |
585 | user: test |
|
585 | user: test | |
586 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
586 | date: Thu Jan 01 00:00:01 1970 +0000 | |
587 | files: a f |
|
587 | files: a f | |
588 | description: |
|
588 | description: | |
589 | a |
|
589 | a | |
590 |
|
590 | |||
591 |
|
591 | |||
592 |
|
592 | |||
593 | log --removed revrange file |
|
593 | log --removed revrange file | |
594 |
|
594 | |||
595 | $ hg log --removed -v -r0:2 a |
|
595 | $ hg log --removed -v -r0:2 a | |
596 | changeset: 0:9161b9aeaf16 |
|
596 | changeset: 0:9161b9aeaf16 | |
597 | user: test |
|
597 | user: test | |
598 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
598 | date: Thu Jan 01 00:00:01 1970 +0000 | |
599 | files: a f |
|
599 | files: a f | |
600 | description: |
|
600 | description: | |
601 | a |
|
601 | a | |
602 |
|
602 | |||
603 |
|
603 | |||
604 | $ cd .. |
|
604 | $ cd .. | |
605 |
|
605 | |||
606 | log --follow tests |
|
606 | log --follow tests | |
607 |
|
607 | |||
608 | $ hg init follow |
|
608 | $ hg init follow | |
609 | $ cd follow |
|
609 | $ cd follow | |
610 |
|
610 | |||
611 | $ echo base > base |
|
611 | $ echo base > base | |
612 | $ hg ci -Ambase -d '1 0' |
|
612 | $ hg ci -Ambase -d '1 0' | |
613 | adding base |
|
613 | adding base | |
614 |
|
614 | |||
615 | $ echo r1 >> base |
|
615 | $ echo r1 >> base | |
616 | $ hg ci -Amr1 -d '1 0' |
|
616 | $ hg ci -Amr1 -d '1 0' | |
617 | $ echo r2 >> base |
|
617 | $ echo r2 >> base | |
618 | $ hg ci -Amr2 -d '1 0' |
|
618 | $ hg ci -Amr2 -d '1 0' | |
619 |
|
619 | |||
620 | $ hg up -C 1 |
|
620 | $ hg up -C 1 | |
621 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
621 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
622 | $ echo b1 > b1 |
|
622 | $ echo b1 > b1 | |
623 |
|
623 | |||
624 | log -r "follow('set:clean()')" |
|
624 | log -r "follow('set:clean()')" | |
625 |
|
625 | |||
626 | $ hg log -r "follow('set:clean()')" |
|
626 | $ hg log -r "follow('set:clean()')" | |
627 | changeset: 0:67e992f2c4f3 |
|
627 | changeset: 0:67e992f2c4f3 | |
628 | user: test |
|
628 | user: test | |
629 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
629 | date: Thu Jan 01 00:00:01 1970 +0000 | |
630 | summary: base |
|
630 | summary: base | |
631 |
|
631 | |||
632 | changeset: 1:3d5bf5654eda |
|
632 | changeset: 1:3d5bf5654eda | |
633 | user: test |
|
633 | user: test | |
634 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
634 | date: Thu Jan 01 00:00:01 1970 +0000 | |
635 | summary: r1 |
|
635 | summary: r1 | |
636 |
|
636 | |||
637 |
|
637 | |||
638 | $ hg ci -Amb1 -d '1 0' |
|
638 | $ hg ci -Amb1 -d '1 0' | |
639 | adding b1 |
|
639 | adding b1 | |
640 | created new head |
|
640 | created new head | |
641 |
|
641 | |||
642 |
|
642 | |||
643 | log -f |
|
643 | log -f | |
644 |
|
644 | |||
645 | $ hg log -f |
|
645 | $ hg log -f | |
646 | changeset: 3:e62f78d544b4 |
|
646 | changeset: 3:e62f78d544b4 | |
647 | tag: tip |
|
647 | tag: tip | |
648 | parent: 1:3d5bf5654eda |
|
648 | parent: 1:3d5bf5654eda | |
649 | user: test |
|
649 | user: test | |
650 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
650 | date: Thu Jan 01 00:00:01 1970 +0000 | |
651 | summary: b1 |
|
651 | summary: b1 | |
652 |
|
652 | |||
653 | changeset: 1:3d5bf5654eda |
|
653 | changeset: 1:3d5bf5654eda | |
654 | user: test |
|
654 | user: test | |
655 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
655 | date: Thu Jan 01 00:00:01 1970 +0000 | |
656 | summary: r1 |
|
656 | summary: r1 | |
657 |
|
657 | |||
658 | changeset: 0:67e992f2c4f3 |
|
658 | changeset: 0:67e992f2c4f3 | |
659 | user: test |
|
659 | user: test | |
660 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
660 | date: Thu Jan 01 00:00:01 1970 +0000 | |
661 | summary: base |
|
661 | summary: base | |
662 |
|
662 | |||
663 |
|
663 | |||
664 | log -r follow('glob:b*') |
|
664 | log -r follow('glob:b*') | |
665 |
|
665 | |||
666 | $ hg log -r "follow('glob:b*')" |
|
666 | $ hg log -r "follow('glob:b*')" | |
667 | changeset: 0:67e992f2c4f3 |
|
667 | changeset: 0:67e992f2c4f3 | |
668 | user: test |
|
668 | user: test | |
669 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
669 | date: Thu Jan 01 00:00:01 1970 +0000 | |
670 | summary: base |
|
670 | summary: base | |
671 |
|
671 | |||
672 | changeset: 1:3d5bf5654eda |
|
672 | changeset: 1:3d5bf5654eda | |
673 | user: test |
|
673 | user: test | |
674 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
674 | date: Thu Jan 01 00:00:01 1970 +0000 | |
675 | summary: r1 |
|
675 | summary: r1 | |
676 |
|
676 | |||
677 | changeset: 3:e62f78d544b4 |
|
677 | changeset: 3:e62f78d544b4 | |
678 | tag: tip |
|
678 | tag: tip | |
679 | parent: 1:3d5bf5654eda |
|
679 | parent: 1:3d5bf5654eda | |
680 | user: test |
|
680 | user: test | |
681 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
681 | date: Thu Jan 01 00:00:01 1970 +0000 | |
682 | summary: b1 |
|
682 | summary: b1 | |
683 |
|
683 | |||
684 | log -f -r '1 + 4' |
|
684 | log -f -r '1 + 4' | |
685 |
|
685 | |||
686 | $ hg up -C 0 |
|
686 | $ hg up -C 0 | |
687 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
687 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
688 | $ echo b2 > b2 |
|
688 | $ echo b2 > b2 | |
689 | $ hg ci -Amb2 -d '1 0' |
|
689 | $ hg ci -Amb2 -d '1 0' | |
690 | adding b2 |
|
690 | adding b2 | |
691 | created new head |
|
691 | created new head | |
692 | $ hg log -f -r '1 + 4' |
|
692 | $ hg log -f -r '1 + 4' | |
693 | changeset: 4:ddb82e70d1a1 |
|
693 | changeset: 4:ddb82e70d1a1 | |
694 | tag: tip |
|
694 | tag: tip | |
695 | parent: 0:67e992f2c4f3 |
|
695 | parent: 0:67e992f2c4f3 | |
696 | user: test |
|
696 | user: test | |
697 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
697 | date: Thu Jan 01 00:00:01 1970 +0000 | |
698 | summary: b2 |
|
698 | summary: b2 | |
699 |
|
699 | |||
700 | changeset: 1:3d5bf5654eda |
|
700 | changeset: 1:3d5bf5654eda | |
701 | user: test |
|
701 | user: test | |
702 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
702 | date: Thu Jan 01 00:00:01 1970 +0000 | |
703 | summary: r1 |
|
703 | summary: r1 | |
704 |
|
704 | |||
705 | changeset: 0:67e992f2c4f3 |
|
705 | changeset: 0:67e992f2c4f3 | |
706 | user: test |
|
706 | user: test | |
707 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
707 | date: Thu Jan 01 00:00:01 1970 +0000 | |
708 | summary: base |
|
708 | summary: base | |
709 |
|
709 | |||
710 | log -r "follow('set:grep(b2)')" |
|
710 | log -r "follow('set:grep(b2)')" | |
711 |
|
711 | |||
712 | $ hg log -r "follow('set:grep(b2)')" |
|
712 | $ hg log -r "follow('set:grep(b2)')" | |
713 | changeset: 4:ddb82e70d1a1 |
|
713 | changeset: 4:ddb82e70d1a1 | |
714 | tag: tip |
|
714 | tag: tip | |
715 | parent: 0:67e992f2c4f3 |
|
715 | parent: 0:67e992f2c4f3 | |
716 | user: test |
|
716 | user: test | |
717 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
717 | date: Thu Jan 01 00:00:01 1970 +0000 | |
718 | summary: b2 |
|
718 | summary: b2 | |
719 |
|
719 | |||
720 | log -f -r null |
|
720 | log -f -r null | |
721 |
|
721 | |||
722 | $ hg log -f -r null |
|
722 | $ hg log -f -r null | |
723 | changeset: -1:000000000000 |
|
723 | changeset: -1:000000000000 | |
724 | user: |
|
724 | user: | |
725 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
725 | date: Thu Jan 01 00:00:00 1970 +0000 | |
726 |
|
726 | |||
727 | $ hg log -f -r null -G |
|
727 | $ hg log -f -r null -G | |
728 | o changeset: -1:000000000000 |
|
728 | o changeset: -1:000000000000 | |
729 | user: |
|
729 | user: | |
730 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
730 | date: Thu Jan 01 00:00:00 1970 +0000 | |
731 |
|
731 | |||
732 |
|
732 | |||
733 |
|
733 | |||
734 | log -f with null parent |
|
734 | log -f with null parent | |
735 |
|
735 | |||
736 | $ hg up -C null |
|
736 | $ hg up -C null | |
737 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
737 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
738 | $ hg log -f |
|
738 | $ hg log -f | |
739 |
|
739 | |||
740 |
|
740 | |||
741 | log -r . with two parents |
|
741 | log -r . with two parents | |
742 |
|
742 | |||
743 | $ hg up -C 3 |
|
743 | $ hg up -C 3 | |
744 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
744 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
745 | $ hg merge tip |
|
745 | $ hg merge tip | |
746 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
746 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
747 | (branch merge, don't forget to commit) |
|
747 | (branch merge, don't forget to commit) | |
748 | $ hg log -r . |
|
748 | $ hg log -r . | |
749 | changeset: 3:e62f78d544b4 |
|
749 | changeset: 3:e62f78d544b4 | |
750 | parent: 1:3d5bf5654eda |
|
750 | parent: 1:3d5bf5654eda | |
751 | user: test |
|
751 | user: test | |
752 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
752 | date: Thu Jan 01 00:00:01 1970 +0000 | |
753 | summary: b1 |
|
753 | summary: b1 | |
754 |
|
754 | |||
755 |
|
755 | |||
756 |
|
756 | |||
757 | log -r . with one parent |
|
757 | log -r . with one parent | |
758 |
|
758 | |||
759 | $ hg ci -mm12 -d '1 0' |
|
759 | $ hg ci -mm12 -d '1 0' | |
760 | $ hg log -r . |
|
760 | $ hg log -r . | |
761 | changeset: 5:302e9dd6890d |
|
761 | changeset: 5:302e9dd6890d | |
762 | tag: tip |
|
762 | tag: tip | |
763 | parent: 3:e62f78d544b4 |
|
763 | parent: 3:e62f78d544b4 | |
764 | parent: 4:ddb82e70d1a1 |
|
764 | parent: 4:ddb82e70d1a1 | |
765 | user: test |
|
765 | user: test | |
766 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
766 | date: Thu Jan 01 00:00:01 1970 +0000 | |
767 | summary: m12 |
|
767 | summary: m12 | |
768 |
|
768 | |||
769 |
|
769 | |||
770 | $ echo postm >> b1 |
|
770 | $ echo postm >> b1 | |
771 | $ hg ci -Amb1.1 -d'1 0' |
|
771 | $ hg ci -Amb1.1 -d'1 0' | |
772 |
|
772 | |||
773 |
|
773 | |||
774 | log --follow-first |
|
774 | log --follow-first | |
775 |
|
775 | |||
776 | $ hg log --follow-first |
|
776 | $ hg log --follow-first | |
777 | changeset: 6:2404bbcab562 |
|
777 | changeset: 6:2404bbcab562 | |
778 | tag: tip |
|
778 | tag: tip | |
779 | user: test |
|
779 | user: test | |
780 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
780 | date: Thu Jan 01 00:00:01 1970 +0000 | |
781 | summary: b1.1 |
|
781 | summary: b1.1 | |
782 |
|
782 | |||
783 | changeset: 5:302e9dd6890d |
|
783 | changeset: 5:302e9dd6890d | |
784 | parent: 3:e62f78d544b4 |
|
784 | parent: 3:e62f78d544b4 | |
785 | parent: 4:ddb82e70d1a1 |
|
785 | parent: 4:ddb82e70d1a1 | |
786 | user: test |
|
786 | user: test | |
787 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
787 | date: Thu Jan 01 00:00:01 1970 +0000 | |
788 | summary: m12 |
|
788 | summary: m12 | |
789 |
|
789 | |||
790 | changeset: 3:e62f78d544b4 |
|
790 | changeset: 3:e62f78d544b4 | |
791 | parent: 1:3d5bf5654eda |
|
791 | parent: 1:3d5bf5654eda | |
792 | user: test |
|
792 | user: test | |
793 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
793 | date: Thu Jan 01 00:00:01 1970 +0000 | |
794 | summary: b1 |
|
794 | summary: b1 | |
795 |
|
795 | |||
796 | changeset: 1:3d5bf5654eda |
|
796 | changeset: 1:3d5bf5654eda | |
797 | user: test |
|
797 | user: test | |
798 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
798 | date: Thu Jan 01 00:00:01 1970 +0000 | |
799 | summary: r1 |
|
799 | summary: r1 | |
800 |
|
800 | |||
801 | changeset: 0:67e992f2c4f3 |
|
801 | changeset: 0:67e992f2c4f3 | |
802 | user: test |
|
802 | user: test | |
803 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
803 | date: Thu Jan 01 00:00:01 1970 +0000 | |
804 | summary: base |
|
804 | summary: base | |
805 |
|
805 | |||
806 |
|
806 | |||
807 |
|
807 | |||
808 | log -P 2 |
|
808 | log -P 2 | |
809 |
|
809 | |||
810 | $ hg log -P 2 |
|
810 | $ hg log -P 2 | |
811 | changeset: 6:2404bbcab562 |
|
811 | changeset: 6:2404bbcab562 | |
812 | tag: tip |
|
812 | tag: tip | |
813 | user: test |
|
813 | user: test | |
814 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
814 | date: Thu Jan 01 00:00:01 1970 +0000 | |
815 | summary: b1.1 |
|
815 | summary: b1.1 | |
816 |
|
816 | |||
817 | changeset: 5:302e9dd6890d |
|
817 | changeset: 5:302e9dd6890d | |
818 | parent: 3:e62f78d544b4 |
|
818 | parent: 3:e62f78d544b4 | |
819 | parent: 4:ddb82e70d1a1 |
|
819 | parent: 4:ddb82e70d1a1 | |
820 | user: test |
|
820 | user: test | |
821 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
821 | date: Thu Jan 01 00:00:01 1970 +0000 | |
822 | summary: m12 |
|
822 | summary: m12 | |
823 |
|
823 | |||
824 | changeset: 4:ddb82e70d1a1 |
|
824 | changeset: 4:ddb82e70d1a1 | |
825 | parent: 0:67e992f2c4f3 |
|
825 | parent: 0:67e992f2c4f3 | |
826 | user: test |
|
826 | user: test | |
827 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
827 | date: Thu Jan 01 00:00:01 1970 +0000 | |
828 | summary: b2 |
|
828 | summary: b2 | |
829 |
|
829 | |||
830 | changeset: 3:e62f78d544b4 |
|
830 | changeset: 3:e62f78d544b4 | |
831 | parent: 1:3d5bf5654eda |
|
831 | parent: 1:3d5bf5654eda | |
832 | user: test |
|
832 | user: test | |
833 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
833 | date: Thu Jan 01 00:00:01 1970 +0000 | |
834 | summary: b1 |
|
834 | summary: b1 | |
835 |
|
835 | |||
836 |
|
836 | |||
837 |
|
837 | |||
838 | log -r tip -p --git |
|
838 | log -r tip -p --git | |
839 |
|
839 | |||
840 | $ hg log -r tip -p --git |
|
840 | $ hg log -r tip -p --git | |
841 | changeset: 6:2404bbcab562 |
|
841 | changeset: 6:2404bbcab562 | |
842 | tag: tip |
|
842 | tag: tip | |
843 | user: test |
|
843 | user: test | |
844 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
844 | date: Thu Jan 01 00:00:01 1970 +0000 | |
845 | summary: b1.1 |
|
845 | summary: b1.1 | |
846 |
|
846 | |||
847 | diff --git a/b1 b/b1 |
|
847 | diff --git a/b1 b/b1 | |
848 | --- a/b1 |
|
848 | --- a/b1 | |
849 | +++ b/b1 |
|
849 | +++ b/b1 | |
850 | @@ -1,1 +1,2 @@ |
|
850 | @@ -1,1 +1,2 @@ | |
851 | b1 |
|
851 | b1 | |
852 | +postm |
|
852 | +postm | |
853 |
|
853 | |||
854 |
|
854 | |||
855 |
|
855 | |||
856 | log -r "" |
|
856 | log -r "" | |
857 |
|
857 | |||
858 | $ hg log -r '' |
|
858 | $ hg log -r '' | |
859 | hg: parse error: empty query |
|
859 | hg: parse error: empty query | |
860 | [255] |
|
860 | [255] | |
861 |
|
861 | |||
862 | log -r <some unknown node id> |
|
862 | log -r <some unknown node id> | |
863 |
|
863 | |||
864 | $ hg log -r 1000000000000000000000000000000000000000 |
|
864 | $ hg log -r 1000000000000000000000000000000000000000 | |
865 | abort: unknown revision '1000000000000000000000000000000000000000'! |
|
865 | abort: unknown revision '1000000000000000000000000000000000000000'! | |
866 | [255] |
|
866 | [255] | |
867 |
|
867 | |||
868 | log -k r1 |
|
868 | log -k r1 | |
869 |
|
869 | |||
870 | $ hg log -k r1 |
|
870 | $ hg log -k r1 | |
871 | changeset: 1:3d5bf5654eda |
|
871 | changeset: 1:3d5bf5654eda | |
872 | user: test |
|
872 | user: test | |
873 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
873 | date: Thu Jan 01 00:00:01 1970 +0000 | |
874 | summary: r1 |
|
874 | summary: r1 | |
875 |
|
875 | |||
876 | log -p -l2 --color=always |
|
876 | log -p -l2 --color=always | |
877 |
|
877 | |||
878 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
878 | $ hg --config extensions.color= --config color.mode=ansi \ | |
879 | > log -p -l2 --color=always |
|
879 | > log -p -l2 --color=always | |
880 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
880 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) | |
881 | tag: tip |
|
881 | tag: tip | |
882 | user: test |
|
882 | user: test | |
883 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
883 | date: Thu Jan 01 00:00:01 1970 +0000 | |
884 | summary: b1.1 |
|
884 | summary: b1.1 | |
885 |
|
885 | |||
886 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
|
886 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) | |
887 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
887 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
888 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
888 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
889 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
889 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) | |
890 | b1 |
|
890 | b1 | |
891 | \x1b[0;32m+postm\x1b[0m (esc) |
|
891 | \x1b[0;32m+postm\x1b[0m (esc) | |
892 |
|
892 | |||
893 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
893 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) | |
894 | parent: 3:e62f78d544b4 |
|
894 | parent: 3:e62f78d544b4 | |
895 | parent: 4:ddb82e70d1a1 |
|
895 | parent: 4:ddb82e70d1a1 | |
896 | user: test |
|
896 | user: test | |
897 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
897 | date: Thu Jan 01 00:00:01 1970 +0000 | |
898 | summary: m12 |
|
898 | summary: m12 | |
899 |
|
899 | |||
900 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
|
900 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) | |
901 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
|
901 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) | |
902 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
902 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
903 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
|
903 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) | |
904 | \x1b[0;32m+b2\x1b[0m (esc) |
|
904 | \x1b[0;32m+b2\x1b[0m (esc) | |
905 |
|
905 | |||
906 |
|
906 | |||
907 |
|
907 | |||
908 | log -r tip --stat |
|
908 | log -r tip --stat | |
909 |
|
909 | |||
910 | $ hg log -r tip --stat |
|
910 | $ hg log -r tip --stat | |
911 | changeset: 6:2404bbcab562 |
|
911 | changeset: 6:2404bbcab562 | |
912 | tag: tip |
|
912 | tag: tip | |
913 | user: test |
|
913 | user: test | |
914 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
914 | date: Thu Jan 01 00:00:01 1970 +0000 | |
915 | summary: b1.1 |
|
915 | summary: b1.1 | |
916 |
|
916 | |||
917 | b1 | 1 + |
|
917 | b1 | 1 + | |
918 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
918 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
919 |
|
919 | |||
920 |
|
920 | |||
921 | $ cd .. |
|
921 | $ cd .. | |
922 |
|
922 | |||
923 | Test that log should respect the order of -rREV even if multiple OR conditions |
|
923 | Test that log should respect the order of -rREV even if multiple OR conditions | |
924 | are specified (issue5100): |
|
924 | are specified (issue5100): | |
925 |
|
925 | |||
926 | $ hg init revorder |
|
926 | $ hg init revorder | |
927 | $ cd revorder |
|
927 | $ cd revorder | |
928 |
|
928 | |||
929 | $ hg branch -q b0 |
|
929 | $ hg branch -q b0 | |
930 | $ echo 0 >> f0 |
|
930 | $ echo 0 >> f0 | |
931 | $ hg ci -qAm k0 -u u0 |
|
931 | $ hg ci -qAm k0 -u u0 | |
932 | $ hg branch -q b1 |
|
932 | $ hg branch -q b1 | |
933 | $ echo 1 >> f1 |
|
933 | $ echo 1 >> f1 | |
934 | $ hg ci -qAm k1 -u u1 |
|
934 | $ hg ci -qAm k1 -u u1 | |
935 | $ hg branch -q b2 |
|
935 | $ hg branch -q b2 | |
936 | $ echo 2 >> f2 |
|
936 | $ echo 2 >> f2 | |
937 | $ hg ci -qAm k2 -u u2 |
|
937 | $ hg ci -qAm k2 -u u2 | |
938 |
|
938 | |||
939 | $ hg update -q b2 |
|
939 | $ hg update -q b2 | |
940 | $ echo 3 >> f2 |
|
940 | $ echo 3 >> f2 | |
941 | $ hg ci -qAm k2 -u u2 |
|
941 | $ hg ci -qAm k2 -u u2 | |
942 | $ hg update -q b1 |
|
942 | $ hg update -q b1 | |
943 | $ echo 4 >> f1 |
|
943 | $ echo 4 >> f1 | |
944 | $ hg ci -qAm k1 -u u1 |
|
944 | $ hg ci -qAm k1 -u u1 | |
945 | $ hg update -q b0 |
|
945 | $ hg update -q b0 | |
946 | $ echo 5 >> f0 |
|
946 | $ echo 5 >> f0 | |
947 | $ hg ci -qAm k0 -u u0 |
|
947 | $ hg ci -qAm k0 -u u0 | |
948 |
|
948 | |||
949 | summary of revisions: |
|
949 | summary of revisions: | |
950 |
|
950 | |||
951 | $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n' |
|
951 | $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n' | |
952 | @ 5 b0 u0 k0 f0 |
|
952 | @ 5 b0 u0 k0 f0 | |
953 | | |
|
953 | | | |
954 | | o 4 b1 u1 k1 f1 |
|
954 | | o 4 b1 u1 k1 f1 | |
955 | | | |
|
955 | | | | |
956 | | | o 3 b2 u2 k2 f2 |
|
956 | | | o 3 b2 u2 k2 f2 | |
957 | | | | |
|
957 | | | | | |
958 | | | o 2 b2 u2 k2 f2 |
|
958 | | | o 2 b2 u2 k2 f2 | |
959 | | |/ |
|
959 | | |/ | |
960 | | o 1 b1 u1 k1 f1 |
|
960 | | o 1 b1 u1 k1 f1 | |
961 | |/ |
|
961 | |/ | |
962 | o 0 b0 u0 k0 f0 |
|
962 | o 0 b0 u0 k0 f0 | |
963 |
|
963 | |||
964 |
|
964 | |||
965 | log -b BRANCH in ascending order: |
|
965 | log -b BRANCH in ascending order: | |
966 |
|
966 | |||
967 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1 |
|
967 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1 | |
968 | 0 b0 |
|
968 | 0 b0 | |
969 | 1 b1 |
|
969 | 1 b1 | |
970 | 4 b1 |
|
970 | 4 b1 | |
971 | 5 b0 |
|
971 | 5 b0 | |
972 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0 |
|
972 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0 | |
973 | 0 b0 |
|
973 | 0 b0 | |
974 | 1 b1 |
|
974 | 1 b1 | |
975 | 4 b1 |
|
975 | 4 b1 | |
976 | 5 b0 |
|
976 | 5 b0 | |
977 |
|
977 | |||
978 | log --only-branch BRANCH in descending order: |
|
978 | log --only-branch BRANCH in descending order: | |
979 |
|
979 | |||
980 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2 |
|
980 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2 | |
981 | 4 b1 |
|
981 | 4 b1 | |
982 | 3 b2 |
|
982 | 3 b2 | |
983 | 2 b2 |
|
983 | 2 b2 | |
984 | 1 b1 |
|
984 | 1 b1 | |
985 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1 |
|
985 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1 | |
986 | 4 b1 |
|
986 | 4 b1 | |
987 | 3 b2 |
|
987 | 3 b2 | |
988 | 2 b2 |
|
988 | 2 b2 | |
989 | 1 b1 |
|
989 | 1 b1 | |
990 |
|
990 | |||
991 | log -u USER in ascending order, against compound set: |
|
991 | log -u USER in ascending order, against compound set: | |
992 |
|
992 | |||
993 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2 |
|
993 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2 | |
994 | 0 u0 |
|
994 | 0 u0 | |
995 | 2 u2 |
|
995 | 2 u2 | |
996 | 3 u2 |
|
996 | 3 u2 | |
997 | 5 u0 |
|
997 | 5 u0 | |
998 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0 |
|
998 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0 | |
999 | 0 u0 |
|
999 | 0 u0 | |
1000 | 2 u2 |
|
1000 | 2 u2 | |
1001 | 3 u2 |
|
1001 | 3 u2 | |
1002 | 5 u0 |
|
1002 | 5 u0 | |
1003 |
|
1003 | |||
1004 | log -k TEXT in descending order, against compound set: |
|
1004 | log -k TEXT in descending order, against compound set: | |
1005 |
|
1005 | |||
1006 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2 |
|
1006 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2 | |
1007 | 5 k0 |
|
1007 | 5 k0 | |
1008 | 3 k2 |
|
1008 | 3 k2 | |
1009 | 2 k2 |
|
1009 | 2 k2 | |
1010 | 1 k1 |
|
1010 | 1 k1 | |
1011 | 0 k0 |
|
1011 | 0 k0 | |
1012 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0 |
|
1012 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0 | |
1013 | 5 k0 |
|
1013 | 5 k0 | |
1014 | 3 k2 |
|
1014 | 3 k2 | |
1015 | 2 k2 |
|
1015 | 2 k2 | |
1016 | 1 k1 |
|
1016 | 1 k1 | |
1017 | 0 k0 |
|
1017 | 0 k0 | |
1018 |
|
1018 | |||
1019 | log FILE in ascending order, against dagrange: |
|
1019 | log FILE in ascending order, against dagrange: | |
1020 |
|
1020 | |||
1021 | $ hg log -r1:: -T '{rev} {files}\n' f1 f2 |
|
1021 | $ hg log -r1:: -T '{rev} {files}\n' f1 f2 | |
1022 | 1 f1 |
|
1022 | 1 f1 | |
1023 | 2 f2 |
|
1023 | 2 f2 | |
1024 | 3 f2 |
|
1024 | 3 f2 | |
1025 | 4 f1 |
|
1025 | 4 f1 | |
1026 | $ hg log -r1:: -T '{rev} {files}\n' f2 f1 |
|
1026 | $ hg log -r1:: -T '{rev} {files}\n' f2 f1 | |
1027 | 1 f1 |
|
1027 | 1 f1 | |
1028 | 2 f2 |
|
1028 | 2 f2 | |
1029 | 3 f2 |
|
1029 | 3 f2 | |
1030 | 4 f1 |
|
1030 | 4 f1 | |
1031 |
|
1031 | |||
1032 | $ cd .. |
|
1032 | $ cd .. | |
1033 |
|
1033 | |||
1034 | User |
|
1034 | User | |
1035 |
|
1035 | |||
1036 | $ hg init usertest |
|
1036 | $ hg init usertest | |
1037 | $ cd usertest |
|
1037 | $ cd usertest | |
1038 |
|
1038 | |||
1039 | $ echo a > a |
|
1039 | $ echo a > a | |
1040 | $ hg ci -A -m "a" -u "User One <user1@example.org>" |
|
1040 | $ hg ci -A -m "a" -u "User One <user1@example.org>" | |
1041 | adding a |
|
1041 | adding a | |
1042 | $ echo b > b |
|
1042 | $ echo b > b | |
1043 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
1043 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" | |
1044 | adding b |
|
1044 | adding b | |
1045 |
|
1045 | |||
1046 | $ hg log -u "User One <user1@example.org>" |
|
1046 | $ hg log -u "User One <user1@example.org>" | |
1047 | changeset: 0:29a4c94f1924 |
|
1047 | changeset: 0:29a4c94f1924 | |
1048 | user: User One <user1@example.org> |
|
1048 | user: User One <user1@example.org> | |
1049 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1049 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1050 | summary: a |
|
1050 | summary: a | |
1051 |
|
1051 | |||
1052 | $ hg log -u "user1" -u "user2" |
|
1052 | $ hg log -u "user1" -u "user2" | |
1053 | changeset: 1:e834b5e69c0e |
|
1053 | changeset: 1:e834b5e69c0e | |
1054 | tag: tip |
|
1054 | tag: tip | |
1055 | user: User Two <user2@example.org> |
|
1055 | user: User Two <user2@example.org> | |
1056 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1056 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1057 | summary: b |
|
1057 | summary: b | |
1058 |
|
1058 | |||
1059 | changeset: 0:29a4c94f1924 |
|
1059 | changeset: 0:29a4c94f1924 | |
1060 | user: User One <user1@example.org> |
|
1060 | user: User One <user1@example.org> | |
1061 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1061 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1062 | summary: a |
|
1062 | summary: a | |
1063 |
|
1063 | |||
1064 | $ hg log -u "user3" |
|
1064 | $ hg log -u "user3" | |
1065 |
|
1065 | |||
1066 | $ cd .. |
|
1066 | $ cd .. | |
1067 |
|
1067 | |||
1068 | $ hg init branches |
|
1068 | $ hg init branches | |
1069 | $ cd branches |
|
1069 | $ cd branches | |
1070 |
|
1070 | |||
1071 | $ echo a > a |
|
1071 | $ echo a > a | |
1072 | $ hg ci -A -m "commit on default" |
|
1072 | $ hg ci -A -m "commit on default" | |
1073 | adding a |
|
1073 | adding a | |
1074 | $ hg branch test |
|
1074 | $ hg branch test | |
1075 | marked working directory as branch test |
|
1075 | marked working directory as branch test | |
1076 | (branches are permanent and global, did you want a bookmark?) |
|
1076 | (branches are permanent and global, did you want a bookmark?) | |
1077 | $ echo b > b |
|
1077 | $ echo b > b | |
1078 | $ hg ci -A -m "commit on test" |
|
1078 | $ hg ci -A -m "commit on test" | |
1079 | adding b |
|
1079 | adding b | |
1080 |
|
1080 | |||
1081 | $ hg up default |
|
1081 | $ hg up default | |
1082 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1082 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1083 | $ echo c > c |
|
1083 | $ echo c > c | |
1084 | $ hg ci -A -m "commit on default" |
|
1084 | $ hg ci -A -m "commit on default" | |
1085 | adding c |
|
1085 | adding c | |
1086 | $ hg up test |
|
1086 | $ hg up test | |
1087 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1087 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1088 | $ echo c > c |
|
1088 | $ echo c > c | |
1089 | $ hg ci -A -m "commit on test" |
|
1089 | $ hg ci -A -m "commit on test" | |
1090 | adding c |
|
1090 | adding c | |
1091 |
|
1091 | |||
1092 |
|
1092 | |||
1093 | log -b default |
|
1093 | log -b default | |
1094 |
|
1094 | |||
1095 | $ hg log -b default |
|
1095 | $ hg log -b default | |
1096 | changeset: 2:c3a4f03cc9a7 |
|
1096 | changeset: 2:c3a4f03cc9a7 | |
1097 | parent: 0:24427303d56f |
|
1097 | parent: 0:24427303d56f | |
1098 | user: test |
|
1098 | user: test | |
1099 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1099 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1100 | summary: commit on default |
|
1100 | summary: commit on default | |
1101 |
|
1101 | |||
1102 | changeset: 0:24427303d56f |
|
1102 | changeset: 0:24427303d56f | |
1103 | user: test |
|
1103 | user: test | |
1104 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1104 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1105 | summary: commit on default |
|
1105 | summary: commit on default | |
1106 |
|
1106 | |||
1107 |
|
1107 | |||
1108 |
|
1108 | |||
1109 | log -b test |
|
1109 | log -b test | |
1110 |
|
1110 | |||
1111 | $ hg log -b test |
|
1111 | $ hg log -b test | |
1112 | changeset: 3:f5d8de11c2e2 |
|
1112 | changeset: 3:f5d8de11c2e2 | |
1113 | branch: test |
|
1113 | branch: test | |
1114 | tag: tip |
|
1114 | tag: tip | |
1115 | parent: 1:d32277701ccb |
|
1115 | parent: 1:d32277701ccb | |
1116 | user: test |
|
1116 | user: test | |
1117 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1117 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1118 | summary: commit on test |
|
1118 | summary: commit on test | |
1119 |
|
1119 | |||
1120 | changeset: 1:d32277701ccb |
|
1120 | changeset: 1:d32277701ccb | |
1121 | branch: test |
|
1121 | branch: test | |
1122 | user: test |
|
1122 | user: test | |
1123 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1123 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1124 | summary: commit on test |
|
1124 | summary: commit on test | |
1125 |
|
1125 | |||
1126 |
|
1126 | |||
1127 |
|
1127 | |||
1128 | log -b dummy |
|
1128 | log -b dummy | |
1129 |
|
1129 | |||
1130 | $ hg log -b dummy |
|
1130 | $ hg log -b dummy | |
1131 | abort: unknown revision 'dummy'! |
|
1131 | abort: unknown revision 'dummy'! | |
1132 | [255] |
|
1132 | [255] | |
1133 |
|
1133 | |||
1134 |
|
1134 | |||
1135 | log -b . |
|
1135 | log -b . | |
1136 |
|
1136 | |||
1137 | $ hg log -b . |
|
1137 | $ hg log -b . | |
1138 | changeset: 3:f5d8de11c2e2 |
|
1138 | changeset: 3:f5d8de11c2e2 | |
1139 | branch: test |
|
1139 | branch: test | |
1140 | tag: tip |
|
1140 | tag: tip | |
1141 | parent: 1:d32277701ccb |
|
1141 | parent: 1:d32277701ccb | |
1142 | user: test |
|
1142 | user: test | |
1143 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1143 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1144 | summary: commit on test |
|
1144 | summary: commit on test | |
1145 |
|
1145 | |||
1146 | changeset: 1:d32277701ccb |
|
1146 | changeset: 1:d32277701ccb | |
1147 | branch: test |
|
1147 | branch: test | |
1148 | user: test |
|
1148 | user: test | |
1149 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1149 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1150 | summary: commit on test |
|
1150 | summary: commit on test | |
1151 |
|
1151 | |||
1152 |
|
1152 | |||
1153 |
|
1153 | |||
1154 | log -b default -b test |
|
1154 | log -b default -b test | |
1155 |
|
1155 | |||
1156 | $ hg log -b default -b test |
|
1156 | $ hg log -b default -b test | |
1157 | changeset: 3:f5d8de11c2e2 |
|
1157 | changeset: 3:f5d8de11c2e2 | |
1158 | branch: test |
|
1158 | branch: test | |
1159 | tag: tip |
|
1159 | tag: tip | |
1160 | parent: 1:d32277701ccb |
|
1160 | parent: 1:d32277701ccb | |
1161 | user: test |
|
1161 | user: test | |
1162 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1162 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1163 | summary: commit on test |
|
1163 | summary: commit on test | |
1164 |
|
1164 | |||
1165 | changeset: 2:c3a4f03cc9a7 |
|
1165 | changeset: 2:c3a4f03cc9a7 | |
1166 | parent: 0:24427303d56f |
|
1166 | parent: 0:24427303d56f | |
1167 | user: test |
|
1167 | user: test | |
1168 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1168 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1169 | summary: commit on default |
|
1169 | summary: commit on default | |
1170 |
|
1170 | |||
1171 | changeset: 1:d32277701ccb |
|
1171 | changeset: 1:d32277701ccb | |
1172 | branch: test |
|
1172 | branch: test | |
1173 | user: test |
|
1173 | user: test | |
1174 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1174 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1175 | summary: commit on test |
|
1175 | summary: commit on test | |
1176 |
|
1176 | |||
1177 | changeset: 0:24427303d56f |
|
1177 | changeset: 0:24427303d56f | |
1178 | user: test |
|
1178 | user: test | |
1179 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1179 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1180 | summary: commit on default |
|
1180 | summary: commit on default | |
1181 |
|
1181 | |||
1182 |
|
1182 | |||
1183 |
|
1183 | |||
1184 | log -b default -b . |
|
1184 | log -b default -b . | |
1185 |
|
1185 | |||
1186 | $ hg log -b default -b . |
|
1186 | $ hg log -b default -b . | |
1187 | changeset: 3:f5d8de11c2e2 |
|
1187 | changeset: 3:f5d8de11c2e2 | |
1188 | branch: test |
|
1188 | branch: test | |
1189 | tag: tip |
|
1189 | tag: tip | |
1190 | parent: 1:d32277701ccb |
|
1190 | parent: 1:d32277701ccb | |
1191 | user: test |
|
1191 | user: test | |
1192 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1192 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1193 | summary: commit on test |
|
1193 | summary: commit on test | |
1194 |
|
1194 | |||
1195 | changeset: 2:c3a4f03cc9a7 |
|
1195 | changeset: 2:c3a4f03cc9a7 | |
1196 | parent: 0:24427303d56f |
|
1196 | parent: 0:24427303d56f | |
1197 | user: test |
|
1197 | user: test | |
1198 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1198 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1199 | summary: commit on default |
|
1199 | summary: commit on default | |
1200 |
|
1200 | |||
1201 | changeset: 1:d32277701ccb |
|
1201 | changeset: 1:d32277701ccb | |
1202 | branch: test |
|
1202 | branch: test | |
1203 | user: test |
|
1203 | user: test | |
1204 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1204 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1205 | summary: commit on test |
|
1205 | summary: commit on test | |
1206 |
|
1206 | |||
1207 | changeset: 0:24427303d56f |
|
1207 | changeset: 0:24427303d56f | |
1208 | user: test |
|
1208 | user: test | |
1209 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1209 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1210 | summary: commit on default |
|
1210 | summary: commit on default | |
1211 |
|
1211 | |||
1212 |
|
1212 | |||
1213 |
|
1213 | |||
1214 | log -b . -b test |
|
1214 | log -b . -b test | |
1215 |
|
1215 | |||
1216 | $ hg log -b . -b test |
|
1216 | $ hg log -b . -b test | |
1217 | changeset: 3:f5d8de11c2e2 |
|
1217 | changeset: 3:f5d8de11c2e2 | |
1218 | branch: test |
|
1218 | branch: test | |
1219 | tag: tip |
|
1219 | tag: tip | |
1220 | parent: 1:d32277701ccb |
|
1220 | parent: 1:d32277701ccb | |
1221 | user: test |
|
1221 | user: test | |
1222 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1222 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1223 | summary: commit on test |
|
1223 | summary: commit on test | |
1224 |
|
1224 | |||
1225 | changeset: 1:d32277701ccb |
|
1225 | changeset: 1:d32277701ccb | |
1226 | branch: test |
|
1226 | branch: test | |
1227 | user: test |
|
1227 | user: test | |
1228 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1228 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1229 | summary: commit on test |
|
1229 | summary: commit on test | |
1230 |
|
1230 | |||
1231 |
|
1231 | |||
1232 |
|
1232 | |||
1233 | log -b 2 |
|
1233 | log -b 2 | |
1234 |
|
1234 | |||
1235 | $ hg log -b 2 |
|
1235 | $ hg log -b 2 | |
1236 | changeset: 2:c3a4f03cc9a7 |
|
1236 | changeset: 2:c3a4f03cc9a7 | |
1237 | parent: 0:24427303d56f |
|
1237 | parent: 0:24427303d56f | |
1238 | user: test |
|
1238 | user: test | |
1239 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1239 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1240 | summary: commit on default |
|
1240 | summary: commit on default | |
1241 |
|
1241 | |||
1242 | changeset: 0:24427303d56f |
|
1242 | changeset: 0:24427303d56f | |
1243 | user: test |
|
1243 | user: test | |
1244 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1244 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1245 | summary: commit on default |
|
1245 | summary: commit on default | |
1246 |
|
1246 | |||
1247 | #if gettext |
|
1247 | #if gettext | |
1248 |
|
1248 | |||
1249 | Test that all log names are translated (e.g. branches, bookmarks, tags): |
|
1249 | Test that all log names are translated (e.g. branches, bookmarks, tags): | |
1250 |
|
1250 | |||
1251 | $ hg bookmark babar -r tip |
|
1251 | $ hg bookmark babar -r tip | |
1252 |
|
1252 | |||
1253 | $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip |
|
1253 | $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip | |
1254 | \xc3\x84nderung: 3:f5d8de11c2e2 (esc) |
|
1254 | \xc3\x84nderung: 3:f5d8de11c2e2 (esc) | |
1255 | Zweig: test |
|
1255 | Zweig: test | |
1256 | Lesezeichen: babar |
|
1256 | Lesezeichen: babar | |
1257 | Marke: tip |
|
1257 | Marke: tip | |
1258 | Vorg\xc3\xa4nger: 1:d32277701ccb (esc) |
|
1258 | Vorg\xc3\xa4nger: 1:d32277701ccb (esc) | |
1259 | Nutzer: test |
|
1259 | Nutzer: test | |
1260 | Datum: Thu Jan 01 00:00:00 1970 +0000 |
|
1260 | Datum: Thu Jan 01 00:00:00 1970 +0000 | |
1261 | Zusammenfassung: commit on test |
|
1261 | Zusammenfassung: commit on test | |
1262 |
|
1262 | |||
1263 | $ hg bookmark -d babar |
|
1263 | $ hg bookmark -d babar | |
1264 |
|
1264 | |||
1265 | #endif |
|
1265 | #endif | |
1266 |
|
1266 | |||
1267 | log -p --cwd dir (in subdir) |
|
1267 | log -p --cwd dir (in subdir) | |
1268 |
|
1268 | |||
1269 | $ mkdir dir |
|
1269 | $ mkdir dir | |
1270 | $ hg log -p --cwd dir |
|
1270 | $ hg log -p --cwd dir | |
1271 | changeset: 3:f5d8de11c2e2 |
|
1271 | changeset: 3:f5d8de11c2e2 | |
1272 | branch: test |
|
1272 | branch: test | |
1273 | tag: tip |
|
1273 | tag: tip | |
1274 | parent: 1:d32277701ccb |
|
1274 | parent: 1:d32277701ccb | |
1275 | user: test |
|
1275 | user: test | |
1276 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1276 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1277 | summary: commit on test |
|
1277 | summary: commit on test | |
1278 |
|
1278 | |||
1279 | diff -r d32277701ccb -r f5d8de11c2e2 c |
|
1279 | diff -r d32277701ccb -r f5d8de11c2e2 c | |
1280 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1280 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1281 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1281 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
1282 | @@ -0,0 +1,1 @@ |
|
1282 | @@ -0,0 +1,1 @@ | |
1283 | +c |
|
1283 | +c | |
1284 |
|
1284 | |||
1285 | changeset: 2:c3a4f03cc9a7 |
|
1285 | changeset: 2:c3a4f03cc9a7 | |
1286 | parent: 0:24427303d56f |
|
1286 | parent: 0:24427303d56f | |
1287 | user: test |
|
1287 | user: test | |
1288 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1288 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1289 | summary: commit on default |
|
1289 | summary: commit on default | |
1290 |
|
1290 | |||
1291 | diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
1291 | diff -r 24427303d56f -r c3a4f03cc9a7 c | |
1292 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1292 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1293 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1293 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
1294 | @@ -0,0 +1,1 @@ |
|
1294 | @@ -0,0 +1,1 @@ | |
1295 | +c |
|
1295 | +c | |
1296 |
|
1296 | |||
1297 | changeset: 1:d32277701ccb |
|
1297 | changeset: 1:d32277701ccb | |
1298 | branch: test |
|
1298 | branch: test | |
1299 | user: test |
|
1299 | user: test | |
1300 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1300 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1301 | summary: commit on test |
|
1301 | summary: commit on test | |
1302 |
|
1302 | |||
1303 | diff -r 24427303d56f -r d32277701ccb b |
|
1303 | diff -r 24427303d56f -r d32277701ccb b | |
1304 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1304 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1305 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1305 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1306 | @@ -0,0 +1,1 @@ |
|
1306 | @@ -0,0 +1,1 @@ | |
1307 | +b |
|
1307 | +b | |
1308 |
|
1308 | |||
1309 | changeset: 0:24427303d56f |
|
1309 | changeset: 0:24427303d56f | |
1310 | user: test |
|
1310 | user: test | |
1311 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1311 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1312 | summary: commit on default |
|
1312 | summary: commit on default | |
1313 |
|
1313 | |||
1314 | diff -r 000000000000 -r 24427303d56f a |
|
1314 | diff -r 000000000000 -r 24427303d56f a | |
1315 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1315 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1316 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1316 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1317 | @@ -0,0 +1,1 @@ |
|
1317 | @@ -0,0 +1,1 @@ | |
1318 | +a |
|
1318 | +a | |
1319 |
|
1319 | |||
1320 |
|
1320 | |||
1321 |
|
1321 | |||
1322 | log -p -R repo |
|
1322 | log -p -R repo | |
1323 |
|
1323 | |||
1324 | $ cd dir |
|
1324 | $ cd dir | |
1325 | $ hg log -p -R .. ../a |
|
1325 | $ hg log -p -R .. ../a | |
1326 | changeset: 0:24427303d56f |
|
1326 | changeset: 0:24427303d56f | |
1327 | user: test |
|
1327 | user: test | |
1328 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1328 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1329 | summary: commit on default |
|
1329 | summary: commit on default | |
1330 |
|
1330 | |||
1331 | diff -r 000000000000 -r 24427303d56f a |
|
1331 | diff -r 000000000000 -r 24427303d56f a | |
1332 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1332 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1333 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1333 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1334 | @@ -0,0 +1,1 @@ |
|
1334 | @@ -0,0 +1,1 @@ | |
1335 | +a |
|
1335 | +a | |
1336 |
|
1336 | |||
1337 |
|
1337 | |||
1338 | $ cd ../.. |
|
1338 | $ cd ../.. | |
1339 |
|
1339 | |||
1340 | $ hg init follow2 |
|
1340 | $ hg init follow2 | |
1341 | $ cd follow2 |
|
1341 | $ cd follow2 | |
1342 |
|
1342 | |||
1343 | # Build the following history: |
|
1343 | # Build the following history: | |
1344 | # tip - o - x - o - x - x |
|
1344 | # tip - o - x - o - x - x | |
1345 | # \ / |
|
1345 | # \ / | |
1346 | # o - o - o - x |
|
1346 | # o - o - o - x | |
1347 | # \ / |
|
1347 | # \ / | |
1348 | # o |
|
1348 | # o | |
1349 | # |
|
1349 | # | |
1350 | # Where "o" is a revision containing "foo" and |
|
1350 | # Where "o" is a revision containing "foo" and | |
1351 | # "x" is a revision without "foo" |
|
1351 | # "x" is a revision without "foo" | |
1352 |
|
1352 | |||
1353 | $ touch init |
|
1353 | $ touch init | |
1354 | $ hg ci -A -m "init, unrelated" |
|
1354 | $ hg ci -A -m "init, unrelated" | |
1355 | adding init |
|
1355 | adding init | |
1356 | $ echo 'foo' > init |
|
1356 | $ echo 'foo' > init | |
1357 | $ hg ci -m "change, unrelated" |
|
1357 | $ hg ci -m "change, unrelated" | |
1358 | $ echo 'foo' > foo |
|
1358 | $ echo 'foo' > foo | |
1359 | $ hg ci -A -m "add unrelated old foo" |
|
1359 | $ hg ci -A -m "add unrelated old foo" | |
1360 | adding foo |
|
1360 | adding foo | |
1361 | $ hg rm foo |
|
1361 | $ hg rm foo | |
1362 | $ hg ci -m "delete foo, unrelated" |
|
1362 | $ hg ci -m "delete foo, unrelated" | |
1363 | $ echo 'related' > foo |
|
1363 | $ echo 'related' > foo | |
1364 | $ hg ci -A -m "add foo, related" |
|
1364 | $ hg ci -A -m "add foo, related" | |
1365 | adding foo |
|
1365 | adding foo | |
1366 |
|
1366 | |||
1367 | $ hg up 0 |
|
1367 | $ hg up 0 | |
1368 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1368 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1369 | $ touch branch |
|
1369 | $ touch branch | |
1370 | $ hg ci -A -m "first branch, unrelated" |
|
1370 | $ hg ci -A -m "first branch, unrelated" | |
1371 | adding branch |
|
1371 | adding branch | |
1372 | created new head |
|
1372 | created new head | |
1373 | $ touch foo |
|
1373 | $ touch foo | |
1374 | $ hg ci -A -m "create foo, related" |
|
1374 | $ hg ci -A -m "create foo, related" | |
1375 | adding foo |
|
1375 | adding foo | |
1376 | $ echo 'change' > foo |
|
1376 | $ echo 'change' > foo | |
1377 | $ hg ci -m "change foo, related" |
|
1377 | $ hg ci -m "change foo, related" | |
1378 |
|
1378 | |||
1379 | $ hg up 6 |
|
1379 | $ hg up 6 | |
1380 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1380 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1381 | $ echo 'change foo in branch' > foo |
|
1381 | $ echo 'change foo in branch' > foo | |
1382 | $ hg ci -m "change foo in branch, related" |
|
1382 | $ hg ci -m "change foo in branch, related" | |
1383 | created new head |
|
1383 | created new head | |
1384 | $ hg merge 7 |
|
1384 | $ hg merge 7 | |
1385 | merging foo |
|
1385 | merging foo | |
1386 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
1386 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
1387 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1387 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1388 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1388 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
1389 | [1] |
|
1389 | [1] | |
1390 | $ echo 'merge 1' > foo |
|
1390 | $ echo 'merge 1' > foo | |
1391 | $ hg resolve -m foo |
|
1391 | $ hg resolve -m foo | |
1392 | (no more unresolved files) |
|
1392 | (no more unresolved files) | |
1393 | $ hg ci -m "First merge, related" |
|
1393 | $ hg ci -m "First merge, related" | |
1394 |
|
1394 | |||
1395 | $ hg merge 4 |
|
1395 | $ hg merge 4 | |
1396 | merging foo |
|
1396 | merging foo | |
1397 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
1397 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
1398 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1398 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1399 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1399 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
1400 | [1] |
|
1400 | [1] | |
1401 | $ echo 'merge 2' > foo |
|
1401 | $ echo 'merge 2' > foo | |
1402 | $ hg resolve -m foo |
|
1402 | $ hg resolve -m foo | |
1403 | (no more unresolved files) |
|
1403 | (no more unresolved files) | |
1404 | $ hg ci -m "Last merge, related" |
|
1404 | $ hg ci -m "Last merge, related" | |
1405 |
|
1405 | |||
1406 | $ hg log --graph |
|
1406 | $ hg log --graph | |
1407 | @ changeset: 10:4dae8563d2c5 |
|
1407 | @ changeset: 10:4dae8563d2c5 | |
1408 | |\ tag: tip |
|
1408 | |\ tag: tip | |
1409 | | | parent: 9:7b35701b003e |
|
1409 | | | parent: 9:7b35701b003e | |
1410 | | | parent: 4:88176d361b69 |
|
1410 | | | parent: 4:88176d361b69 | |
1411 | | | user: test |
|
1411 | | | user: test | |
1412 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1412 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1413 | | | summary: Last merge, related |
|
1413 | | | summary: Last merge, related | |
1414 | | | |
|
1414 | | | | |
1415 | | o changeset: 9:7b35701b003e |
|
1415 | | o changeset: 9:7b35701b003e | |
1416 | | |\ parent: 8:e5416ad8a855 |
|
1416 | | |\ parent: 8:e5416ad8a855 | |
1417 | | | | parent: 7:87fe3144dcfa |
|
1417 | | | | parent: 7:87fe3144dcfa | |
1418 | | | | user: test |
|
1418 | | | | user: test | |
1419 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1419 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1420 | | | | summary: First merge, related |
|
1420 | | | | summary: First merge, related | |
1421 | | | | |
|
1421 | | | | | |
1422 | | | o changeset: 8:e5416ad8a855 |
|
1422 | | | o changeset: 8:e5416ad8a855 | |
1423 | | | | parent: 6:dc6c325fe5ee |
|
1423 | | | | parent: 6:dc6c325fe5ee | |
1424 | | | | user: test |
|
1424 | | | | user: test | |
1425 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1425 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1426 | | | | summary: change foo in branch, related |
|
1426 | | | | summary: change foo in branch, related | |
1427 | | | | |
|
1427 | | | | | |
1428 | | o | changeset: 7:87fe3144dcfa |
|
1428 | | o | changeset: 7:87fe3144dcfa | |
1429 | | |/ user: test |
|
1429 | | |/ user: test | |
1430 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1430 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1431 | | | summary: change foo, related |
|
1431 | | | summary: change foo, related | |
1432 | | | |
|
1432 | | | | |
1433 | | o changeset: 6:dc6c325fe5ee |
|
1433 | | o changeset: 6:dc6c325fe5ee | |
1434 | | | user: test |
|
1434 | | | user: test | |
1435 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1435 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1436 | | | summary: create foo, related |
|
1436 | | | summary: create foo, related | |
1437 | | | |
|
1437 | | | | |
1438 | | o changeset: 5:73db34516eb9 |
|
1438 | | o changeset: 5:73db34516eb9 | |
1439 | | | parent: 0:e87515fd044a |
|
1439 | | | parent: 0:e87515fd044a | |
1440 | | | user: test |
|
1440 | | | user: test | |
1441 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1441 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1442 | | | summary: first branch, unrelated |
|
1442 | | | summary: first branch, unrelated | |
1443 | | | |
|
1443 | | | | |
1444 | o | changeset: 4:88176d361b69 |
|
1444 | o | changeset: 4:88176d361b69 | |
1445 | | | user: test |
|
1445 | | | user: test | |
1446 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1446 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1447 | | | summary: add foo, related |
|
1447 | | | summary: add foo, related | |
1448 | | | |
|
1448 | | | | |
1449 | o | changeset: 3:dd78ae4afb56 |
|
1449 | o | changeset: 3:dd78ae4afb56 | |
1450 | | | user: test |
|
1450 | | | user: test | |
1451 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1451 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1452 | | | summary: delete foo, unrelated |
|
1452 | | | summary: delete foo, unrelated | |
1453 | | | |
|
1453 | | | | |
1454 | o | changeset: 2:c4c64aedf0f7 |
|
1454 | o | changeset: 2:c4c64aedf0f7 | |
1455 | | | user: test |
|
1455 | | | user: test | |
1456 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1456 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1457 | | | summary: add unrelated old foo |
|
1457 | | | summary: add unrelated old foo | |
1458 | | | |
|
1458 | | | | |
1459 | o | changeset: 1:e5faa7440653 |
|
1459 | o | changeset: 1:e5faa7440653 | |
1460 | |/ user: test |
|
1460 | |/ user: test | |
1461 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1461 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1462 | | summary: change, unrelated |
|
1462 | | summary: change, unrelated | |
1463 | | |
|
1463 | | | |
1464 | o changeset: 0:e87515fd044a |
|
1464 | o changeset: 0:e87515fd044a | |
1465 | user: test |
|
1465 | user: test | |
1466 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1466 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1467 | summary: init, unrelated |
|
1467 | summary: init, unrelated | |
1468 |
|
1468 | |||
1469 |
|
1469 | |||
1470 | $ hg --traceback log -f foo |
|
1470 | $ hg --traceback log -f foo | |
1471 | changeset: 10:4dae8563d2c5 |
|
1471 | changeset: 10:4dae8563d2c5 | |
1472 | tag: tip |
|
1472 | tag: tip | |
1473 | parent: 9:7b35701b003e |
|
1473 | parent: 9:7b35701b003e | |
1474 | parent: 4:88176d361b69 |
|
1474 | parent: 4:88176d361b69 | |
1475 | user: test |
|
1475 | user: test | |
1476 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1476 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1477 | summary: Last merge, related |
|
1477 | summary: Last merge, related | |
1478 |
|
1478 | |||
1479 | changeset: 9:7b35701b003e |
|
1479 | changeset: 9:7b35701b003e | |
1480 | parent: 8:e5416ad8a855 |
|
1480 | parent: 8:e5416ad8a855 | |
1481 | parent: 7:87fe3144dcfa |
|
1481 | parent: 7:87fe3144dcfa | |
1482 | user: test |
|
1482 | user: test | |
1483 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1483 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1484 | summary: First merge, related |
|
1484 | summary: First merge, related | |
1485 |
|
1485 | |||
1486 | changeset: 8:e5416ad8a855 |
|
1486 | changeset: 8:e5416ad8a855 | |
1487 | parent: 6:dc6c325fe5ee |
|
1487 | parent: 6:dc6c325fe5ee | |
1488 | user: test |
|
1488 | user: test | |
1489 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1489 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1490 | summary: change foo in branch, related |
|
1490 | summary: change foo in branch, related | |
1491 |
|
1491 | |||
1492 | changeset: 7:87fe3144dcfa |
|
1492 | changeset: 7:87fe3144dcfa | |
1493 | user: test |
|
1493 | user: test | |
1494 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1494 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1495 | summary: change foo, related |
|
1495 | summary: change foo, related | |
1496 |
|
1496 | |||
1497 | changeset: 6:dc6c325fe5ee |
|
1497 | changeset: 6:dc6c325fe5ee | |
1498 | user: test |
|
1498 | user: test | |
1499 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1499 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1500 | summary: create foo, related |
|
1500 | summary: create foo, related | |
1501 |
|
1501 | |||
1502 | changeset: 4:88176d361b69 |
|
1502 | changeset: 4:88176d361b69 | |
1503 | user: test |
|
1503 | user: test | |
1504 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1504 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1505 | summary: add foo, related |
|
1505 | summary: add foo, related | |
1506 |
|
1506 | |||
1507 |
|
1507 | |||
1508 | Also check when maxrev < lastrevfilelog |
|
1508 | Also check when maxrev < lastrevfilelog | |
1509 |
|
1509 | |||
1510 | $ hg --traceback log -f -r4 foo |
|
1510 | $ hg --traceback log -f -r4 foo | |
1511 | changeset: 4:88176d361b69 |
|
1511 | changeset: 4:88176d361b69 | |
1512 | user: test |
|
1512 | user: test | |
1513 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1513 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1514 | summary: add foo, related |
|
1514 | summary: add foo, related | |
1515 |
|
1515 | |||
1516 | changeset: 2:c4c64aedf0f7 |
|
1516 | changeset: 2:c4c64aedf0f7 | |
1517 | user: test |
|
1517 | user: test | |
1518 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1518 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1519 | summary: add unrelated old foo |
|
1519 | summary: add unrelated old foo | |
1520 |
|
1520 | |||
1521 | $ cd .. |
|
1521 | $ cd .. | |
1522 |
|
1522 | |||
1523 | Issue2383: hg log showing _less_ differences than hg diff |
|
1523 | Issue2383: hg log showing _less_ differences than hg diff | |
1524 |
|
1524 | |||
1525 | $ hg init issue2383 |
|
1525 | $ hg init issue2383 | |
1526 | $ cd issue2383 |
|
1526 | $ cd issue2383 | |
1527 |
|
1527 | |||
1528 | Create a test repo: |
|
1528 | Create a test repo: | |
1529 |
|
1529 | |||
1530 | $ echo a > a |
|
1530 | $ echo a > a | |
1531 | $ hg ci -Am0 |
|
1531 | $ hg ci -Am0 | |
1532 | adding a |
|
1532 | adding a | |
1533 | $ echo b > b |
|
1533 | $ echo b > b | |
1534 | $ hg ci -Am1 |
|
1534 | $ hg ci -Am1 | |
1535 | adding b |
|
1535 | adding b | |
1536 | $ hg co 0 |
|
1536 | $ hg co 0 | |
1537 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1537 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1538 | $ echo b > a |
|
1538 | $ echo b > a | |
1539 | $ hg ci -m2 |
|
1539 | $ hg ci -m2 | |
1540 | created new head |
|
1540 | created new head | |
1541 |
|
1541 | |||
1542 | Merge: |
|
1542 | Merge: | |
1543 |
|
1543 | |||
1544 | $ hg merge |
|
1544 | $ hg merge | |
1545 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1545 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1546 | (branch merge, don't forget to commit) |
|
1546 | (branch merge, don't forget to commit) | |
1547 |
|
1547 | |||
1548 | Make sure there's a file listed in the merge to trigger the bug: |
|
1548 | Make sure there's a file listed in the merge to trigger the bug: | |
1549 |
|
1549 | |||
1550 | $ echo c > a |
|
1550 | $ echo c > a | |
1551 | $ hg ci -m3 |
|
1551 | $ hg ci -m3 | |
1552 |
|
1552 | |||
1553 | Two files shown here in diff: |
|
1553 | Two files shown here in diff: | |
1554 |
|
1554 | |||
1555 | $ hg diff --rev 2:3 |
|
1555 | $ hg diff --rev 2:3 | |
1556 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1556 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1557 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1557 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1558 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1558 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1559 | @@ -1,1 +1,1 @@ |
|
1559 | @@ -1,1 +1,1 @@ | |
1560 | -b |
|
1560 | -b | |
1561 | +c |
|
1561 | +c | |
1562 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1562 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1563 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1563 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1564 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1564 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1565 | @@ -0,0 +1,1 @@ |
|
1565 | @@ -0,0 +1,1 @@ | |
1566 | +b |
|
1566 | +b | |
1567 |
|
1567 | |||
1568 | Diff here should be the same: |
|
1568 | Diff here should be the same: | |
1569 |
|
1569 | |||
1570 | $ hg log -vpr 3 |
|
1570 | $ hg log -vpr 3 | |
1571 | changeset: 3:8e07aafe1edc |
|
1571 | changeset: 3:8e07aafe1edc | |
1572 | tag: tip |
|
1572 | tag: tip | |
1573 | parent: 2:b09be438c43a |
|
1573 | parent: 2:b09be438c43a | |
1574 | parent: 1:925d80f479bb |
|
1574 | parent: 1:925d80f479bb | |
1575 | user: test |
|
1575 | user: test | |
1576 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1576 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1577 | files: a |
|
1577 | files: a | |
1578 | description: |
|
1578 | description: | |
1579 | 3 |
|
1579 | 3 | |
1580 |
|
1580 | |||
1581 |
|
1581 | |||
1582 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1582 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1583 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1583 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1584 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1584 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1585 | @@ -1,1 +1,1 @@ |
|
1585 | @@ -1,1 +1,1 @@ | |
1586 | -b |
|
1586 | -b | |
1587 | +c |
|
1587 | +c | |
1588 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1588 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1589 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1589 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1590 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1590 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1591 | @@ -0,0 +1,1 @@ |
|
1591 | @@ -0,0 +1,1 @@ | |
1592 | +b |
|
1592 | +b | |
1593 |
|
1593 | |||
1594 | $ cd .. |
|
1594 | $ cd .. | |
1595 |
|
1595 | |||
1596 | 'hg log -r rev fn' when last(filelog(fn)) != rev |
|
1596 | 'hg log -r rev fn' when last(filelog(fn)) != rev | |
1597 |
|
1597 | |||
1598 | $ hg init simplelog |
|
1598 | $ hg init simplelog | |
1599 | $ cd simplelog |
|
1599 | $ cd simplelog | |
1600 | $ echo f > a |
|
1600 | $ echo f > a | |
1601 | $ hg ci -Am'a' -d '0 0' |
|
1601 | $ hg ci -Am'a' -d '0 0' | |
1602 | adding a |
|
1602 | adding a | |
1603 | $ echo f >> a |
|
1603 | $ echo f >> a | |
1604 | $ hg ci -Am'a bis' -d '1 0' |
|
1604 | $ hg ci -Am'a bis' -d '1 0' | |
1605 |
|
1605 | |||
1606 | $ hg log -r0 a |
|
1606 | $ hg log -r0 a | |
1607 | changeset: 0:9f758d63dcde |
|
1607 | changeset: 0:9f758d63dcde | |
1608 | user: test |
|
1608 | user: test | |
1609 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1609 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1610 | summary: a |
|
1610 | summary: a | |
1611 |
|
1611 | |||
1612 | enable obsolete to test hidden feature |
|
1612 | enable obsolete to test hidden feature | |
1613 |
|
1613 | |||
1614 | $ cat >> $HGRCPATH << EOF |
|
1614 | $ cat >> $HGRCPATH << EOF | |
1615 | > [experimental] |
|
1615 | > [experimental] | |
1616 | > evolution=createmarkers |
|
1616 | > evolution=createmarkers | |
1617 | > EOF |
|
1617 | > EOF | |
1618 |
|
1618 | |||
1619 | $ hg log --template='{rev}:{node}\n' |
|
1619 | $ hg log --template='{rev}:{node}\n' | |
1620 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1620 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1621 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1621 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1622 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1622 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f | |
1623 | $ hg up null -q |
|
1623 | $ hg up null -q | |
1624 | $ hg log --template='{rev}:{node}\n' |
|
1624 | $ hg log --template='{rev}:{node}\n' | |
1625 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1625 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1626 | $ hg log --template='{rev}:{node}\n' --hidden |
|
1626 | $ hg log --template='{rev}:{node}\n' --hidden | |
1627 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1627 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1628 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1628 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1629 | $ hg log -r a |
|
1629 | $ hg log -r a | |
1630 | abort: hidden revision 'a'! |
|
1630 | abort: hidden revision 'a'! | |
1631 | (use --hidden to access hidden revisions) |
|
1631 | (use --hidden to access hidden revisions) | |
1632 | [255] |
|
1632 | [255] | |
1633 |
|
1633 | |||
1634 | test that parent prevent a changeset to be hidden |
|
1634 | test that parent prevent a changeset to be hidden | |
1635 |
|
1635 | |||
1636 | $ hg up 1 -q --hidden |
|
1636 | $ hg up 1 -q --hidden | |
1637 | $ hg log --template='{rev}:{node}\n' |
|
1637 | $ hg log --template='{rev}:{node}\n' | |
1638 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1638 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1639 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1639 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1640 |
|
1640 | |||
1641 | test that second parent prevent a changeset to be hidden too |
|
1641 | test that second parent prevent a changeset to be hidden too | |
1642 |
|
1642 | |||
1643 | $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
1643 | $ hg debugsetparents 0 1 # nothing suitable to merge here | |
1644 | $ hg log --template='{rev}:{node}\n' |
|
1644 | $ hg log --template='{rev}:{node}\n' | |
1645 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1645 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1646 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1646 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1647 | $ hg debugsetparents 1 |
|
1647 | $ hg debugsetparents 1 | |
1648 | $ hg up -q null |
|
1648 | $ hg up -q null | |
1649 |
|
1649 | |||
1650 | bookmarks prevent a changeset being hidden |
|
1650 | bookmarks prevent a changeset being hidden | |
1651 |
|
1651 | |||
1652 | $ hg bookmark --hidden -r 1 X |
|
1652 | $ hg bookmark --hidden -r 1 X | |
1653 | $ hg log --template '{rev}:{node}\n' |
|
1653 | $ hg log --template '{rev}:{node}\n' | |
1654 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1654 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1655 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1655 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1656 | $ hg bookmark -d X |
|
1656 | $ hg bookmark -d X | |
1657 |
|
1657 | |||
1658 | divergent bookmarks are not hidden |
|
1658 | divergent bookmarks are not hidden | |
1659 |
|
1659 | |||
1660 | $ hg bookmark --hidden -r 1 X@foo |
|
1660 | $ hg bookmark --hidden -r 1 X@foo | |
1661 | $ hg log --template '{rev}:{node}\n' |
|
1661 | $ hg log --template '{rev}:{node}\n' | |
1662 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1662 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1663 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1663 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1664 |
|
1664 | |||
1665 | clear extensions configuration |
|
1665 | clear extensions configuration | |
1666 | $ echo '[extensions]' >> $HGRCPATH |
|
1666 | $ echo '[extensions]' >> $HGRCPATH | |
1667 | $ echo "obs=!" >> $HGRCPATH |
|
1667 | $ echo "obs=!" >> $HGRCPATH | |
1668 | $ cd .. |
|
1668 | $ cd .. | |
1669 |
|
1669 | |||
1670 | test -u/-k for problematic encoding |
|
1670 | test -u/-k for problematic encoding | |
1671 | # unicode: cp932: |
|
1671 | # unicode: cp932: | |
1672 | # u30A2 0x83 0x41(= 'A') |
|
1672 | # u30A2 0x83 0x41(= 'A') | |
1673 | # u30C2 0x83 0x61(= 'a') |
|
1673 | # u30C2 0x83 0x61(= 'a') | |
1674 |
|
1674 | |||
1675 | $ hg init problematicencoding |
|
1675 | $ hg init problematicencoding | |
1676 | $ cd problematicencoding |
|
1676 | $ cd problematicencoding | |
1677 |
|
1677 | |||
1678 | $ python > setup.sh <<EOF |
|
1678 | $ python > setup.sh <<EOF | |
1679 | > print u''' |
|
1679 | > print u''' | |
1680 | > echo a > text |
|
1680 | > echo a > text | |
1681 | > hg add text |
|
1681 | > hg add text | |
1682 | > hg --encoding utf-8 commit -u '\u30A2' -m none |
|
1682 | > hg --encoding utf-8 commit -u '\u30A2' -m none | |
1683 | > echo b > text |
|
1683 | > echo b > text | |
1684 | > hg --encoding utf-8 commit -u '\u30C2' -m none |
|
1684 | > hg --encoding utf-8 commit -u '\u30C2' -m none | |
1685 | > echo c > text |
|
1685 | > echo c > text | |
1686 | > hg --encoding utf-8 commit -u none -m '\u30A2' |
|
1686 | > hg --encoding utf-8 commit -u none -m '\u30A2' | |
1687 | > echo d > text |
|
1687 | > echo d > text | |
1688 | > hg --encoding utf-8 commit -u none -m '\u30C2' |
|
1688 | > hg --encoding utf-8 commit -u none -m '\u30C2' | |
1689 | > '''.encode('utf-8') |
|
1689 | > '''.encode('utf-8') | |
1690 | > EOF |
|
1690 | > EOF | |
1691 | $ sh < setup.sh |
|
1691 | $ sh < setup.sh | |
1692 |
|
1692 | |||
1693 | test in problematic encoding |
|
1693 | test in problematic encoding | |
1694 | $ python > test.sh <<EOF |
|
1694 | $ python > test.sh <<EOF | |
1695 | > print u''' |
|
1695 | > print u''' | |
1696 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
|
1696 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' | |
1697 | > echo ==== |
|
1697 | > echo ==== | |
1698 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
|
1698 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' | |
1699 | > echo ==== |
|
1699 | > echo ==== | |
1700 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
|
1700 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' | |
1701 | > echo ==== |
|
1701 | > echo ==== | |
1702 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
|
1702 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' | |
1703 | > '''.encode('cp932') |
|
1703 | > '''.encode('cp932') | |
1704 | > EOF |
|
1704 | > EOF | |
1705 | $ sh < test.sh |
|
1705 | $ sh < test.sh | |
1706 | 0 |
|
1706 | 0 | |
1707 | ==== |
|
1707 | ==== | |
1708 | 1 |
|
1708 | 1 | |
1709 | ==== |
|
1709 | ==== | |
1710 | 2 |
|
1710 | 2 | |
1711 | 0 |
|
1711 | 0 | |
1712 | ==== |
|
1712 | ==== | |
1713 | 3 |
|
1713 | 3 | |
1714 | 1 |
|
1714 | 1 | |
1715 |
|
1715 | |||
1716 | $ cd .. |
|
1716 | $ cd .. | |
1717 |
|
1717 | |||
1718 | test hg log on non-existent files and on directories |
|
1718 | test hg log on non-existent files and on directories | |
1719 | $ hg init issue1340 |
|
1719 | $ hg init issue1340 | |
1720 | $ cd issue1340 |
|
1720 | $ cd issue1340 | |
1721 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
|
1721 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 | |
1722 | $ echo 1 > d1/f1 |
|
1722 | $ echo 1 > d1/f1 | |
1723 | $ echo 1 > D2/f1 |
|
1723 | $ echo 1 > D2/f1 | |
1724 | $ echo 1 > D3.i/f1 |
|
1724 | $ echo 1 > D3.i/f1 | |
1725 | $ echo 1 > d4.hg/f1 |
|
1725 | $ echo 1 > d4.hg/f1 | |
1726 | $ echo 1 > d5.d/f1 |
|
1726 | $ echo 1 > d5.d/f1 | |
1727 | $ echo 1 > .d6/f1 |
|
1727 | $ echo 1 > .d6/f1 | |
1728 | $ hg -q add . |
|
1728 | $ hg -q add . | |
1729 | $ hg commit -m "a bunch of weird directories" |
|
1729 | $ hg commit -m "a bunch of weird directories" | |
1730 | $ hg log -l1 d1/f1 | grep changeset |
|
1730 | $ hg log -l1 d1/f1 | grep changeset | |
1731 | changeset: 0:65624cd9070a |
|
1731 | changeset: 0:65624cd9070a | |
1732 | $ hg log -l1 f1 |
|
1732 | $ hg log -l1 f1 | |
1733 | $ hg log -l1 . | grep changeset |
|
1733 | $ hg log -l1 . | grep changeset | |
1734 | changeset: 0:65624cd9070a |
|
1734 | changeset: 0:65624cd9070a | |
1735 | $ hg log -l1 ./ | grep changeset |
|
1735 | $ hg log -l1 ./ | grep changeset | |
1736 | changeset: 0:65624cd9070a |
|
1736 | changeset: 0:65624cd9070a | |
1737 | $ hg log -l1 d1 | grep changeset |
|
1737 | $ hg log -l1 d1 | grep changeset | |
1738 | changeset: 0:65624cd9070a |
|
1738 | changeset: 0:65624cd9070a | |
1739 | $ hg log -l1 D2 | grep changeset |
|
1739 | $ hg log -l1 D2 | grep changeset | |
1740 | changeset: 0:65624cd9070a |
|
1740 | changeset: 0:65624cd9070a | |
1741 | $ hg log -l1 D2/f1 | grep changeset |
|
1741 | $ hg log -l1 D2/f1 | grep changeset | |
1742 | changeset: 0:65624cd9070a |
|
1742 | changeset: 0:65624cd9070a | |
1743 | $ hg log -l1 D3.i | grep changeset |
|
1743 | $ hg log -l1 D3.i | grep changeset | |
1744 | changeset: 0:65624cd9070a |
|
1744 | changeset: 0:65624cd9070a | |
1745 | $ hg log -l1 D3.i/f1 | grep changeset |
|
1745 | $ hg log -l1 D3.i/f1 | grep changeset | |
1746 | changeset: 0:65624cd9070a |
|
1746 | changeset: 0:65624cd9070a | |
1747 | $ hg log -l1 d4.hg | grep changeset |
|
1747 | $ hg log -l1 d4.hg | grep changeset | |
1748 | changeset: 0:65624cd9070a |
|
1748 | changeset: 0:65624cd9070a | |
1749 | $ hg log -l1 d4.hg/f1 | grep changeset |
|
1749 | $ hg log -l1 d4.hg/f1 | grep changeset | |
1750 | changeset: 0:65624cd9070a |
|
1750 | changeset: 0:65624cd9070a | |
1751 | $ hg log -l1 d5.d | grep changeset |
|
1751 | $ hg log -l1 d5.d | grep changeset | |
1752 | changeset: 0:65624cd9070a |
|
1752 | changeset: 0:65624cd9070a | |
1753 | $ hg log -l1 d5.d/f1 | grep changeset |
|
1753 | $ hg log -l1 d5.d/f1 | grep changeset | |
1754 | changeset: 0:65624cd9070a |
|
1754 | changeset: 0:65624cd9070a | |
1755 | $ hg log -l1 .d6 | grep changeset |
|
1755 | $ hg log -l1 .d6 | grep changeset | |
1756 | changeset: 0:65624cd9070a |
|
1756 | changeset: 0:65624cd9070a | |
1757 | $ hg log -l1 .d6/f1 | grep changeset |
|
1757 | $ hg log -l1 .d6/f1 | grep changeset | |
1758 | changeset: 0:65624cd9070a |
|
1758 | changeset: 0:65624cd9070a | |
1759 |
|
1759 | |||
1760 | issue3772: hg log -r :null showing revision 0 as well |
|
1760 | issue3772: hg log -r :null showing revision 0 as well | |
1761 |
|
1761 | |||
1762 | $ hg log -r :null |
|
1762 | $ hg log -r :null | |
1763 | changeset: 0:65624cd9070a |
|
1763 | changeset: 0:65624cd9070a | |
1764 | tag: tip |
|
1764 | tag: tip | |
1765 | user: test |
|
1765 | user: test | |
1766 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1766 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1767 | summary: a bunch of weird directories |
|
1767 | summary: a bunch of weird directories | |
1768 |
|
1768 | |||
1769 | changeset: -1:000000000000 |
|
1769 | changeset: -1:000000000000 | |
1770 | user: |
|
1770 | user: | |
1771 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1771 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1772 |
|
1772 | |||
1773 | $ hg log -r null:null |
|
1773 | $ hg log -r null:null | |
1774 | changeset: -1:000000000000 |
|
1774 | changeset: -1:000000000000 | |
1775 | user: |
|
1775 | user: | |
1776 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1776 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1777 |
|
1777 | |||
1778 | working-directory revision requires special treatment |
|
1778 | working-directory revision requires special treatment | |
1779 |
|
1779 | |||
|
1780 | clean: | |||
|
1781 | ||||
|
1782 | $ hg log -r 'wdir()' --debug | |||
|
1783 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff | |||
|
1784 | phase: draft | |||
|
1785 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 | |||
|
1786 | parent: -1:0000000000000000000000000000000000000000 | |||
|
1787 | user: test | |||
|
1788 | date: [A-Za-z0-9:+ ]+ (re) | |||
|
1789 | extra: branch=default | |||
|
1790 | ||||
|
1791 | ||||
|
1792 | dirty: | |||
|
1793 | ||||
|
1794 | $ echo 2 >> d1/f1 | |||
|
1795 | $ echo 2 > d1/f2 | |||
|
1796 | $ hg add d1/f2 | |||
|
1797 | $ hg remove .d6/f1 | |||
|
1798 | $ hg status | |||
|
1799 | M d1/f1 | |||
|
1800 | A d1/f2 | |||
|
1801 | R .d6/f1 | |||
|
1802 | ||||
1780 | $ hg log -r 'wdir()' |
|
1803 | $ hg log -r 'wdir()' | |
1781 | changeset: 2147483647:ffffffffffff |
|
1804 | changeset: 2147483647:ffffffffffff | |
1782 | parent: 0:65624cd9070a |
|
1805 | parent: 0:65624cd9070a | |
1783 | user: test |
|
1806 | user: test | |
1784 | date: [A-Za-z0-9:+ ]+ (re) |
|
1807 | date: [A-Za-z0-9:+ ]+ (re) | |
1785 |
|
1808 | |||
1786 | $ hg log -r 'wdir()' -q |
|
1809 | $ hg log -r 'wdir()' -q | |
1787 | 2147483647:ffffffffffff |
|
1810 | 2147483647:ffffffffffff | |
1788 |
|
1811 | |||
1789 | $ hg log -r 'wdir()' --debug |
|
1812 | $ hg log -r 'wdir()' --debug | |
1790 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
1813 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff | |
1791 | phase: draft |
|
1814 | phase: draft | |
1792 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
|
1815 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 | |
1793 | parent: -1:0000000000000000000000000000000000000000 |
|
1816 | parent: -1:0000000000000000000000000000000000000000 | |
1794 | user: test |
|
1817 | user: test | |
1795 | date: [A-Za-z0-9:+ ]+ (re) |
|
1818 | date: [A-Za-z0-9:+ ]+ (re) | |
|
1819 | files: d1/f1 | |||
|
1820 | files+: d1/f2 | |||
|
1821 | files-: .d6/f1 | |||
1796 | extra: branch=default |
|
1822 | extra: branch=default | |
1797 |
|
1823 | |||
1798 | $ hg log -r 'wdir()' -Tjson |
|
1824 | $ hg log -r 'wdir()' -Tjson | |
1799 | [ |
|
1825 | [ | |
1800 | { |
|
1826 | { | |
1801 | "rev": null, |
|
1827 | "rev": null, | |
1802 | "node": null, |
|
1828 | "node": null, | |
1803 | "branch": "default", |
|
1829 | "branch": "default", | |
1804 | "phase": "draft", |
|
1830 | "phase": "draft", | |
1805 | "user": "test", |
|
1831 | "user": "test", | |
1806 | "date": [*, 0], (glob) |
|
1832 | "date": [*, 0], (glob) | |
1807 | "desc": "", |
|
1833 | "desc": "", | |
1808 | "bookmarks": [], |
|
1834 | "bookmarks": [], | |
1809 | "tags": [], |
|
1835 | "tags": [], | |
1810 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] |
|
1836 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] | |
1811 | } |
|
1837 | } | |
1812 | ] |
|
1838 | ] | |
1813 |
|
1839 | |||
1814 | $ hg log -r 'wdir()' -Tjson -q |
|
1840 | $ hg log -r 'wdir()' -Tjson -q | |
1815 | [ |
|
1841 | [ | |
1816 | { |
|
1842 | { | |
1817 | "rev": null, |
|
1843 | "rev": null, | |
1818 | "node": null |
|
1844 | "node": null | |
1819 | } |
|
1845 | } | |
1820 | ] |
|
1846 | ] | |
1821 |
|
1847 | |||
1822 | $ hg log -r 'wdir()' -Tjson --debug |
|
1848 | $ hg log -r 'wdir()' -Tjson --debug | |
1823 | [ |
|
1849 | [ | |
1824 | { |
|
1850 | { | |
1825 | "rev": null, |
|
1851 | "rev": null, | |
1826 | "node": null, |
|
1852 | "node": null, | |
1827 | "branch": "default", |
|
1853 | "branch": "default", | |
1828 | "phase": "draft", |
|
1854 | "phase": "draft", | |
1829 | "user": "test", |
|
1855 | "user": "test", | |
1830 | "date": [*, 0], (glob) |
|
1856 | "date": [*, 0], (glob) | |
1831 | "desc": "", |
|
1857 | "desc": "", | |
1832 | "bookmarks": [], |
|
1858 | "bookmarks": [], | |
1833 | "tags": [], |
|
1859 | "tags": [], | |
1834 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
|
1860 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], | |
1835 | "manifest": null, |
|
1861 | "manifest": null, | |
1836 | "extra": {"branch": "default"}, |
|
1862 | "extra": {"branch": "default"}, | |
1837 | "modified": [], |
|
1863 | "modified": ["d1/f1"], | |
1838 | "added": [], |
|
1864 | "added": ["d1/f2"], | |
1839 | "removed": [] |
|
1865 | "removed": [".d6/f1"] | |
1840 | } |
|
1866 | } | |
1841 | ] |
|
1867 | ] | |
1842 |
|
1868 | |||
|
1869 | $ hg revert -aqC | |||
|
1870 | ||||
1843 | Check that adding an arbitrary name shows up in log automatically |
|
1871 | Check that adding an arbitrary name shows up in log automatically | |
1844 |
|
1872 | |||
1845 | $ cat > ../names.py <<EOF |
|
1873 | $ cat > ../names.py <<EOF | |
1846 | > """A small extension to test adding arbitrary names to a repo""" |
|
1874 | > """A small extension to test adding arbitrary names to a repo""" | |
1847 | > from mercurial.namespaces import namespace |
|
1875 | > from mercurial.namespaces import namespace | |
1848 | > |
|
1876 | > | |
1849 | > def reposetup(ui, repo): |
|
1877 | > def reposetup(ui, repo): | |
1850 | > foo = {'foo': repo[0].node()} |
|
1878 | > foo = {'foo': repo[0].node()} | |
1851 | > names = lambda r: foo.keys() |
|
1879 | > names = lambda r: foo.keys() | |
1852 | > namemap = lambda r, name: foo.get(name) |
|
1880 | > namemap = lambda r, name: foo.get(name) | |
1853 | > nodemap = lambda r, node: [name for name, n in foo.iteritems() |
|
1881 | > nodemap = lambda r, node: [name for name, n in foo.iteritems() | |
1854 | > if n == node] |
|
1882 | > if n == node] | |
1855 | > ns = namespace("bars", templatename="bar", logname="barlog", |
|
1883 | > ns = namespace("bars", templatename="bar", logname="barlog", | |
1856 | > colorname="barcolor", listnames=names, namemap=namemap, |
|
1884 | > colorname="barcolor", listnames=names, namemap=namemap, | |
1857 | > nodemap=nodemap) |
|
1885 | > nodemap=nodemap) | |
1858 | > |
|
1886 | > | |
1859 | > repo.names.addnamespace(ns) |
|
1887 | > repo.names.addnamespace(ns) | |
1860 | > EOF |
|
1888 | > EOF | |
1861 |
|
1889 | |||
1862 | $ hg --config extensions.names=../names.py log -r 0 |
|
1890 | $ hg --config extensions.names=../names.py log -r 0 | |
1863 | changeset: 0:65624cd9070a |
|
1891 | changeset: 0:65624cd9070a | |
1864 | tag: tip |
|
1892 | tag: tip | |
1865 | barlog: foo |
|
1893 | barlog: foo | |
1866 | user: test |
|
1894 | user: test | |
1867 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1895 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1868 | summary: a bunch of weird directories |
|
1896 | summary: a bunch of weird directories | |
1869 |
|
1897 | |||
1870 | $ hg --config extensions.names=../names.py \ |
|
1898 | $ hg --config extensions.names=../names.py \ | |
1871 | > --config extensions.color= --config color.log.barcolor=red \ |
|
1899 | > --config extensions.color= --config color.log.barcolor=red \ | |
1872 | > --color=always log -r 0 |
|
1900 | > --color=always log -r 0 | |
1873 | \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc) |
|
1901 | \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc) | |
1874 | tag: tip |
|
1902 | tag: tip | |
1875 | \x1b[0;31mbarlog: foo\x1b[0m (esc) |
|
1903 | \x1b[0;31mbarlog: foo\x1b[0m (esc) | |
1876 | user: test |
|
1904 | user: test | |
1877 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1905 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1878 | summary: a bunch of weird directories |
|
1906 | summary: a bunch of weird directories | |
1879 |
|
1907 | |||
1880 | $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n' |
|
1908 | $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n' | |
1881 | foo |
|
1909 | foo | |
1882 |
|
1910 | |||
1883 | $ cd .. |
|
1911 | $ cd .. | |
1884 |
|
1912 | |||
1885 | hg log -f dir across branches |
|
1913 | hg log -f dir across branches | |
1886 |
|
1914 | |||
1887 | $ hg init acrossbranches |
|
1915 | $ hg init acrossbranches | |
1888 | $ cd acrossbranches |
|
1916 | $ cd acrossbranches | |
1889 | $ mkdir d |
|
1917 | $ mkdir d | |
1890 | $ echo a > d/a && hg ci -Aqm a |
|
1918 | $ echo a > d/a && hg ci -Aqm a | |
1891 | $ echo b > d/a && hg ci -Aqm b |
|
1919 | $ echo b > d/a && hg ci -Aqm b | |
1892 | $ hg up -q 0 |
|
1920 | $ hg up -q 0 | |
1893 | $ echo b > d/a && hg ci -Aqm c |
|
1921 | $ echo b > d/a && hg ci -Aqm c | |
1894 | $ hg log -f d -T '{desc}' -G |
|
1922 | $ hg log -f d -T '{desc}' -G | |
1895 | @ c |
|
1923 | @ c | |
1896 | | |
|
1924 | | | |
1897 | o a |
|
1925 | o a | |
1898 |
|
1926 | |||
1899 | Ensure that largefiles doesn't interfere with following a normal file |
|
1927 | Ensure that largefiles doesn't interfere with following a normal file | |
1900 | $ hg --config extensions.largefiles= log -f d -T '{desc}' -G |
|
1928 | $ hg --config extensions.largefiles= log -f d -T '{desc}' -G | |
1901 | @ c |
|
1929 | @ c | |
1902 | | |
|
1930 | | | |
1903 | o a |
|
1931 | o a | |
1904 |
|
1932 | |||
1905 | $ hg log -f d/a -T '{desc}' -G |
|
1933 | $ hg log -f d/a -T '{desc}' -G | |
1906 | @ c |
|
1934 | @ c | |
1907 | | |
|
1935 | | | |
1908 | o a |
|
1936 | o a | |
1909 |
|
1937 | |||
1910 | $ cd .. |
|
1938 | $ cd .. | |
1911 |
|
1939 | |||
1912 | hg log -f with linkrev pointing to another branch |
|
1940 | hg log -f with linkrev pointing to another branch | |
1913 | ------------------------------------------------- |
|
1941 | ------------------------------------------------- | |
1914 |
|
1942 | |||
1915 | create history with a filerev whose linkrev points to another branch |
|
1943 | create history with a filerev whose linkrev points to another branch | |
1916 |
|
1944 | |||
1917 | $ hg init branchedlinkrev |
|
1945 | $ hg init branchedlinkrev | |
1918 | $ cd branchedlinkrev |
|
1946 | $ cd branchedlinkrev | |
1919 | $ echo 1 > a |
|
1947 | $ echo 1 > a | |
1920 | $ hg commit -Am 'content1' |
|
1948 | $ hg commit -Am 'content1' | |
1921 | adding a |
|
1949 | adding a | |
1922 | $ echo 2 > a |
|
1950 | $ echo 2 > a | |
1923 | $ hg commit -m 'content2' |
|
1951 | $ hg commit -m 'content2' | |
1924 | $ hg up --rev 'desc(content1)' |
|
1952 | $ hg up --rev 'desc(content1)' | |
1925 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1953 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1926 | $ echo unrelated > unrelated |
|
1954 | $ echo unrelated > unrelated | |
1927 | $ hg commit -Am 'unrelated' |
|
1955 | $ hg commit -Am 'unrelated' | |
1928 | adding unrelated |
|
1956 | adding unrelated | |
1929 | created new head |
|
1957 | created new head | |
1930 | $ hg graft -r 'desc(content2)' |
|
1958 | $ hg graft -r 'desc(content2)' | |
1931 | grafting 1:2294ae80ad84 "content2" |
|
1959 | grafting 1:2294ae80ad84 "content2" | |
1932 | $ echo 3 > a |
|
1960 | $ echo 3 > a | |
1933 | $ hg commit -m 'content3' |
|
1961 | $ hg commit -m 'content3' | |
1934 | $ hg log -G |
|
1962 | $ hg log -G | |
1935 | @ changeset: 4:50b9b36e9c5d |
|
1963 | @ changeset: 4:50b9b36e9c5d | |
1936 | | tag: tip |
|
1964 | | tag: tip | |
1937 | | user: test |
|
1965 | | user: test | |
1938 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1966 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1939 | | summary: content3 |
|
1967 | | summary: content3 | |
1940 | | |
|
1968 | | | |
1941 | o changeset: 3:15b2327059e5 |
|
1969 | o changeset: 3:15b2327059e5 | |
1942 | | user: test |
|
1970 | | user: test | |
1943 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1971 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1944 | | summary: content2 |
|
1972 | | summary: content2 | |
1945 | | |
|
1973 | | | |
1946 | o changeset: 2:2029acd1168c |
|
1974 | o changeset: 2:2029acd1168c | |
1947 | | parent: 0:ae0a3c9f9e95 |
|
1975 | | parent: 0:ae0a3c9f9e95 | |
1948 | | user: test |
|
1976 | | user: test | |
1949 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1977 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1950 | | summary: unrelated |
|
1978 | | summary: unrelated | |
1951 | | |
|
1979 | | | |
1952 | | o changeset: 1:2294ae80ad84 |
|
1980 | | o changeset: 1:2294ae80ad84 | |
1953 | |/ user: test |
|
1981 | |/ user: test | |
1954 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1982 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1955 | | summary: content2 |
|
1983 | | summary: content2 | |
1956 | | |
|
1984 | | | |
1957 | o changeset: 0:ae0a3c9f9e95 |
|
1985 | o changeset: 0:ae0a3c9f9e95 | |
1958 | user: test |
|
1986 | user: test | |
1959 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1987 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1960 | summary: content1 |
|
1988 | summary: content1 | |
1961 |
|
1989 | |||
1962 |
|
1990 | |||
1963 | log -f on the file should list the graft result. |
|
1991 | log -f on the file should list the graft result. | |
1964 |
|
1992 | |||
1965 | $ hg log -Gf a |
|
1993 | $ hg log -Gf a | |
1966 | @ changeset: 4:50b9b36e9c5d |
|
1994 | @ changeset: 4:50b9b36e9c5d | |
1967 | | tag: tip |
|
1995 | | tag: tip | |
1968 | | user: test |
|
1996 | | user: test | |
1969 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1997 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1970 | | summary: content3 |
|
1998 | | summary: content3 | |
1971 | | |
|
1999 | | | |
1972 | o changeset: 3:15b2327059e5 |
|
2000 | o changeset: 3:15b2327059e5 | |
1973 | | user: test |
|
2001 | | user: test | |
1974 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2002 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1975 | | summary: content2 |
|
2003 | | summary: content2 | |
1976 | | |
|
2004 | | | |
1977 | o changeset: 0:ae0a3c9f9e95 |
|
2005 | o changeset: 0:ae0a3c9f9e95 | |
1978 | user: test |
|
2006 | user: test | |
1979 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2007 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1980 | summary: content1 |
|
2008 | summary: content1 | |
1981 |
|
2009 | |||
1982 |
|
2010 | |||
1983 | plain log lists the original version |
|
2011 | plain log lists the original version | |
1984 | (XXX we should probably list both) |
|
2012 | (XXX we should probably list both) | |
1985 |
|
2013 | |||
1986 | $ hg log -G a |
|
2014 | $ hg log -G a | |
1987 | @ changeset: 4:50b9b36e9c5d |
|
2015 | @ changeset: 4:50b9b36e9c5d | |
1988 | | tag: tip |
|
2016 | | tag: tip | |
1989 | | user: test |
|
2017 | | user: test | |
1990 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2018 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1991 | | summary: content3 |
|
2019 | | summary: content3 | |
1992 | | |
|
2020 | | | |
1993 | | o changeset: 1:2294ae80ad84 |
|
2021 | | o changeset: 1:2294ae80ad84 | |
1994 | |/ user: test |
|
2022 | |/ user: test | |
1995 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2023 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1996 | | summary: content2 |
|
2024 | | summary: content2 | |
1997 | | |
|
2025 | | | |
1998 | o changeset: 0:ae0a3c9f9e95 |
|
2026 | o changeset: 0:ae0a3c9f9e95 | |
1999 | user: test |
|
2027 | user: test | |
2000 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2028 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2001 | summary: content1 |
|
2029 | summary: content1 | |
2002 |
|
2030 | |||
2003 |
|
2031 | |||
2004 | hg log -f from the grafted changeset |
|
2032 | hg log -f from the grafted changeset | |
2005 | (The bootstrap should properly take the topology in account) |
|
2033 | (The bootstrap should properly take the topology in account) | |
2006 |
|
2034 | |||
2007 | $ hg up 'desc(content3)^' |
|
2035 | $ hg up 'desc(content3)^' | |
2008 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2036 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2009 | $ hg log -Gf a |
|
2037 | $ hg log -Gf a | |
2010 | @ changeset: 3:15b2327059e5 |
|
2038 | @ changeset: 3:15b2327059e5 | |
2011 | | user: test |
|
2039 | | user: test | |
2012 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2040 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2013 | | summary: content2 |
|
2041 | | summary: content2 | |
2014 | | |
|
2042 | | | |
2015 | o changeset: 0:ae0a3c9f9e95 |
|
2043 | o changeset: 0:ae0a3c9f9e95 | |
2016 | user: test |
|
2044 | user: test | |
2017 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2045 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2018 | summary: content1 |
|
2046 | summary: content1 | |
2019 |
|
2047 | |||
2020 |
|
2048 | |||
2021 | Test that we use the first non-hidden changeset in that case. |
|
2049 | Test that we use the first non-hidden changeset in that case. | |
2022 |
|
2050 | |||
2023 | (hide the changeset) |
|
2051 | (hide the changeset) | |
2024 |
|
2052 | |||
2025 | $ hg log -T '{node}\n' -r 1 |
|
2053 | $ hg log -T '{node}\n' -r 1 | |
2026 | 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2054 | 2294ae80ad8447bc78383182eeac50cb049df623 | |
2027 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2055 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 | |
2028 | $ hg log -G |
|
2056 | $ hg log -G | |
2029 | o changeset: 4:50b9b36e9c5d |
|
2057 | o changeset: 4:50b9b36e9c5d | |
2030 | | tag: tip |
|
2058 | | tag: tip | |
2031 | | user: test |
|
2059 | | user: test | |
2032 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2060 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2033 | | summary: content3 |
|
2061 | | summary: content3 | |
2034 | | |
|
2062 | | | |
2035 | @ changeset: 3:15b2327059e5 |
|
2063 | @ changeset: 3:15b2327059e5 | |
2036 | | user: test |
|
2064 | | user: test | |
2037 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2065 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2038 | | summary: content2 |
|
2066 | | summary: content2 | |
2039 | | |
|
2067 | | | |
2040 | o changeset: 2:2029acd1168c |
|
2068 | o changeset: 2:2029acd1168c | |
2041 | | parent: 0:ae0a3c9f9e95 |
|
2069 | | parent: 0:ae0a3c9f9e95 | |
2042 | | user: test |
|
2070 | | user: test | |
2043 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2071 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2044 | | summary: unrelated |
|
2072 | | summary: unrelated | |
2045 | | |
|
2073 | | | |
2046 | o changeset: 0:ae0a3c9f9e95 |
|
2074 | o changeset: 0:ae0a3c9f9e95 | |
2047 | user: test |
|
2075 | user: test | |
2048 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2076 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2049 | summary: content1 |
|
2077 | summary: content1 | |
2050 |
|
2078 | |||
2051 |
|
2079 | |||
2052 | Check that log on the file does not drop the file revision. |
|
2080 | Check that log on the file does not drop the file revision. | |
2053 |
|
2081 | |||
2054 | $ hg log -G a |
|
2082 | $ hg log -G a | |
2055 | o changeset: 4:50b9b36e9c5d |
|
2083 | o changeset: 4:50b9b36e9c5d | |
2056 | | tag: tip |
|
2084 | | tag: tip | |
2057 | | user: test |
|
2085 | | user: test | |
2058 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2086 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2059 | | summary: content3 |
|
2087 | | summary: content3 | |
2060 | | |
|
2088 | | | |
2061 | @ changeset: 3:15b2327059e5 |
|
2089 | @ changeset: 3:15b2327059e5 | |
2062 | | user: test |
|
2090 | | user: test | |
2063 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2091 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2064 | | summary: content2 |
|
2092 | | summary: content2 | |
2065 | | |
|
2093 | | | |
2066 | o changeset: 0:ae0a3c9f9e95 |
|
2094 | o changeset: 0:ae0a3c9f9e95 | |
2067 | user: test |
|
2095 | user: test | |
2068 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2096 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2069 | summary: content1 |
|
2097 | summary: content1 | |
2070 |
|
2098 | |||
2071 |
|
2099 | |||
2072 | Even when a head revision is linkrev-shadowed. |
|
2100 | Even when a head revision is linkrev-shadowed. | |
2073 |
|
2101 | |||
2074 | $ hg log -T '{node}\n' -r 4 |
|
2102 | $ hg log -T '{node}\n' -r 4 | |
2075 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2103 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 | |
2076 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2104 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 | |
2077 | $ hg log -G a |
|
2105 | $ hg log -G a | |
2078 | @ changeset: 3:15b2327059e5 |
|
2106 | @ changeset: 3:15b2327059e5 | |
2079 | | tag: tip |
|
2107 | | tag: tip | |
2080 | | user: test |
|
2108 | | user: test | |
2081 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2109 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2082 | | summary: content2 |
|
2110 | | summary: content2 | |
2083 | | |
|
2111 | | | |
2084 | o changeset: 0:ae0a3c9f9e95 |
|
2112 | o changeset: 0:ae0a3c9f9e95 | |
2085 | user: test |
|
2113 | user: test | |
2086 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2114 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2087 | summary: content1 |
|
2115 | summary: content1 | |
2088 |
|
2116 | |||
2089 |
|
2117 | |||
2090 | $ cd .. |
|
2118 | $ cd .. | |
2091 |
|
2119 | |||
2092 | Even when the file revision is missing from some head: |
|
2120 | Even when the file revision is missing from some head: | |
2093 |
|
2121 | |||
2094 | $ hg init issue4490 |
|
2122 | $ hg init issue4490 | |
2095 | $ cd issue4490 |
|
2123 | $ cd issue4490 | |
2096 | $ echo '[experimental]' >> .hg/hgrc |
|
2124 | $ echo '[experimental]' >> .hg/hgrc | |
2097 | $ echo 'evolution=createmarkers' >> .hg/hgrc |
|
2125 | $ echo 'evolution=createmarkers' >> .hg/hgrc | |
2098 | $ echo a > a |
|
2126 | $ echo a > a | |
2099 | $ hg ci -Am0 |
|
2127 | $ hg ci -Am0 | |
2100 | adding a |
|
2128 | adding a | |
2101 | $ echo b > b |
|
2129 | $ echo b > b | |
2102 | $ hg ci -Am1 |
|
2130 | $ hg ci -Am1 | |
2103 | adding b |
|
2131 | adding b | |
2104 | $ echo B > b |
|
2132 | $ echo B > b | |
2105 | $ hg ci --amend -m 1 |
|
2133 | $ hg ci --amend -m 1 | |
2106 | $ hg up 0 |
|
2134 | $ hg up 0 | |
2107 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2135 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2108 | $ echo c > c |
|
2136 | $ echo c > c | |
2109 | $ hg ci -Am2 |
|
2137 | $ hg ci -Am2 | |
2110 | adding c |
|
2138 | adding c | |
2111 | created new head |
|
2139 | created new head | |
2112 | $ hg up 'head() and not .' |
|
2140 | $ hg up 'head() and not .' | |
2113 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2141 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2114 | $ hg log -G |
|
2142 | $ hg log -G | |
2115 | o changeset: 4:db815d6d32e6 |
|
2143 | o changeset: 4:db815d6d32e6 | |
2116 | | tag: tip |
|
2144 | | tag: tip | |
2117 | | parent: 0:f7b1eb17ad24 |
|
2145 | | parent: 0:f7b1eb17ad24 | |
2118 | | user: test |
|
2146 | | user: test | |
2119 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2147 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2120 | | summary: 2 |
|
2148 | | summary: 2 | |
2121 | | |
|
2149 | | | |
2122 | | @ changeset: 3:9bc8ce7f9356 |
|
2150 | | @ changeset: 3:9bc8ce7f9356 | |
2123 | |/ parent: 0:f7b1eb17ad24 |
|
2151 | |/ parent: 0:f7b1eb17ad24 | |
2124 | | user: test |
|
2152 | | user: test | |
2125 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2153 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2126 | | summary: 1 |
|
2154 | | summary: 1 | |
2127 | | |
|
2155 | | | |
2128 | o changeset: 0:f7b1eb17ad24 |
|
2156 | o changeset: 0:f7b1eb17ad24 | |
2129 | user: test |
|
2157 | user: test | |
2130 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2158 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2131 | summary: 0 |
|
2159 | summary: 0 | |
2132 |
|
2160 | |||
2133 | $ hg log -f -G b |
|
2161 | $ hg log -f -G b | |
2134 | @ changeset: 3:9bc8ce7f9356 |
|
2162 | @ changeset: 3:9bc8ce7f9356 | |
2135 | | parent: 0:f7b1eb17ad24 |
|
2163 | | parent: 0:f7b1eb17ad24 | |
2136 | | user: test |
|
2164 | | user: test | |
2137 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2165 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2138 | | summary: 1 |
|
2166 | | summary: 1 | |
2139 | | |
|
2167 | | | |
2140 | $ hg log -G b |
|
2168 | $ hg log -G b | |
2141 | @ changeset: 3:9bc8ce7f9356 |
|
2169 | @ changeset: 3:9bc8ce7f9356 | |
2142 | | parent: 0:f7b1eb17ad24 |
|
2170 | | parent: 0:f7b1eb17ad24 | |
2143 | | user: test |
|
2171 | | user: test | |
2144 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2172 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2145 | | summary: 1 |
|
2173 | | summary: 1 | |
2146 | | |
|
2174 | | | |
2147 | $ cd .. |
|
2175 | $ cd .. | |
2148 |
|
2176 | |||
2149 | Check proper report when the manifest changes but not the file issue4499 |
|
2177 | Check proper report when the manifest changes but not the file issue4499 | |
2150 | ------------------------------------------------------------------------ |
|
2178 | ------------------------------------------------------------------------ | |
2151 |
|
2179 | |||
2152 | $ hg init issue4499 |
|
2180 | $ hg init issue4499 | |
2153 | $ cd issue4499 |
|
2181 | $ cd issue4499 | |
2154 | $ for f in A B C D F E G H I J K L M N O P Q R S T U; do |
|
2182 | $ for f in A B C D F E G H I J K L M N O P Q R S T U; do | |
2155 | > echo 1 > $f; |
|
2183 | > echo 1 > $f; | |
2156 | > hg add $f; |
|
2184 | > hg add $f; | |
2157 | > done |
|
2185 | > done | |
2158 | $ hg commit -m 'A1B1C1' |
|
2186 | $ hg commit -m 'A1B1C1' | |
2159 | $ echo 2 > A |
|
2187 | $ echo 2 > A | |
2160 | $ echo 2 > B |
|
2188 | $ echo 2 > B | |
2161 | $ echo 2 > C |
|
2189 | $ echo 2 > C | |
2162 | $ hg commit -m 'A2B2C2' |
|
2190 | $ hg commit -m 'A2B2C2' | |
2163 | $ hg up 0 |
|
2191 | $ hg up 0 | |
2164 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2192 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2165 | $ echo 3 > A |
|
2193 | $ echo 3 > A | |
2166 | $ echo 2 > B |
|
2194 | $ echo 2 > B | |
2167 | $ echo 2 > C |
|
2195 | $ echo 2 > C | |
2168 | $ hg commit -m 'A3B2C2' |
|
2196 | $ hg commit -m 'A3B2C2' | |
2169 | created new head |
|
2197 | created new head | |
2170 |
|
2198 | |||
2171 | $ hg log -G |
|
2199 | $ hg log -G | |
2172 | @ changeset: 2:fe5fc3d0eb17 |
|
2200 | @ changeset: 2:fe5fc3d0eb17 | |
2173 | | tag: tip |
|
2201 | | tag: tip | |
2174 | | parent: 0:abf4f0e38563 |
|
2202 | | parent: 0:abf4f0e38563 | |
2175 | | user: test |
|
2203 | | user: test | |
2176 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2204 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2177 | | summary: A3B2C2 |
|
2205 | | summary: A3B2C2 | |
2178 | | |
|
2206 | | | |
2179 | | o changeset: 1:07dcc6b312c0 |
|
2207 | | o changeset: 1:07dcc6b312c0 | |
2180 | |/ user: test |
|
2208 | |/ user: test | |
2181 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2209 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2182 | | summary: A2B2C2 |
|
2210 | | summary: A2B2C2 | |
2183 | | |
|
2211 | | | |
2184 | o changeset: 0:abf4f0e38563 |
|
2212 | o changeset: 0:abf4f0e38563 | |
2185 | user: test |
|
2213 | user: test | |
2186 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2214 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2187 | summary: A1B1C1 |
|
2215 | summary: A1B1C1 | |
2188 |
|
2216 | |||
2189 |
|
2217 | |||
2190 | Log -f on B should reports current changesets |
|
2218 | Log -f on B should reports current changesets | |
2191 |
|
2219 | |||
2192 | $ hg log -fG B |
|
2220 | $ hg log -fG B | |
2193 | @ changeset: 2:fe5fc3d0eb17 |
|
2221 | @ changeset: 2:fe5fc3d0eb17 | |
2194 | | tag: tip |
|
2222 | | tag: tip | |
2195 | | parent: 0:abf4f0e38563 |
|
2223 | | parent: 0:abf4f0e38563 | |
2196 | | user: test |
|
2224 | | user: test | |
2197 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2225 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2198 | | summary: A3B2C2 |
|
2226 | | summary: A3B2C2 | |
2199 | | |
|
2227 | | | |
2200 | o changeset: 0:abf4f0e38563 |
|
2228 | o changeset: 0:abf4f0e38563 | |
2201 | user: test |
|
2229 | user: test | |
2202 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2230 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2203 | summary: A1B1C1 |
|
2231 | summary: A1B1C1 | |
2204 |
|
2232 | |||
2205 | $ cd .. |
|
2233 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now