Show More
@@ -1,1313 +1,1322 b'' | |||||
1 | The g is crafted to have 2 filelog topological heads in a linear |
|
1 | The g is crafted to have 2 filelog topological heads in a linear | |
2 | changeset graph |
|
2 | changeset graph | |
3 |
|
3 | |||
4 | $ hg init a |
|
4 | $ hg init a | |
5 | $ cd a |
|
5 | $ cd a | |
6 | $ echo a > a |
|
6 | $ echo a > a | |
7 | $ echo f > f |
|
7 | $ echo f > f | |
8 | $ hg ci -Ama -d '1 0' |
|
8 | $ hg ci -Ama -d '1 0' | |
9 | adding a |
|
9 | adding a | |
10 | adding f |
|
10 | adding f | |
11 |
|
11 | |||
12 | $ hg cp a b |
|
12 | $ hg cp a b | |
13 | $ hg cp f g |
|
13 | $ hg cp f g | |
14 | $ hg ci -mb -d '2 0' |
|
14 | $ hg ci -mb -d '2 0' | |
15 |
|
15 | |||
16 | $ mkdir dir |
|
16 | $ mkdir dir | |
17 | $ hg mv b dir |
|
17 | $ hg mv b dir | |
18 | $ echo g >> g |
|
18 | $ echo g >> g | |
19 | $ echo f >> f |
|
19 | $ echo f >> f | |
20 | $ hg ci -mc -d '3 0' |
|
20 | $ hg ci -mc -d '3 0' | |
21 |
|
21 | |||
22 | $ hg mv a b |
|
22 | $ hg mv a b | |
23 | $ hg cp -f f g |
|
23 | $ hg cp -f f g | |
24 | $ echo a > d |
|
24 | $ echo a > d | |
25 | $ hg add d |
|
25 | $ hg add d | |
26 | $ hg ci -md -d '4 0' |
|
26 | $ hg ci -md -d '4 0' | |
27 |
|
27 | |||
28 | $ hg mv dir/b e |
|
28 | $ hg mv dir/b e | |
29 | $ hg ci -me -d '5 0' |
|
29 | $ hg ci -me -d '5 0' | |
30 |
|
30 | |||
31 | $ hg log a |
|
31 | $ hg log a | |
32 | changeset: 0:9161b9aeaf16 |
|
32 | changeset: 0:9161b9aeaf16 | |
33 | user: test |
|
33 | user: test | |
34 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
34 | date: Thu Jan 01 00:00:01 1970 +0000 | |
35 | summary: a |
|
35 | summary: a | |
36 |
|
36 | |||
37 | log on directory |
|
37 | log on directory | |
38 |
|
38 | |||
39 | $ hg log dir |
|
39 | $ hg log dir | |
40 | changeset: 4:7e4639b4691b |
|
40 | changeset: 4:7e4639b4691b | |
41 | tag: tip |
|
41 | tag: tip | |
42 | user: test |
|
42 | user: test | |
43 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
43 | date: Thu Jan 01 00:00:05 1970 +0000 | |
44 | summary: e |
|
44 | summary: e | |
45 |
|
45 | |||
46 | changeset: 2:f8954cd4dc1f |
|
46 | changeset: 2:f8954cd4dc1f | |
47 | user: test |
|
47 | user: test | |
48 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
48 | date: Thu Jan 01 00:00:03 1970 +0000 | |
49 | summary: c |
|
49 | summary: c | |
50 |
|
50 | |||
51 | $ hg log somethingthatdoesntexist dir |
|
51 | $ hg log somethingthatdoesntexist dir | |
52 | changeset: 4:7e4639b4691b |
|
52 | changeset: 4:7e4639b4691b | |
53 | tag: tip |
|
53 | tag: tip | |
54 | user: test |
|
54 | user: test | |
55 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
55 | date: Thu Jan 01 00:00:05 1970 +0000 | |
56 | summary: e |
|
56 | summary: e | |
57 |
|
57 | |||
58 | changeset: 2:f8954cd4dc1f |
|
58 | changeset: 2:f8954cd4dc1f | |
59 | user: test |
|
59 | user: test | |
60 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
60 | date: Thu Jan 01 00:00:03 1970 +0000 | |
61 | summary: c |
|
61 | summary: c | |
62 |
|
62 | |||
63 |
|
63 | |||
64 | -f, directory |
|
64 | -f, directory | |
65 |
|
65 | |||
66 | $ hg log -f dir |
|
66 | $ hg log -f dir | |
67 | abort: cannot follow file not in parent revision: "dir" |
|
67 | abort: cannot follow file not in parent revision: "dir" | |
68 | [255] |
|
68 | [255] | |
69 |
|
69 | |||
70 | -f, but no args |
|
70 | -f, but no args | |
71 |
|
71 | |||
72 | $ hg log -f |
|
72 | $ hg log -f | |
73 | changeset: 4:7e4639b4691b |
|
73 | changeset: 4:7e4639b4691b | |
74 | tag: tip |
|
74 | tag: tip | |
75 | user: test |
|
75 | user: test | |
76 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
76 | date: Thu Jan 01 00:00:05 1970 +0000 | |
77 | summary: e |
|
77 | summary: e | |
78 |
|
78 | |||
79 | changeset: 3:2ca5ba701980 |
|
79 | changeset: 3:2ca5ba701980 | |
80 | user: test |
|
80 | user: test | |
81 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
81 | date: Thu Jan 01 00:00:04 1970 +0000 | |
82 | summary: d |
|
82 | summary: d | |
83 |
|
83 | |||
84 | changeset: 2:f8954cd4dc1f |
|
84 | changeset: 2:f8954cd4dc1f | |
85 | user: test |
|
85 | user: test | |
86 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
86 | date: Thu Jan 01 00:00:03 1970 +0000 | |
87 | summary: c |
|
87 | summary: c | |
88 |
|
88 | |||
89 | changeset: 1:d89b0a12d229 |
|
89 | changeset: 1:d89b0a12d229 | |
90 | user: test |
|
90 | user: test | |
91 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
91 | date: Thu Jan 01 00:00:02 1970 +0000 | |
92 | summary: b |
|
92 | summary: b | |
93 |
|
93 | |||
94 | changeset: 0:9161b9aeaf16 |
|
94 | changeset: 0:9161b9aeaf16 | |
95 | user: test |
|
95 | user: test | |
96 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
96 | date: Thu Jan 01 00:00:01 1970 +0000 | |
97 | summary: a |
|
97 | summary: a | |
98 |
|
98 | |||
99 |
|
99 | |||
100 | one rename |
|
100 | one rename | |
101 |
|
101 | |||
102 | $ hg up -q 2 |
|
102 | $ hg up -q 2 | |
103 | $ hg log -vf a |
|
103 | $ hg log -vf a | |
104 | changeset: 0:9161b9aeaf16 |
|
104 | changeset: 0:9161b9aeaf16 | |
105 | user: test |
|
105 | user: test | |
106 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
106 | date: Thu Jan 01 00:00:01 1970 +0000 | |
107 | files: a f |
|
107 | files: a f | |
108 | description: |
|
108 | description: | |
109 | a |
|
109 | a | |
110 |
|
110 | |||
111 |
|
111 | |||
112 |
|
112 | |||
113 | many renames |
|
113 | many renames | |
114 |
|
114 | |||
115 | $ hg up -q tip |
|
115 | $ hg up -q tip | |
116 | $ hg log -vf e |
|
116 | $ hg log -vf e | |
117 | changeset: 4:7e4639b4691b |
|
117 | changeset: 4:7e4639b4691b | |
118 | tag: tip |
|
118 | tag: tip | |
119 | user: test |
|
119 | user: test | |
120 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
120 | date: Thu Jan 01 00:00:05 1970 +0000 | |
121 | files: dir/b e |
|
121 | files: dir/b e | |
122 | description: |
|
122 | description: | |
123 | e |
|
123 | e | |
124 |
|
124 | |||
125 |
|
125 | |||
126 | changeset: 2:f8954cd4dc1f |
|
126 | changeset: 2:f8954cd4dc1f | |
127 | user: test |
|
127 | user: test | |
128 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
128 | date: Thu Jan 01 00:00:03 1970 +0000 | |
129 | files: b dir/b f g |
|
129 | files: b dir/b f g | |
130 | description: |
|
130 | description: | |
131 | c |
|
131 | c | |
132 |
|
132 | |||
133 |
|
133 | |||
134 | changeset: 1:d89b0a12d229 |
|
134 | changeset: 1:d89b0a12d229 | |
135 | user: test |
|
135 | user: test | |
136 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
136 | date: Thu Jan 01 00:00:02 1970 +0000 | |
137 | files: b g |
|
137 | files: b g | |
138 | description: |
|
138 | description: | |
139 | b |
|
139 | b | |
140 |
|
140 | |||
141 |
|
141 | |||
142 | changeset: 0:9161b9aeaf16 |
|
142 | changeset: 0:9161b9aeaf16 | |
143 | user: test |
|
143 | user: test | |
144 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
144 | date: Thu Jan 01 00:00:01 1970 +0000 | |
145 | files: a f |
|
145 | files: a f | |
146 | description: |
|
146 | description: | |
147 | a |
|
147 | a | |
148 |
|
148 | |||
149 |
|
149 | |||
150 |
|
150 | |||
151 |
|
151 | |||
152 | log -pf dir/b |
|
152 | log -pf dir/b | |
153 |
|
153 | |||
154 | $ hg up -q 3 |
|
154 | $ hg up -q 3 | |
155 | $ hg log -pf dir/b |
|
155 | $ hg log -pf dir/b | |
156 | changeset: 2:f8954cd4dc1f |
|
156 | changeset: 2:f8954cd4dc1f | |
157 | user: test |
|
157 | user: test | |
158 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
158 | date: Thu Jan 01 00:00:03 1970 +0000 | |
159 | summary: c |
|
159 | summary: c | |
160 |
|
160 | |||
161 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
161 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
162 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
162 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
163 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
163 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
164 | @@ -0,0 +1,1 @@ |
|
164 | @@ -0,0 +1,1 @@ | |
165 | +a |
|
165 | +a | |
166 |
|
166 | |||
167 | changeset: 1:d89b0a12d229 |
|
167 | changeset: 1:d89b0a12d229 | |
168 | user: test |
|
168 | user: test | |
169 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
169 | date: Thu Jan 01 00:00:02 1970 +0000 | |
170 | summary: b |
|
170 | summary: b | |
171 |
|
171 | |||
172 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
172 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
173 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
173 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
174 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
174 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
175 | @@ -0,0 +1,1 @@ |
|
175 | @@ -0,0 +1,1 @@ | |
176 | +a |
|
176 | +a | |
177 |
|
177 | |||
178 | changeset: 0:9161b9aeaf16 |
|
178 | changeset: 0:9161b9aeaf16 | |
179 | user: test |
|
179 | user: test | |
180 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
180 | date: Thu Jan 01 00:00:01 1970 +0000 | |
181 | summary: a |
|
181 | summary: a | |
182 |
|
182 | |||
183 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
183 | diff -r 000000000000 -r 9161b9aeaf16 a | |
184 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
184 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
185 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
185 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
186 | @@ -0,0 +1,1 @@ |
|
186 | @@ -0,0 +1,1 @@ | |
187 | +a |
|
187 | +a | |
188 |
|
188 | |||
189 |
|
189 | |||
190 | log -vf dir/b |
|
190 | log -vf dir/b | |
191 |
|
191 | |||
192 | $ hg log -vf dir/b |
|
192 | $ hg log -vf dir/b | |
193 | changeset: 2:f8954cd4dc1f |
|
193 | changeset: 2:f8954cd4dc1f | |
194 | user: test |
|
194 | user: test | |
195 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
195 | date: Thu Jan 01 00:00:03 1970 +0000 | |
196 | files: b dir/b f g |
|
196 | files: b dir/b f g | |
197 | description: |
|
197 | description: | |
198 | c |
|
198 | c | |
199 |
|
199 | |||
200 |
|
200 | |||
201 | changeset: 1:d89b0a12d229 |
|
201 | changeset: 1:d89b0a12d229 | |
202 | user: test |
|
202 | user: test | |
203 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
203 | date: Thu Jan 01 00:00:02 1970 +0000 | |
204 | files: b g |
|
204 | files: b g | |
205 | description: |
|
205 | description: | |
206 | b |
|
206 | b | |
207 |
|
207 | |||
208 |
|
208 | |||
209 | changeset: 0:9161b9aeaf16 |
|
209 | changeset: 0:9161b9aeaf16 | |
210 | user: test |
|
210 | user: test | |
211 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
211 | date: Thu Jan 01 00:00:01 1970 +0000 | |
212 | files: a f |
|
212 | files: a f | |
213 | description: |
|
213 | description: | |
214 | a |
|
214 | a | |
215 |
|
215 | |||
216 |
|
216 | |||
217 |
|
217 | |||
218 |
|
218 | |||
219 | -f and multiple filelog heads |
|
219 | -f and multiple filelog heads | |
220 |
|
220 | |||
221 | $ hg up -q 2 |
|
221 | $ hg up -q 2 | |
222 | $ hg log -f g --template '{rev}\n' |
|
222 | $ hg log -f g --template '{rev}\n' | |
223 | 2 |
|
223 | 2 | |
224 | 1 |
|
224 | 1 | |
225 | 0 |
|
225 | 0 | |
226 | $ hg up -q tip |
|
226 | $ hg up -q tip | |
227 | $ hg log -f g --template '{rev}\n' |
|
227 | $ hg log -f g --template '{rev}\n' | |
228 | 3 |
|
228 | 3 | |
229 | 2 |
|
229 | 2 | |
230 | 0 |
|
230 | 0 | |
231 |
|
231 | |||
232 |
|
232 | |||
233 | log copies with --copies |
|
233 | log copies with --copies | |
234 |
|
234 | |||
235 | $ hg log -vC --template '{rev} {file_copies}\n' |
|
235 | $ hg log -vC --template '{rev} {file_copies}\n' | |
236 | 4 e (dir/b) |
|
236 | 4 e (dir/b) | |
237 | 3 b (a)g (f) |
|
237 | 3 b (a)g (f) | |
238 | 2 dir/b (b) |
|
238 | 2 dir/b (b) | |
239 | 1 b (a)g (f) |
|
239 | 1 b (a)g (f) | |
240 | 0 |
|
240 | 0 | |
241 |
|
241 | |||
242 | log copies switch without --copies, with old filecopy template |
|
242 | log copies switch without --copies, with old filecopy template | |
243 |
|
243 | |||
244 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
244 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' | |
245 | 4 |
|
245 | 4 | |
246 | 3 |
|
246 | 3 | |
247 | 2 |
|
247 | 2 | |
248 | 1 |
|
248 | 1 | |
249 | 0 |
|
249 | 0 | |
250 |
|
250 | |||
251 | log copies switch with --copies |
|
251 | log copies switch with --copies | |
252 |
|
252 | |||
253 | $ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
253 | $ hg log -vC --template '{rev} {file_copies_switch}\n' | |
254 | 4 e (dir/b) |
|
254 | 4 e (dir/b) | |
255 | 3 b (a)g (f) |
|
255 | 3 b (a)g (f) | |
256 | 2 dir/b (b) |
|
256 | 2 dir/b (b) | |
257 | 1 b (a)g (f) |
|
257 | 1 b (a)g (f) | |
258 | 0 |
|
258 | 0 | |
259 |
|
259 | |||
260 |
|
260 | |||
261 | log copies with hardcoded style and with --style=default |
|
261 | log copies with hardcoded style and with --style=default | |
262 |
|
262 | |||
263 | $ hg log -vC -r4 |
|
263 | $ hg log -vC -r4 | |
264 | changeset: 4:7e4639b4691b |
|
264 | changeset: 4:7e4639b4691b | |
265 | tag: tip |
|
265 | tag: tip | |
266 | user: test |
|
266 | user: test | |
267 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
267 | date: Thu Jan 01 00:00:05 1970 +0000 | |
268 | files: dir/b e |
|
268 | files: dir/b e | |
269 | copies: e (dir/b) |
|
269 | copies: e (dir/b) | |
270 | description: |
|
270 | description: | |
271 | e |
|
271 | e | |
272 |
|
272 | |||
273 |
|
273 | |||
274 | $ hg log -vC -r4 --style=default |
|
274 | $ hg log -vC -r4 --style=default | |
275 | changeset: 4:7e4639b4691b |
|
275 | changeset: 4:7e4639b4691b | |
276 | tag: tip |
|
276 | tag: tip | |
277 | user: test |
|
277 | user: test | |
278 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
278 | date: Thu Jan 01 00:00:05 1970 +0000 | |
279 | files: dir/b e |
|
279 | files: dir/b e | |
280 | copies: e (dir/b) |
|
280 | copies: e (dir/b) | |
281 | description: |
|
281 | description: | |
282 | e |
|
282 | e | |
283 |
|
283 | |||
284 |
|
284 | |||
285 |
|
285 | |||
286 |
|
286 | |||
287 | log copies, non-linear manifest |
|
287 | log copies, non-linear manifest | |
288 |
|
288 | |||
289 | $ hg up -C 3 |
|
289 | $ hg up -C 3 | |
290 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
290 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
291 | $ hg mv dir/b e |
|
291 | $ hg mv dir/b e | |
292 | $ echo foo > foo |
|
292 | $ echo foo > foo | |
293 | $ hg ci -Ame2 -d '6 0' |
|
293 | $ hg ci -Ame2 -d '6 0' | |
294 | adding foo |
|
294 | adding foo | |
295 | created new head |
|
295 | created new head | |
296 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
296 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 | |
297 | 5 e (dir/b) |
|
297 | 5 e (dir/b) | |
298 |
|
298 | |||
299 |
|
299 | |||
300 | log copies, execute bit set |
|
300 | log copies, execute bit set | |
301 |
|
301 | |||
302 | #if execbit |
|
302 | #if execbit | |
303 | $ chmod +x e |
|
303 | $ chmod +x e | |
304 | $ hg ci -me3 -d '7 0' |
|
304 | $ hg ci -me3 -d '7 0' | |
305 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
305 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 | |
306 | 6 |
|
306 | 6 | |
307 | #endif |
|
307 | #endif | |
308 |
|
308 | |||
309 |
|
309 | |||
310 | log -p d |
|
310 | log -p d | |
311 |
|
311 | |||
312 | $ hg log -pv d |
|
312 | $ hg log -pv d | |
313 | changeset: 3:2ca5ba701980 |
|
313 | changeset: 3:2ca5ba701980 | |
314 | user: test |
|
314 | user: test | |
315 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
315 | date: Thu Jan 01 00:00:04 1970 +0000 | |
316 | files: a b d g |
|
316 | files: a b d g | |
317 | description: |
|
317 | description: | |
318 | d |
|
318 | d | |
319 |
|
319 | |||
320 |
|
320 | |||
321 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
321 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
322 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
322 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
323 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
323 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
324 | @@ -0,0 +1,1 @@ |
|
324 | @@ -0,0 +1,1 @@ | |
325 | +a |
|
325 | +a | |
326 |
|
326 | |||
327 |
|
327 | |||
328 |
|
328 | |||
329 | log --removed file |
|
329 | log --removed file | |
330 |
|
330 | |||
331 | $ hg log --removed -v a |
|
331 | $ hg log --removed -v a | |
332 | changeset: 3:2ca5ba701980 |
|
332 | changeset: 3:2ca5ba701980 | |
333 | user: test |
|
333 | user: test | |
334 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
334 | date: Thu Jan 01 00:00:04 1970 +0000 | |
335 | files: a b d g |
|
335 | files: a b d g | |
336 | description: |
|
336 | description: | |
337 | d |
|
337 | d | |
338 |
|
338 | |||
339 |
|
339 | |||
340 | changeset: 0:9161b9aeaf16 |
|
340 | changeset: 0:9161b9aeaf16 | |
341 | user: test |
|
341 | user: test | |
342 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
342 | date: Thu Jan 01 00:00:01 1970 +0000 | |
343 | files: a f |
|
343 | files: a f | |
344 | description: |
|
344 | description: | |
345 | a |
|
345 | a | |
346 |
|
346 | |||
347 |
|
347 | |||
348 |
|
348 | |||
349 | log --removed revrange file |
|
349 | log --removed revrange file | |
350 |
|
350 | |||
351 | $ hg log --removed -v -r0:2 a |
|
351 | $ hg log --removed -v -r0:2 a | |
352 | changeset: 0:9161b9aeaf16 |
|
352 | changeset: 0:9161b9aeaf16 | |
353 | user: test |
|
353 | user: test | |
354 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
354 | date: Thu Jan 01 00:00:01 1970 +0000 | |
355 | files: a f |
|
355 | files: a f | |
356 | description: |
|
356 | description: | |
357 | a |
|
357 | a | |
358 |
|
358 | |||
359 |
|
359 | |||
360 | $ cd .. |
|
360 | $ cd .. | |
361 |
|
361 | |||
362 | log --follow tests |
|
362 | log --follow tests | |
363 |
|
363 | |||
364 | $ hg init follow |
|
364 | $ hg init follow | |
365 | $ cd follow |
|
365 | $ cd follow | |
366 |
|
366 | |||
367 | $ echo base > base |
|
367 | $ echo base > base | |
368 | $ hg ci -Ambase -d '1 0' |
|
368 | $ hg ci -Ambase -d '1 0' | |
369 | adding base |
|
369 | adding base | |
370 |
|
370 | |||
371 | $ echo r1 >> base |
|
371 | $ echo r1 >> base | |
372 | $ hg ci -Amr1 -d '1 0' |
|
372 | $ hg ci -Amr1 -d '1 0' | |
373 | $ echo r2 >> base |
|
373 | $ echo r2 >> base | |
374 | $ hg ci -Amr2 -d '1 0' |
|
374 | $ hg ci -Amr2 -d '1 0' | |
375 |
|
375 | |||
376 | $ hg up -C 1 |
|
376 | $ hg up -C 1 | |
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
378 | $ echo b1 > b1 |
|
378 | $ echo b1 > b1 | |
379 | $ hg ci -Amb1 -d '1 0' |
|
379 | $ hg ci -Amb1 -d '1 0' | |
380 | adding b1 |
|
380 | adding b1 | |
381 | created new head |
|
381 | created new head | |
382 |
|
382 | |||
383 |
|
383 | |||
384 | log -f |
|
384 | log -f | |
385 |
|
385 | |||
386 | $ hg log -f |
|
386 | $ hg log -f | |
387 | changeset: 3:e62f78d544b4 |
|
387 | changeset: 3:e62f78d544b4 | |
388 | tag: tip |
|
388 | tag: tip | |
389 | parent: 1:3d5bf5654eda |
|
389 | parent: 1:3d5bf5654eda | |
390 | user: test |
|
390 | user: test | |
391 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
391 | date: Thu Jan 01 00:00:01 1970 +0000 | |
392 | summary: b1 |
|
392 | summary: b1 | |
393 |
|
393 | |||
394 | changeset: 1:3d5bf5654eda |
|
394 | changeset: 1:3d5bf5654eda | |
395 | user: test |
|
395 | user: test | |
396 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
396 | date: Thu Jan 01 00:00:01 1970 +0000 | |
397 | summary: r1 |
|
397 | summary: r1 | |
398 |
|
398 | |||
399 | changeset: 0:67e992f2c4f3 |
|
399 | changeset: 0:67e992f2c4f3 | |
400 | user: test |
|
400 | user: test | |
401 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
401 | date: Thu Jan 01 00:00:01 1970 +0000 | |
402 | summary: base |
|
402 | summary: base | |
403 |
|
403 | |||
404 |
|
404 | |||
405 |
|
405 | |||
406 | log -f -r 1:tip |
|
406 | log -f -r 1:tip | |
407 |
|
407 | |||
408 | $ hg up -C 0 |
|
408 | $ hg up -C 0 | |
409 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
409 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
410 | $ echo b2 > b2 |
|
410 | $ echo b2 > b2 | |
411 | $ hg ci -Amb2 -d '1 0' |
|
411 | $ hg ci -Amb2 -d '1 0' | |
412 | adding b2 |
|
412 | adding b2 | |
413 | created new head |
|
413 | created new head | |
414 | $ hg log -f -r 1:tip |
|
414 | $ hg log -f -r 1:tip | |
415 | changeset: 1:3d5bf5654eda |
|
415 | changeset: 1:3d5bf5654eda | |
416 | user: test |
|
416 | user: test | |
417 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
417 | date: Thu Jan 01 00:00:01 1970 +0000 | |
418 | summary: r1 |
|
418 | summary: r1 | |
419 |
|
419 | |||
420 | changeset: 2:60c670bf5b30 |
|
420 | changeset: 2:60c670bf5b30 | |
421 | user: test |
|
421 | user: test | |
422 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
422 | date: Thu Jan 01 00:00:01 1970 +0000 | |
423 | summary: r2 |
|
423 | summary: r2 | |
424 |
|
424 | |||
425 | changeset: 3:e62f78d544b4 |
|
425 | changeset: 3:e62f78d544b4 | |
426 | parent: 1:3d5bf5654eda |
|
426 | parent: 1:3d5bf5654eda | |
427 | user: test |
|
427 | user: test | |
428 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
428 | date: Thu Jan 01 00:00:01 1970 +0000 | |
429 | summary: b1 |
|
429 | summary: b1 | |
430 |
|
430 | |||
431 |
|
431 | |||
432 |
|
432 | |||
433 | log -r . with two parents |
|
433 | log -r . with two parents | |
434 |
|
434 | |||
435 | $ hg up -C 3 |
|
435 | $ hg up -C 3 | |
436 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
436 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
437 | $ hg merge tip |
|
437 | $ hg merge tip | |
438 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
438 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
439 | (branch merge, don't forget to commit) |
|
439 | (branch merge, don't forget to commit) | |
440 | $ hg log -r . |
|
440 | $ hg log -r . | |
441 | changeset: 3:e62f78d544b4 |
|
441 | changeset: 3:e62f78d544b4 | |
442 | parent: 1:3d5bf5654eda |
|
442 | parent: 1:3d5bf5654eda | |
443 | user: test |
|
443 | user: test | |
444 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
444 | date: Thu Jan 01 00:00:01 1970 +0000 | |
445 | summary: b1 |
|
445 | summary: b1 | |
446 |
|
446 | |||
447 |
|
447 | |||
448 |
|
448 | |||
449 | log -r . with one parent |
|
449 | log -r . with one parent | |
450 |
|
450 | |||
451 | $ hg ci -mm12 -d '1 0' |
|
451 | $ hg ci -mm12 -d '1 0' | |
452 | $ hg log -r . |
|
452 | $ hg log -r . | |
453 | changeset: 5:302e9dd6890d |
|
453 | changeset: 5:302e9dd6890d | |
454 | tag: tip |
|
454 | tag: tip | |
455 | parent: 3:e62f78d544b4 |
|
455 | parent: 3:e62f78d544b4 | |
456 | parent: 4:ddb82e70d1a1 |
|
456 | parent: 4:ddb82e70d1a1 | |
457 | user: test |
|
457 | user: test | |
458 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
458 | date: Thu Jan 01 00:00:01 1970 +0000 | |
459 | summary: m12 |
|
459 | summary: m12 | |
460 |
|
460 | |||
461 |
|
461 | |||
462 | $ echo postm >> b1 |
|
462 | $ echo postm >> b1 | |
463 | $ hg ci -Amb1.1 -d'1 0' |
|
463 | $ hg ci -Amb1.1 -d'1 0' | |
464 |
|
464 | |||
465 |
|
465 | |||
466 | log --follow-first |
|
466 | log --follow-first | |
467 |
|
467 | |||
468 | $ hg log --follow-first |
|
468 | $ hg log --follow-first | |
469 | changeset: 6:2404bbcab562 |
|
469 | changeset: 6:2404bbcab562 | |
470 | tag: tip |
|
470 | tag: tip | |
471 | user: test |
|
471 | user: test | |
472 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
472 | date: Thu Jan 01 00:00:01 1970 +0000 | |
473 | summary: b1.1 |
|
473 | summary: b1.1 | |
474 |
|
474 | |||
475 | changeset: 5:302e9dd6890d |
|
475 | changeset: 5:302e9dd6890d | |
476 | parent: 3:e62f78d544b4 |
|
476 | parent: 3:e62f78d544b4 | |
477 | parent: 4:ddb82e70d1a1 |
|
477 | parent: 4:ddb82e70d1a1 | |
478 | user: test |
|
478 | user: test | |
479 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
479 | date: Thu Jan 01 00:00:01 1970 +0000 | |
480 | summary: m12 |
|
480 | summary: m12 | |
481 |
|
481 | |||
482 | changeset: 3:e62f78d544b4 |
|
482 | changeset: 3:e62f78d544b4 | |
483 | parent: 1:3d5bf5654eda |
|
483 | parent: 1:3d5bf5654eda | |
484 | user: test |
|
484 | user: test | |
485 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
485 | date: Thu Jan 01 00:00:01 1970 +0000 | |
486 | summary: b1 |
|
486 | summary: b1 | |
487 |
|
487 | |||
488 | changeset: 1:3d5bf5654eda |
|
488 | changeset: 1:3d5bf5654eda | |
489 | user: test |
|
489 | user: test | |
490 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
490 | date: Thu Jan 01 00:00:01 1970 +0000 | |
491 | summary: r1 |
|
491 | summary: r1 | |
492 |
|
492 | |||
493 | changeset: 0:67e992f2c4f3 |
|
493 | changeset: 0:67e992f2c4f3 | |
494 | user: test |
|
494 | user: test | |
495 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
495 | date: Thu Jan 01 00:00:01 1970 +0000 | |
496 | summary: base |
|
496 | summary: base | |
497 |
|
497 | |||
498 |
|
498 | |||
499 |
|
499 | |||
500 | log -P 2 |
|
500 | log -P 2 | |
501 |
|
501 | |||
502 | $ hg log -P 2 |
|
502 | $ hg log -P 2 | |
503 | changeset: 6:2404bbcab562 |
|
503 | changeset: 6:2404bbcab562 | |
504 | tag: tip |
|
504 | tag: tip | |
505 | user: test |
|
505 | user: test | |
506 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
506 | date: Thu Jan 01 00:00:01 1970 +0000 | |
507 | summary: b1.1 |
|
507 | summary: b1.1 | |
508 |
|
508 | |||
509 | changeset: 5:302e9dd6890d |
|
509 | changeset: 5:302e9dd6890d | |
510 | parent: 3:e62f78d544b4 |
|
510 | parent: 3:e62f78d544b4 | |
511 | parent: 4:ddb82e70d1a1 |
|
511 | parent: 4:ddb82e70d1a1 | |
512 | user: test |
|
512 | user: test | |
513 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
513 | date: Thu Jan 01 00:00:01 1970 +0000 | |
514 | summary: m12 |
|
514 | summary: m12 | |
515 |
|
515 | |||
516 | changeset: 4:ddb82e70d1a1 |
|
516 | changeset: 4:ddb82e70d1a1 | |
517 | parent: 0:67e992f2c4f3 |
|
517 | parent: 0:67e992f2c4f3 | |
518 | user: test |
|
518 | user: test | |
519 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
519 | date: Thu Jan 01 00:00:01 1970 +0000 | |
520 | summary: b2 |
|
520 | summary: b2 | |
521 |
|
521 | |||
522 | changeset: 3:e62f78d544b4 |
|
522 | changeset: 3:e62f78d544b4 | |
523 | parent: 1:3d5bf5654eda |
|
523 | parent: 1:3d5bf5654eda | |
524 | user: test |
|
524 | user: test | |
525 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
525 | date: Thu Jan 01 00:00:01 1970 +0000 | |
526 | summary: b1 |
|
526 | summary: b1 | |
527 |
|
527 | |||
528 |
|
528 | |||
529 |
|
529 | |||
530 | log -r tip -p --git |
|
530 | log -r tip -p --git | |
531 |
|
531 | |||
532 | $ hg log -r tip -p --git |
|
532 | $ hg log -r tip -p --git | |
533 | changeset: 6:2404bbcab562 |
|
533 | changeset: 6:2404bbcab562 | |
534 | tag: tip |
|
534 | tag: tip | |
535 | user: test |
|
535 | user: test | |
536 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
536 | date: Thu Jan 01 00:00:01 1970 +0000 | |
537 | summary: b1.1 |
|
537 | summary: b1.1 | |
538 |
|
538 | |||
539 | diff --git a/b1 b/b1 |
|
539 | diff --git a/b1 b/b1 | |
540 | --- a/b1 |
|
540 | --- a/b1 | |
541 | +++ b/b1 |
|
541 | +++ b/b1 | |
542 | @@ -1,1 +1,2 @@ |
|
542 | @@ -1,1 +1,2 @@ | |
543 | b1 |
|
543 | b1 | |
544 | +postm |
|
544 | +postm | |
545 |
|
545 | |||
546 |
|
546 | |||
547 |
|
547 | |||
548 | log -r "" |
|
548 | log -r "" | |
549 |
|
549 | |||
550 | $ hg log -r '' |
|
550 | $ hg log -r '' | |
551 | hg: parse error: empty query |
|
551 | hg: parse error: empty query | |
552 | [255] |
|
552 | [255] | |
553 |
|
553 | |||
554 | log -r <some unknown node id> |
|
554 | log -r <some unknown node id> | |
555 |
|
555 | |||
556 | $ hg log -r 1000000000000000000000000000000000000000 |
|
556 | $ hg log -r 1000000000000000000000000000000000000000 | |
557 | abort: unknown revision '1000000000000000000000000000000000000000'! |
|
557 | abort: unknown revision '1000000000000000000000000000000000000000'! | |
558 | [255] |
|
558 | [255] | |
559 |
|
559 | |||
560 | log -k r1 |
|
560 | log -k r1 | |
561 |
|
561 | |||
562 | $ hg log -k r1 |
|
562 | $ hg log -k r1 | |
563 | changeset: 1:3d5bf5654eda |
|
563 | changeset: 1:3d5bf5654eda | |
564 | user: test |
|
564 | user: test | |
565 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
565 | date: Thu Jan 01 00:00:01 1970 +0000 | |
566 | summary: r1 |
|
566 | summary: r1 | |
567 |
|
567 | |||
568 | log -p -l2 --color=always |
|
568 | log -p -l2 --color=always | |
569 |
|
569 | |||
570 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
570 | $ hg --config extensions.color= --config color.mode=ansi \ | |
571 | > log -p -l2 --color=always |
|
571 | > log -p -l2 --color=always | |
572 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
572 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) | |
573 | tag: tip |
|
573 | tag: tip | |
574 | user: test |
|
574 | user: test | |
575 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
575 | date: Thu Jan 01 00:00:01 1970 +0000 | |
576 | summary: b1.1 |
|
576 | summary: b1.1 | |
577 |
|
577 | |||
578 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
|
578 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) | |
579 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
579 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
580 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
580 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
581 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
581 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) | |
582 | b1 |
|
582 | b1 | |
583 | \x1b[0;32m+postm\x1b[0m (esc) |
|
583 | \x1b[0;32m+postm\x1b[0m (esc) | |
584 |
|
584 | |||
585 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
585 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) | |
586 | parent: 3:e62f78d544b4 |
|
586 | parent: 3:e62f78d544b4 | |
587 | parent: 4:ddb82e70d1a1 |
|
587 | parent: 4:ddb82e70d1a1 | |
588 | user: test |
|
588 | user: test | |
589 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
589 | date: Thu Jan 01 00:00:01 1970 +0000 | |
590 | summary: m12 |
|
590 | summary: m12 | |
591 |
|
591 | |||
592 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
|
592 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) | |
593 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
|
593 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) | |
594 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
594 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
595 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
|
595 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) | |
596 | \x1b[0;32m+b2\x1b[0m (esc) |
|
596 | \x1b[0;32m+b2\x1b[0m (esc) | |
597 |
|
597 | |||
598 |
|
598 | |||
599 |
|
599 | |||
600 | log -r tip --stat |
|
600 | log -r tip --stat | |
601 |
|
601 | |||
602 | $ hg log -r tip --stat |
|
602 | $ hg log -r tip --stat | |
603 | changeset: 6:2404bbcab562 |
|
603 | changeset: 6:2404bbcab562 | |
604 | tag: tip |
|
604 | tag: tip | |
605 | user: test |
|
605 | user: test | |
606 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
606 | date: Thu Jan 01 00:00:01 1970 +0000 | |
607 | summary: b1.1 |
|
607 | summary: b1.1 | |
608 |
|
608 | |||
609 | b1 | 1 + |
|
609 | b1 | 1 + | |
610 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
610 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
611 |
|
611 | |||
612 |
|
612 | |||
613 | $ cd .. |
|
613 | $ cd .. | |
614 |
|
614 | |||
615 |
|
615 | |||
616 | User |
|
616 | User | |
617 |
|
617 | |||
618 | $ hg init usertest |
|
618 | $ hg init usertest | |
619 | $ cd usertest |
|
619 | $ cd usertest | |
620 |
|
620 | |||
621 | $ echo a > a |
|
621 | $ echo a > a | |
622 | $ hg ci -A -m "a" -u "User One <user1@example.org>" |
|
622 | $ hg ci -A -m "a" -u "User One <user1@example.org>" | |
623 | adding a |
|
623 | adding a | |
624 | $ echo b > b |
|
624 | $ echo b > b | |
625 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
625 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" | |
626 | adding b |
|
626 | adding b | |
627 |
|
627 | |||
628 | $ hg log -u "User One <user1@example.org>" |
|
628 | $ hg log -u "User One <user1@example.org>" | |
629 | changeset: 0:29a4c94f1924 |
|
629 | changeset: 0:29a4c94f1924 | |
630 | user: User One <user1@example.org> |
|
630 | user: User One <user1@example.org> | |
631 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
631 | date: Thu Jan 01 00:00:00 1970 +0000 | |
632 | summary: a |
|
632 | summary: a | |
633 |
|
633 | |||
634 | $ hg log -u "user1" -u "user2" |
|
634 | $ hg log -u "user1" -u "user2" | |
635 | changeset: 1:e834b5e69c0e |
|
635 | changeset: 1:e834b5e69c0e | |
636 | tag: tip |
|
636 | tag: tip | |
637 | user: User Two <user2@example.org> |
|
637 | user: User Two <user2@example.org> | |
638 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
638 | date: Thu Jan 01 00:00:00 1970 +0000 | |
639 | summary: b |
|
639 | summary: b | |
640 |
|
640 | |||
641 | changeset: 0:29a4c94f1924 |
|
641 | changeset: 0:29a4c94f1924 | |
642 | user: User One <user1@example.org> |
|
642 | user: User One <user1@example.org> | |
643 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
643 | date: Thu Jan 01 00:00:00 1970 +0000 | |
644 | summary: a |
|
644 | summary: a | |
645 |
|
645 | |||
646 | $ hg log -u "user3" |
|
646 | $ hg log -u "user3" | |
647 |
|
647 | |||
648 | $ cd .. |
|
648 | $ cd .. | |
649 |
|
649 | |||
650 | $ hg init branches |
|
650 | $ hg init branches | |
651 | $ cd branches |
|
651 | $ cd branches | |
652 |
|
652 | |||
653 | $ echo a > a |
|
653 | $ echo a > a | |
654 | $ hg ci -A -m "commit on default" |
|
654 | $ hg ci -A -m "commit on default" | |
655 | adding a |
|
655 | adding a | |
656 | $ hg branch test |
|
656 | $ hg branch test | |
657 | marked working directory as branch test |
|
657 | marked working directory as branch test | |
658 | (branches are permanent and global, did you want a bookmark?) |
|
658 | (branches are permanent and global, did you want a bookmark?) | |
659 | $ echo b > b |
|
659 | $ echo b > b | |
660 | $ hg ci -A -m "commit on test" |
|
660 | $ hg ci -A -m "commit on test" | |
661 | adding b |
|
661 | adding b | |
662 |
|
662 | |||
663 | $ hg up default |
|
663 | $ hg up default | |
664 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
664 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
665 | $ echo c > c |
|
665 | $ echo c > c | |
666 | $ hg ci -A -m "commit on default" |
|
666 | $ hg ci -A -m "commit on default" | |
667 | adding c |
|
667 | adding c | |
668 | $ hg up test |
|
668 | $ hg up test | |
669 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
669 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
670 | $ echo c > c |
|
670 | $ echo c > c | |
671 | $ hg ci -A -m "commit on test" |
|
671 | $ hg ci -A -m "commit on test" | |
672 | adding c |
|
672 | adding c | |
673 |
|
673 | |||
674 |
|
674 | |||
675 | log -b default |
|
675 | log -b default | |
676 |
|
676 | |||
677 | $ hg log -b default |
|
677 | $ hg log -b default | |
678 | changeset: 2:c3a4f03cc9a7 |
|
678 | changeset: 2:c3a4f03cc9a7 | |
679 | parent: 0:24427303d56f |
|
679 | parent: 0:24427303d56f | |
680 | user: test |
|
680 | user: test | |
681 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
681 | date: Thu Jan 01 00:00:00 1970 +0000 | |
682 | summary: commit on default |
|
682 | summary: commit on default | |
683 |
|
683 | |||
684 | changeset: 0:24427303d56f |
|
684 | changeset: 0:24427303d56f | |
685 | user: test |
|
685 | user: test | |
686 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
686 | date: Thu Jan 01 00:00:00 1970 +0000 | |
687 | summary: commit on default |
|
687 | summary: commit on default | |
688 |
|
688 | |||
689 |
|
689 | |||
690 |
|
690 | |||
691 | log -b test |
|
691 | log -b test | |
692 |
|
692 | |||
693 | $ hg log -b test |
|
693 | $ hg log -b test | |
694 | changeset: 3:f5d8de11c2e2 |
|
694 | changeset: 3:f5d8de11c2e2 | |
695 | branch: test |
|
695 | branch: test | |
696 | tag: tip |
|
696 | tag: tip | |
697 | parent: 1:d32277701ccb |
|
697 | parent: 1:d32277701ccb | |
698 | user: test |
|
698 | user: test | |
699 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
699 | date: Thu Jan 01 00:00:00 1970 +0000 | |
700 | summary: commit on test |
|
700 | summary: commit on test | |
701 |
|
701 | |||
702 | changeset: 1:d32277701ccb |
|
702 | changeset: 1:d32277701ccb | |
703 | branch: test |
|
703 | branch: test | |
704 | user: test |
|
704 | user: test | |
705 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
705 | date: Thu Jan 01 00:00:00 1970 +0000 | |
706 | summary: commit on test |
|
706 | summary: commit on test | |
707 |
|
707 | |||
708 |
|
708 | |||
709 |
|
709 | |||
710 | log -b dummy |
|
710 | log -b dummy | |
711 |
|
711 | |||
712 | $ hg log -b dummy |
|
712 | $ hg log -b dummy | |
713 | abort: unknown revision 'dummy'! |
|
713 | abort: unknown revision 'dummy'! | |
714 | [255] |
|
714 | [255] | |
715 |
|
715 | |||
716 |
|
716 | |||
717 | log -b . |
|
717 | log -b . | |
718 |
|
718 | |||
719 | $ hg log -b . |
|
719 | $ hg log -b . | |
720 | changeset: 3:f5d8de11c2e2 |
|
720 | changeset: 3:f5d8de11c2e2 | |
721 | branch: test |
|
721 | branch: test | |
722 | tag: tip |
|
722 | tag: tip | |
723 | parent: 1:d32277701ccb |
|
723 | parent: 1:d32277701ccb | |
724 | user: test |
|
724 | user: test | |
725 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
725 | date: Thu Jan 01 00:00:00 1970 +0000 | |
726 | summary: commit on test |
|
726 | summary: commit on test | |
727 |
|
727 | |||
728 | changeset: 1:d32277701ccb |
|
728 | changeset: 1:d32277701ccb | |
729 | branch: test |
|
729 | branch: test | |
730 | user: test |
|
730 | user: test | |
731 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
731 | date: Thu Jan 01 00:00:00 1970 +0000 | |
732 | summary: commit on test |
|
732 | summary: commit on test | |
733 |
|
733 | |||
734 |
|
734 | |||
735 |
|
735 | |||
736 | log -b default -b test |
|
736 | log -b default -b test | |
737 |
|
737 | |||
738 | $ hg log -b default -b test |
|
738 | $ hg log -b default -b test | |
739 | changeset: 3:f5d8de11c2e2 |
|
739 | changeset: 3:f5d8de11c2e2 | |
740 | branch: test |
|
740 | branch: test | |
741 | tag: tip |
|
741 | tag: tip | |
742 | parent: 1:d32277701ccb |
|
742 | parent: 1:d32277701ccb | |
743 | user: test |
|
743 | user: test | |
744 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
744 | date: Thu Jan 01 00:00:00 1970 +0000 | |
745 | summary: commit on test |
|
745 | summary: commit on test | |
746 |
|
746 | |||
747 | changeset: 2:c3a4f03cc9a7 |
|
747 | changeset: 2:c3a4f03cc9a7 | |
748 | parent: 0:24427303d56f |
|
748 | parent: 0:24427303d56f | |
749 | user: test |
|
749 | user: test | |
750 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
750 | date: Thu Jan 01 00:00:00 1970 +0000 | |
751 | summary: commit on default |
|
751 | summary: commit on default | |
752 |
|
752 | |||
753 | changeset: 1:d32277701ccb |
|
753 | changeset: 1:d32277701ccb | |
754 | branch: test |
|
754 | branch: test | |
755 | user: test |
|
755 | user: test | |
756 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
756 | date: Thu Jan 01 00:00:00 1970 +0000 | |
757 | summary: commit on test |
|
757 | summary: commit on test | |
758 |
|
758 | |||
759 | changeset: 0:24427303d56f |
|
759 | changeset: 0:24427303d56f | |
760 | user: test |
|
760 | user: test | |
761 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
761 | date: Thu Jan 01 00:00:00 1970 +0000 | |
762 | summary: commit on default |
|
762 | summary: commit on default | |
763 |
|
763 | |||
764 |
|
764 | |||
765 |
|
765 | |||
766 | log -b default -b . |
|
766 | log -b default -b . | |
767 |
|
767 | |||
768 | $ hg log -b default -b . |
|
768 | $ hg log -b default -b . | |
769 | changeset: 3:f5d8de11c2e2 |
|
769 | changeset: 3:f5d8de11c2e2 | |
770 | branch: test |
|
770 | branch: test | |
771 | tag: tip |
|
771 | tag: tip | |
772 | parent: 1:d32277701ccb |
|
772 | parent: 1:d32277701ccb | |
773 | user: test |
|
773 | user: test | |
774 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
774 | date: Thu Jan 01 00:00:00 1970 +0000 | |
775 | summary: commit on test |
|
775 | summary: commit on test | |
776 |
|
776 | |||
777 | changeset: 2:c3a4f03cc9a7 |
|
777 | changeset: 2:c3a4f03cc9a7 | |
778 | parent: 0:24427303d56f |
|
778 | parent: 0:24427303d56f | |
779 | user: test |
|
779 | user: test | |
780 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
780 | date: Thu Jan 01 00:00:00 1970 +0000 | |
781 | summary: commit on default |
|
781 | summary: commit on default | |
782 |
|
782 | |||
783 | changeset: 1:d32277701ccb |
|
783 | changeset: 1:d32277701ccb | |
784 | branch: test |
|
784 | branch: test | |
785 | user: test |
|
785 | user: test | |
786 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
786 | date: Thu Jan 01 00:00:00 1970 +0000 | |
787 | summary: commit on test |
|
787 | summary: commit on test | |
788 |
|
788 | |||
789 | changeset: 0:24427303d56f |
|
789 | changeset: 0:24427303d56f | |
790 | user: test |
|
790 | user: test | |
791 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
791 | date: Thu Jan 01 00:00:00 1970 +0000 | |
792 | summary: commit on default |
|
792 | summary: commit on default | |
793 |
|
793 | |||
794 |
|
794 | |||
795 |
|
795 | |||
796 | log -b . -b test |
|
796 | log -b . -b test | |
797 |
|
797 | |||
798 | $ hg log -b . -b test |
|
798 | $ hg log -b . -b test | |
799 | changeset: 3:f5d8de11c2e2 |
|
799 | changeset: 3:f5d8de11c2e2 | |
800 | branch: test |
|
800 | branch: test | |
801 | tag: tip |
|
801 | tag: tip | |
802 | parent: 1:d32277701ccb |
|
802 | parent: 1:d32277701ccb | |
803 | user: test |
|
803 | user: test | |
804 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
804 | date: Thu Jan 01 00:00:00 1970 +0000 | |
805 | summary: commit on test |
|
805 | summary: commit on test | |
806 |
|
806 | |||
807 | changeset: 1:d32277701ccb |
|
807 | changeset: 1:d32277701ccb | |
808 | branch: test |
|
808 | branch: test | |
809 | user: test |
|
809 | user: test | |
810 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
810 | date: Thu Jan 01 00:00:00 1970 +0000 | |
811 | summary: commit on test |
|
811 | summary: commit on test | |
812 |
|
812 | |||
813 |
|
813 | |||
814 |
|
814 | |||
815 | log -b 2 |
|
815 | log -b 2 | |
816 |
|
816 | |||
817 | $ hg log -b 2 |
|
817 | $ hg log -b 2 | |
818 | changeset: 2:c3a4f03cc9a7 |
|
818 | changeset: 2:c3a4f03cc9a7 | |
819 | parent: 0:24427303d56f |
|
819 | parent: 0:24427303d56f | |
820 | user: test |
|
820 | user: test | |
821 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
821 | date: Thu Jan 01 00:00:00 1970 +0000 | |
822 | summary: commit on default |
|
822 | summary: commit on default | |
823 |
|
823 | |||
824 | changeset: 0:24427303d56f |
|
824 | changeset: 0:24427303d56f | |
825 | user: test |
|
825 | user: test | |
826 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
826 | date: Thu Jan 01 00:00:00 1970 +0000 | |
827 | summary: commit on default |
|
827 | summary: commit on default | |
828 |
|
828 | |||
829 |
|
829 | |||
830 |
|
830 | |||
831 | log -p --cwd dir (in subdir) |
|
831 | log -p --cwd dir (in subdir) | |
832 |
|
832 | |||
833 | $ mkdir dir |
|
833 | $ mkdir dir | |
834 | $ hg log -p --cwd dir |
|
834 | $ hg log -p --cwd dir | |
835 | changeset: 3:f5d8de11c2e2 |
|
835 | changeset: 3:f5d8de11c2e2 | |
836 | branch: test |
|
836 | branch: test | |
837 | tag: tip |
|
837 | tag: tip | |
838 | parent: 1:d32277701ccb |
|
838 | parent: 1:d32277701ccb | |
839 | user: test |
|
839 | user: test | |
840 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
840 | date: Thu Jan 01 00:00:00 1970 +0000 | |
841 | summary: commit on test |
|
841 | summary: commit on test | |
842 |
|
842 | |||
843 | diff -r d32277701ccb -r f5d8de11c2e2 c |
|
843 | diff -r d32277701ccb -r f5d8de11c2e2 c | |
844 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
844 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
845 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
845 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
846 | @@ -0,0 +1,1 @@ |
|
846 | @@ -0,0 +1,1 @@ | |
847 | +c |
|
847 | +c | |
848 |
|
848 | |||
849 | changeset: 2:c3a4f03cc9a7 |
|
849 | changeset: 2:c3a4f03cc9a7 | |
850 | parent: 0:24427303d56f |
|
850 | parent: 0:24427303d56f | |
851 | user: test |
|
851 | user: test | |
852 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
852 | date: Thu Jan 01 00:00:00 1970 +0000 | |
853 | summary: commit on default |
|
853 | summary: commit on default | |
854 |
|
854 | |||
855 | diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
855 | diff -r 24427303d56f -r c3a4f03cc9a7 c | |
856 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
856 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
857 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
857 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
858 | @@ -0,0 +1,1 @@ |
|
858 | @@ -0,0 +1,1 @@ | |
859 | +c |
|
859 | +c | |
860 |
|
860 | |||
861 | changeset: 1:d32277701ccb |
|
861 | changeset: 1:d32277701ccb | |
862 | branch: test |
|
862 | branch: test | |
863 | user: test |
|
863 | user: test | |
864 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
864 | date: Thu Jan 01 00:00:00 1970 +0000 | |
865 | summary: commit on test |
|
865 | summary: commit on test | |
866 |
|
866 | |||
867 | diff -r 24427303d56f -r d32277701ccb b |
|
867 | diff -r 24427303d56f -r d32277701ccb b | |
868 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
868 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
869 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
869 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
870 | @@ -0,0 +1,1 @@ |
|
870 | @@ -0,0 +1,1 @@ | |
871 | +b |
|
871 | +b | |
872 |
|
872 | |||
873 | changeset: 0:24427303d56f |
|
873 | changeset: 0:24427303d56f | |
874 | user: test |
|
874 | user: test | |
875 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
875 | date: Thu Jan 01 00:00:00 1970 +0000 | |
876 | summary: commit on default |
|
876 | summary: commit on default | |
877 |
|
877 | |||
878 | diff -r 000000000000 -r 24427303d56f a |
|
878 | diff -r 000000000000 -r 24427303d56f a | |
879 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
879 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
880 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
880 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
881 | @@ -0,0 +1,1 @@ |
|
881 | @@ -0,0 +1,1 @@ | |
882 | +a |
|
882 | +a | |
883 |
|
883 | |||
884 |
|
884 | |||
885 |
|
885 | |||
886 | log -p -R repo |
|
886 | log -p -R repo | |
887 |
|
887 | |||
888 | $ cd dir |
|
888 | $ cd dir | |
889 | $ hg log -p -R .. ../a |
|
889 | $ hg log -p -R .. ../a | |
890 | changeset: 0:24427303d56f |
|
890 | changeset: 0:24427303d56f | |
891 | user: test |
|
891 | user: test | |
892 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
892 | date: Thu Jan 01 00:00:00 1970 +0000 | |
893 | summary: commit on default |
|
893 | summary: commit on default | |
894 |
|
894 | |||
895 | diff -r 000000000000 -r 24427303d56f a |
|
895 | diff -r 000000000000 -r 24427303d56f a | |
896 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
896 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
897 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
897 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
898 | @@ -0,0 +1,1 @@ |
|
898 | @@ -0,0 +1,1 @@ | |
899 | +a |
|
899 | +a | |
900 |
|
900 | |||
901 |
|
901 | |||
902 | $ cd ../.. |
|
902 | $ cd ../.. | |
903 |
|
903 | |||
904 | $ hg init follow2 |
|
904 | $ hg init follow2 | |
905 | $ cd follow2 |
|
905 | $ cd follow2 | |
906 |
|
906 | |||
907 | # Build the following history: |
|
907 | # Build the following history: | |
908 | # tip - o - x - o - x - x |
|
908 | # tip - o - x - o - x - x | |
909 | # \ / |
|
909 | # \ / | |
910 | # o - o - o - x |
|
910 | # o - o - o - x | |
911 | # \ / |
|
911 | # \ / | |
912 | # o |
|
912 | # o | |
913 | # |
|
913 | # | |
914 | # Where "o" is a revision containing "foo" and |
|
914 | # Where "o" is a revision containing "foo" and | |
915 | # "x" is a revision without "foo" |
|
915 | # "x" is a revision without "foo" | |
916 |
|
916 | |||
917 | $ touch init |
|
917 | $ touch init | |
918 | $ hg ci -A -m "init, unrelated" |
|
918 | $ hg ci -A -m "init, unrelated" | |
919 | adding init |
|
919 | adding init | |
920 | $ echo 'foo' > init |
|
920 | $ echo 'foo' > init | |
921 | $ hg ci -m "change, unrelated" |
|
921 | $ hg ci -m "change, unrelated" | |
922 | $ echo 'foo' > foo |
|
922 | $ echo 'foo' > foo | |
923 | $ hg ci -A -m "add unrelated old foo" |
|
923 | $ hg ci -A -m "add unrelated old foo" | |
924 | adding foo |
|
924 | adding foo | |
925 | $ hg rm foo |
|
925 | $ hg rm foo | |
926 | $ hg ci -m "delete foo, unrelated" |
|
926 | $ hg ci -m "delete foo, unrelated" | |
927 | $ echo 'related' > foo |
|
927 | $ echo 'related' > foo | |
928 | $ hg ci -A -m "add foo, related" |
|
928 | $ hg ci -A -m "add foo, related" | |
929 | adding foo |
|
929 | adding foo | |
930 |
|
930 | |||
931 | $ hg up 0 |
|
931 | $ hg up 0 | |
932 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
932 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
933 | $ touch branch |
|
933 | $ touch branch | |
934 | $ hg ci -A -m "first branch, unrelated" |
|
934 | $ hg ci -A -m "first branch, unrelated" | |
935 | adding branch |
|
935 | adding branch | |
936 | created new head |
|
936 | created new head | |
937 | $ touch foo |
|
937 | $ touch foo | |
938 | $ hg ci -A -m "create foo, related" |
|
938 | $ hg ci -A -m "create foo, related" | |
939 | adding foo |
|
939 | adding foo | |
940 | $ echo 'change' > foo |
|
940 | $ echo 'change' > foo | |
941 | $ hg ci -m "change foo, related" |
|
941 | $ hg ci -m "change foo, related" | |
942 |
|
942 | |||
943 | $ hg up 6 |
|
943 | $ hg up 6 | |
944 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
944 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
945 | $ echo 'change foo in branch' > foo |
|
945 | $ echo 'change foo in branch' > foo | |
946 | $ hg ci -m "change foo in branch, related" |
|
946 | $ hg ci -m "change foo in branch, related" | |
947 | created new head |
|
947 | created new head | |
948 | $ hg merge 7 |
|
948 | $ hg merge 7 | |
949 | merging foo |
|
949 | merging foo | |
950 | warning: conflicts during merge. |
|
950 | warning: conflicts during merge. | |
951 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
951 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') | |
952 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
952 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
953 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
953 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
954 | [1] |
|
954 | [1] | |
955 | $ echo 'merge 1' > foo |
|
955 | $ echo 'merge 1' > foo | |
956 | $ hg resolve -m foo |
|
956 | $ hg resolve -m foo | |
957 | $ hg ci -m "First merge, related" |
|
957 | $ hg ci -m "First merge, related" | |
958 |
|
958 | |||
959 | $ hg merge 4 |
|
959 | $ hg merge 4 | |
960 | merging foo |
|
960 | merging foo | |
961 | warning: conflicts during merge. |
|
961 | warning: conflicts during merge. | |
962 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
962 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') | |
963 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
963 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
964 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
964 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
965 | [1] |
|
965 | [1] | |
966 | $ echo 'merge 2' > foo |
|
966 | $ echo 'merge 2' > foo | |
967 | $ hg resolve -m foo |
|
967 | $ hg resolve -m foo | |
968 | $ hg ci -m "Last merge, related" |
|
968 | $ hg ci -m "Last merge, related" | |
969 |
|
969 | |||
970 | $ hg log --graph |
|
970 | $ hg log --graph | |
971 | @ changeset: 10:4dae8563d2c5 |
|
971 | @ changeset: 10:4dae8563d2c5 | |
972 | |\ tag: tip |
|
972 | |\ tag: tip | |
973 | | | parent: 9:7b35701b003e |
|
973 | | | parent: 9:7b35701b003e | |
974 | | | parent: 4:88176d361b69 |
|
974 | | | parent: 4:88176d361b69 | |
975 | | | user: test |
|
975 | | | user: test | |
976 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
976 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
977 | | | summary: Last merge, related |
|
977 | | | summary: Last merge, related | |
978 | | | |
|
978 | | | | |
979 | | o changeset: 9:7b35701b003e |
|
979 | | o changeset: 9:7b35701b003e | |
980 | | |\ parent: 8:e5416ad8a855 |
|
980 | | |\ parent: 8:e5416ad8a855 | |
981 | | | | parent: 7:87fe3144dcfa |
|
981 | | | | parent: 7:87fe3144dcfa | |
982 | | | | user: test |
|
982 | | | | user: test | |
983 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
983 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
984 | | | | summary: First merge, related |
|
984 | | | | summary: First merge, related | |
985 | | | | |
|
985 | | | | | |
986 | | | o changeset: 8:e5416ad8a855 |
|
986 | | | o changeset: 8:e5416ad8a855 | |
987 | | | | parent: 6:dc6c325fe5ee |
|
987 | | | | parent: 6:dc6c325fe5ee | |
988 | | | | user: test |
|
988 | | | | user: test | |
989 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
989 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
990 | | | | summary: change foo in branch, related |
|
990 | | | | summary: change foo in branch, related | |
991 | | | | |
|
991 | | | | | |
992 | | o | changeset: 7:87fe3144dcfa |
|
992 | | o | changeset: 7:87fe3144dcfa | |
993 | | |/ user: test |
|
993 | | |/ user: test | |
994 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
994 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
995 | | | summary: change foo, related |
|
995 | | | summary: change foo, related | |
996 | | | |
|
996 | | | | |
997 | | o changeset: 6:dc6c325fe5ee |
|
997 | | o changeset: 6:dc6c325fe5ee | |
998 | | | user: test |
|
998 | | | user: test | |
999 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
999 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1000 | | | summary: create foo, related |
|
1000 | | | summary: create foo, related | |
1001 | | | |
|
1001 | | | | |
1002 | | o changeset: 5:73db34516eb9 |
|
1002 | | o changeset: 5:73db34516eb9 | |
1003 | | | parent: 0:e87515fd044a |
|
1003 | | | parent: 0:e87515fd044a | |
1004 | | | user: test |
|
1004 | | | user: test | |
1005 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1005 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1006 | | | summary: first branch, unrelated |
|
1006 | | | summary: first branch, unrelated | |
1007 | | | |
|
1007 | | | | |
1008 | o | changeset: 4:88176d361b69 |
|
1008 | o | changeset: 4:88176d361b69 | |
1009 | | | user: test |
|
1009 | | | user: test | |
1010 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1010 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1011 | | | summary: add foo, related |
|
1011 | | | summary: add foo, related | |
1012 | | | |
|
1012 | | | | |
1013 | o | changeset: 3:dd78ae4afb56 |
|
1013 | o | changeset: 3:dd78ae4afb56 | |
1014 | | | user: test |
|
1014 | | | user: test | |
1015 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1015 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1016 | | | summary: delete foo, unrelated |
|
1016 | | | summary: delete foo, unrelated | |
1017 | | | |
|
1017 | | | | |
1018 | o | changeset: 2:c4c64aedf0f7 |
|
1018 | o | changeset: 2:c4c64aedf0f7 | |
1019 | | | user: test |
|
1019 | | | user: test | |
1020 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1020 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1021 | | | summary: add unrelated old foo |
|
1021 | | | summary: add unrelated old foo | |
1022 | | | |
|
1022 | | | | |
1023 | o | changeset: 1:e5faa7440653 |
|
1023 | o | changeset: 1:e5faa7440653 | |
1024 | |/ user: test |
|
1024 | |/ user: test | |
1025 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1025 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1026 | | summary: change, unrelated |
|
1026 | | summary: change, unrelated | |
1027 | | |
|
1027 | | | |
1028 | o changeset: 0:e87515fd044a |
|
1028 | o changeset: 0:e87515fd044a | |
1029 | user: test |
|
1029 | user: test | |
1030 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1030 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1031 | summary: init, unrelated |
|
1031 | summary: init, unrelated | |
1032 |
|
1032 | |||
1033 |
|
1033 | |||
1034 | $ hg --traceback log -f foo |
|
1034 | $ hg --traceback log -f foo | |
1035 | changeset: 10:4dae8563d2c5 |
|
1035 | changeset: 10:4dae8563d2c5 | |
1036 | tag: tip |
|
1036 | tag: tip | |
1037 | parent: 9:7b35701b003e |
|
1037 | parent: 9:7b35701b003e | |
1038 | parent: 4:88176d361b69 |
|
1038 | parent: 4:88176d361b69 | |
1039 | user: test |
|
1039 | user: test | |
1040 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1040 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1041 | summary: Last merge, related |
|
1041 | summary: Last merge, related | |
1042 |
|
1042 | |||
1043 | changeset: 9:7b35701b003e |
|
1043 | changeset: 9:7b35701b003e | |
1044 | parent: 8:e5416ad8a855 |
|
1044 | parent: 8:e5416ad8a855 | |
1045 | parent: 7:87fe3144dcfa |
|
1045 | parent: 7:87fe3144dcfa | |
1046 | user: test |
|
1046 | user: test | |
1047 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1047 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1048 | summary: First merge, related |
|
1048 | summary: First merge, related | |
1049 |
|
1049 | |||
1050 | changeset: 8:e5416ad8a855 |
|
1050 | changeset: 8:e5416ad8a855 | |
1051 | parent: 6:dc6c325fe5ee |
|
1051 | parent: 6:dc6c325fe5ee | |
1052 | user: test |
|
1052 | user: test | |
1053 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1053 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1054 | summary: change foo in branch, related |
|
1054 | summary: change foo in branch, related | |
1055 |
|
1055 | |||
1056 | changeset: 7:87fe3144dcfa |
|
1056 | changeset: 7:87fe3144dcfa | |
1057 | user: test |
|
1057 | user: test | |
1058 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1058 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1059 | summary: change foo, related |
|
1059 | summary: change foo, related | |
1060 |
|
1060 | |||
1061 | changeset: 6:dc6c325fe5ee |
|
1061 | changeset: 6:dc6c325fe5ee | |
1062 | user: test |
|
1062 | user: test | |
1063 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1063 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1064 | summary: create foo, related |
|
1064 | summary: create foo, related | |
1065 |
|
1065 | |||
1066 | changeset: 4:88176d361b69 |
|
1066 | changeset: 4:88176d361b69 | |
1067 | user: test |
|
1067 | user: test | |
1068 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1068 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1069 | summary: add foo, related |
|
1069 | summary: add foo, related | |
1070 |
|
1070 | |||
1071 |
|
1071 | |||
1072 | Also check when maxrev < lastrevfilelog |
|
1072 | Also check when maxrev < lastrevfilelog | |
1073 |
|
1073 | |||
1074 | $ hg --traceback log -f -r4 foo |
|
1074 | $ hg --traceback log -f -r4 foo | |
1075 | changeset: 4:88176d361b69 |
|
1075 | changeset: 4:88176d361b69 | |
1076 | user: test |
|
1076 | user: test | |
1077 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1077 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1078 | summary: add foo, related |
|
1078 | summary: add foo, related | |
1079 |
|
1079 | |||
1080 | $ cd .. |
|
1080 | $ cd .. | |
1081 |
|
1081 | |||
1082 | Issue2383: hg log showing _less_ differences than hg diff |
|
1082 | Issue2383: hg log showing _less_ differences than hg diff | |
1083 |
|
1083 | |||
1084 | $ hg init issue2383 |
|
1084 | $ hg init issue2383 | |
1085 | $ cd issue2383 |
|
1085 | $ cd issue2383 | |
1086 |
|
1086 | |||
1087 | Create a test repo: |
|
1087 | Create a test repo: | |
1088 |
|
1088 | |||
1089 | $ echo a > a |
|
1089 | $ echo a > a | |
1090 | $ hg ci -Am0 |
|
1090 | $ hg ci -Am0 | |
1091 | adding a |
|
1091 | adding a | |
1092 | $ echo b > b |
|
1092 | $ echo b > b | |
1093 | $ hg ci -Am1 |
|
1093 | $ hg ci -Am1 | |
1094 | adding b |
|
1094 | adding b | |
1095 | $ hg co 0 |
|
1095 | $ hg co 0 | |
1096 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1096 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1097 | $ echo b > a |
|
1097 | $ echo b > a | |
1098 | $ hg ci -m2 |
|
1098 | $ hg ci -m2 | |
1099 | created new head |
|
1099 | created new head | |
1100 |
|
1100 | |||
1101 | Merge: |
|
1101 | Merge: | |
1102 |
|
1102 | |||
1103 | $ hg merge |
|
1103 | $ hg merge | |
1104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1105 | (branch merge, don't forget to commit) |
|
1105 | (branch merge, don't forget to commit) | |
1106 |
|
1106 | |||
1107 | Make sure there's a file listed in the merge to trigger the bug: |
|
1107 | Make sure there's a file listed in the merge to trigger the bug: | |
1108 |
|
1108 | |||
1109 | $ echo c > a |
|
1109 | $ echo c > a | |
1110 | $ hg ci -m3 |
|
1110 | $ hg ci -m3 | |
1111 |
|
1111 | |||
1112 | Two files shown here in diff: |
|
1112 | Two files shown here in diff: | |
1113 |
|
1113 | |||
1114 | $ hg diff --rev 2:3 |
|
1114 | $ hg diff --rev 2:3 | |
1115 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1115 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1116 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1116 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1117 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1117 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1118 | @@ -1,1 +1,1 @@ |
|
1118 | @@ -1,1 +1,1 @@ | |
1119 | -b |
|
1119 | -b | |
1120 | +c |
|
1120 | +c | |
1121 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1121 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1122 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1122 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1123 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1123 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1124 | @@ -0,0 +1,1 @@ |
|
1124 | @@ -0,0 +1,1 @@ | |
1125 | +b |
|
1125 | +b | |
1126 |
|
1126 | |||
1127 | Diff here should be the same: |
|
1127 | Diff here should be the same: | |
1128 |
|
1128 | |||
1129 | $ hg log -vpr 3 |
|
1129 | $ hg log -vpr 3 | |
1130 | changeset: 3:8e07aafe1edc |
|
1130 | changeset: 3:8e07aafe1edc | |
1131 | tag: tip |
|
1131 | tag: tip | |
1132 | parent: 2:b09be438c43a |
|
1132 | parent: 2:b09be438c43a | |
1133 | parent: 1:925d80f479bb |
|
1133 | parent: 1:925d80f479bb | |
1134 | user: test |
|
1134 | user: test | |
1135 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1135 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1136 | files: a |
|
1136 | files: a | |
1137 | description: |
|
1137 | description: | |
1138 | 3 |
|
1138 | 3 | |
1139 |
|
1139 | |||
1140 |
|
1140 | |||
1141 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1141 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1142 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1142 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1143 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1143 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1144 | @@ -1,1 +1,1 @@ |
|
1144 | @@ -1,1 +1,1 @@ | |
1145 | -b |
|
1145 | -b | |
1146 | +c |
|
1146 | +c | |
1147 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1147 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1148 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1148 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1149 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1149 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1150 | @@ -0,0 +1,1 @@ |
|
1150 | @@ -0,0 +1,1 @@ | |
1151 | +b |
|
1151 | +b | |
1152 |
|
1152 | |||
1153 | $ cd .. |
|
1153 | $ cd .. | |
1154 |
|
1154 | |||
1155 | 'hg log -r rev fn' when last(filelog(fn)) != rev |
|
1155 | 'hg log -r rev fn' when last(filelog(fn)) != rev | |
1156 |
|
1156 | |||
1157 | $ hg init simplelog |
|
1157 | $ hg init simplelog | |
1158 | $ cd simplelog |
|
1158 | $ cd simplelog | |
1159 | $ echo f > a |
|
1159 | $ echo f > a | |
1160 | $ hg ci -Am'a' -d '0 0' |
|
1160 | $ hg ci -Am'a' -d '0 0' | |
1161 | adding a |
|
1161 | adding a | |
1162 | $ echo f >> a |
|
1162 | $ echo f >> a | |
1163 | $ hg ci -Am'a bis' -d '1 0' |
|
1163 | $ hg ci -Am'a bis' -d '1 0' | |
1164 |
|
1164 | |||
1165 | $ hg log -r0 a |
|
1165 | $ hg log -r0 a | |
1166 | changeset: 0:9f758d63dcde |
|
1166 | changeset: 0:9f758d63dcde | |
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: a |
|
1169 | summary: a | |
1170 |
|
1170 | |||
1171 | enable obsolete to test hidden feature |
|
1171 | enable obsolete to test hidden feature | |
1172 |
|
1172 | |||
1173 | $ cat > ${TESTTMP}/obs.py << EOF |
|
1173 | $ cat > ${TESTTMP}/obs.py << EOF | |
1174 | > import mercurial.obsolete |
|
1174 | > import mercurial.obsolete | |
1175 | > mercurial.obsolete._enabled = True |
|
1175 | > mercurial.obsolete._enabled = True | |
1176 | > EOF |
|
1176 | > EOF | |
1177 | $ echo '[extensions]' >> $HGRCPATH |
|
1177 | $ echo '[extensions]' >> $HGRCPATH | |
1178 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
1178 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | |
1179 |
|
1179 | |||
1180 | $ hg log --template='{rev}:{node}\n' |
|
1180 | $ hg log --template='{rev}:{node}\n' | |
1181 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1181 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1182 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1182 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1183 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1183 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f | |
1184 | $ hg up null -q |
|
1184 | $ hg up null -q | |
1185 | $ hg log --template='{rev}:{node}\n' |
|
1185 | $ hg log --template='{rev}:{node}\n' | |
1186 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1186 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1187 | $ hg log --template='{rev}:{node}\n' --hidden |
|
1187 | $ hg log --template='{rev}:{node}\n' --hidden | |
1188 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1188 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1189 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1189 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1190 |
|
1190 | |||
1191 | test that parent prevent a changeset to be hidden |
|
1191 | test that parent prevent a changeset to be hidden | |
1192 |
|
1192 | |||
1193 | $ hg up 1 -q --hidden |
|
1193 | $ hg up 1 -q --hidden | |
1194 | $ hg log --template='{rev}:{node}\n' |
|
1194 | $ hg log --template='{rev}:{node}\n' | |
1195 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1195 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1196 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1196 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1197 |
|
1197 | |||
1198 | test that second parent prevent a changeset to be hidden too |
|
1198 | test that second parent prevent a changeset to be hidden too | |
1199 |
|
1199 | |||
1200 | $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
1200 | $ hg debugsetparents 0 1 # nothing suitable to merge here | |
1201 | $ hg log --template='{rev}:{node}\n' |
|
1201 | $ hg log --template='{rev}:{node}\n' | |
1202 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1202 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1203 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1203 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
|
1204 | $ hg debugsetparents 1 | |||
|
1205 | $ hg up -q null | |||
|
1206 | ||||
|
1207 | bookmarks prevent a changeset being hidden | |||
|
1208 | ||||
|
1209 | $ hg bookmark --hidden -r 1 X | |||
|
1210 | $ hg log --template '{rev}:{node}\n' | |||
|
1211 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |||
|
1212 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |||
1204 |
|
1213 | |||
1205 | clear extensions configuration |
|
1214 | clear extensions configuration | |
1206 | $ echo '[extensions]' >> $HGRCPATH |
|
1215 | $ echo '[extensions]' >> $HGRCPATH | |
1207 | $ echo "obs=!" >> $HGRCPATH |
|
1216 | $ echo "obs=!" >> $HGRCPATH | |
1208 | $ cd .. |
|
1217 | $ cd .. | |
1209 |
|
1218 | |||
1210 | test -u/-k for problematic encoding |
|
1219 | test -u/-k for problematic encoding | |
1211 | # unicode: cp932: |
|
1220 | # unicode: cp932: | |
1212 | # u30A2 0x83 0x41(= 'A') |
|
1221 | # u30A2 0x83 0x41(= 'A') | |
1213 | # u30C2 0x83 0x61(= 'a') |
|
1222 | # u30C2 0x83 0x61(= 'a') | |
1214 |
|
1223 | |||
1215 | $ hg init problematicencoding |
|
1224 | $ hg init problematicencoding | |
1216 | $ cd problematicencoding |
|
1225 | $ cd problematicencoding | |
1217 |
|
1226 | |||
1218 | $ python > setup.sh <<EOF |
|
1227 | $ python > setup.sh <<EOF | |
1219 | > print u''' |
|
1228 | > print u''' | |
1220 | > echo a > text |
|
1229 | > echo a > text | |
1221 | > hg add text |
|
1230 | > hg add text | |
1222 | > hg --encoding utf-8 commit -u '\u30A2' -m none |
|
1231 | > hg --encoding utf-8 commit -u '\u30A2' -m none | |
1223 | > echo b > text |
|
1232 | > echo b > text | |
1224 | > hg --encoding utf-8 commit -u '\u30C2' -m none |
|
1233 | > hg --encoding utf-8 commit -u '\u30C2' -m none | |
1225 | > echo c > text |
|
1234 | > echo c > text | |
1226 | > hg --encoding utf-8 commit -u none -m '\u30A2' |
|
1235 | > hg --encoding utf-8 commit -u none -m '\u30A2' | |
1227 | > echo d > text |
|
1236 | > echo d > text | |
1228 | > hg --encoding utf-8 commit -u none -m '\u30C2' |
|
1237 | > hg --encoding utf-8 commit -u none -m '\u30C2' | |
1229 | > '''.encode('utf-8') |
|
1238 | > '''.encode('utf-8') | |
1230 | > EOF |
|
1239 | > EOF | |
1231 | $ sh < setup.sh |
|
1240 | $ sh < setup.sh | |
1232 |
|
1241 | |||
1233 | test in problematic encoding |
|
1242 | test in problematic encoding | |
1234 | $ python > test.sh <<EOF |
|
1243 | $ python > test.sh <<EOF | |
1235 | > print u''' |
|
1244 | > print u''' | |
1236 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
|
1245 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' | |
1237 | > echo ==== |
|
1246 | > echo ==== | |
1238 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
|
1247 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' | |
1239 | > echo ==== |
|
1248 | > echo ==== | |
1240 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
|
1249 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' | |
1241 | > echo ==== |
|
1250 | > echo ==== | |
1242 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
|
1251 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' | |
1243 | > '''.encode('cp932') |
|
1252 | > '''.encode('cp932') | |
1244 | > EOF |
|
1253 | > EOF | |
1245 | $ sh < test.sh |
|
1254 | $ sh < test.sh | |
1246 | 0 |
|
1255 | 0 | |
1247 | ==== |
|
1256 | ==== | |
1248 | 1 |
|
1257 | 1 | |
1249 | ==== |
|
1258 | ==== | |
1250 | 2 |
|
1259 | 2 | |
1251 | 0 |
|
1260 | 0 | |
1252 | ==== |
|
1261 | ==== | |
1253 | 3 |
|
1262 | 3 | |
1254 | 1 |
|
1263 | 1 | |
1255 |
|
1264 | |||
1256 | $ cd .. |
|
1265 | $ cd .. | |
1257 |
|
1266 | |||
1258 | test hg log on non-existent files and on directories |
|
1267 | test hg log on non-existent files and on directories | |
1259 | $ hg init issue1340 |
|
1268 | $ hg init issue1340 | |
1260 | $ cd issue1340 |
|
1269 | $ cd issue1340 | |
1261 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
|
1270 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 | |
1262 | $ echo 1 > d1/f1 |
|
1271 | $ echo 1 > d1/f1 | |
1263 | $ echo 1 > D2/f1 |
|
1272 | $ echo 1 > D2/f1 | |
1264 | $ echo 1 > D3.i/f1 |
|
1273 | $ echo 1 > D3.i/f1 | |
1265 | $ echo 1 > d4.hg/f1 |
|
1274 | $ echo 1 > d4.hg/f1 | |
1266 | $ echo 1 > d5.d/f1 |
|
1275 | $ echo 1 > d5.d/f1 | |
1267 | $ echo 1 > .d6/f1 |
|
1276 | $ echo 1 > .d6/f1 | |
1268 | $ hg -q add . |
|
1277 | $ hg -q add . | |
1269 | $ hg commit -m "a bunch of weird directories" |
|
1278 | $ hg commit -m "a bunch of weird directories" | |
1270 | $ hg log -l1 d1/f1 | grep changeset |
|
1279 | $ hg log -l1 d1/f1 | grep changeset | |
1271 | changeset: 0:65624cd9070a |
|
1280 | changeset: 0:65624cd9070a | |
1272 | $ hg log -l1 f1 |
|
1281 | $ hg log -l1 f1 | |
1273 | $ hg log -l1 . | grep changeset |
|
1282 | $ hg log -l1 . | grep changeset | |
1274 | changeset: 0:65624cd9070a |
|
1283 | changeset: 0:65624cd9070a | |
1275 | $ hg log -l1 ./ | grep changeset |
|
1284 | $ hg log -l1 ./ | grep changeset | |
1276 | changeset: 0:65624cd9070a |
|
1285 | changeset: 0:65624cd9070a | |
1277 | $ hg log -l1 d1 | grep changeset |
|
1286 | $ hg log -l1 d1 | grep changeset | |
1278 | changeset: 0:65624cd9070a |
|
1287 | changeset: 0:65624cd9070a | |
1279 | $ hg log -l1 D2 | grep changeset |
|
1288 | $ hg log -l1 D2 | grep changeset | |
1280 | changeset: 0:65624cd9070a |
|
1289 | changeset: 0:65624cd9070a | |
1281 | $ hg log -l1 D2/f1 | grep changeset |
|
1290 | $ hg log -l1 D2/f1 | grep changeset | |
1282 | changeset: 0:65624cd9070a |
|
1291 | changeset: 0:65624cd9070a | |
1283 | $ hg log -l1 D3.i | grep changeset |
|
1292 | $ hg log -l1 D3.i | grep changeset | |
1284 | changeset: 0:65624cd9070a |
|
1293 | changeset: 0:65624cd9070a | |
1285 | $ hg log -l1 D3.i/f1 | grep changeset |
|
1294 | $ hg log -l1 D3.i/f1 | grep changeset | |
1286 | changeset: 0:65624cd9070a |
|
1295 | changeset: 0:65624cd9070a | |
1287 | $ hg log -l1 d4.hg | grep changeset |
|
1296 | $ hg log -l1 d4.hg | grep changeset | |
1288 | changeset: 0:65624cd9070a |
|
1297 | changeset: 0:65624cd9070a | |
1289 | $ hg log -l1 d4.hg/f1 | grep changeset |
|
1298 | $ hg log -l1 d4.hg/f1 | grep changeset | |
1290 | changeset: 0:65624cd9070a |
|
1299 | changeset: 0:65624cd9070a | |
1291 | $ hg log -l1 d5.d | grep changeset |
|
1300 | $ hg log -l1 d5.d | grep changeset | |
1292 | changeset: 0:65624cd9070a |
|
1301 | changeset: 0:65624cd9070a | |
1293 | $ hg log -l1 d5.d/f1 | grep changeset |
|
1302 | $ hg log -l1 d5.d/f1 | grep changeset | |
1294 | changeset: 0:65624cd9070a |
|
1303 | changeset: 0:65624cd9070a | |
1295 | $ hg log -l1 .d6 | grep changeset |
|
1304 | $ hg log -l1 .d6 | grep changeset | |
1296 | changeset: 0:65624cd9070a |
|
1305 | changeset: 0:65624cd9070a | |
1297 | $ hg log -l1 .d6/f1 | grep changeset |
|
1306 | $ hg log -l1 .d6/f1 | grep changeset | |
1298 | changeset: 0:65624cd9070a |
|
1307 | changeset: 0:65624cd9070a | |
1299 |
|
1308 | |||
1300 | issue3772: hg log -r :null showing revision 0 as well |
|
1309 | issue3772: hg log -r :null showing revision 0 as well | |
1301 |
|
1310 | |||
1302 | $ hg log -r :null |
|
1311 | $ hg log -r :null | |
1303 | changeset: -1:000000000000 |
|
1312 | changeset: -1:000000000000 | |
1304 | user: |
|
1313 | user: | |
1305 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1314 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1306 |
|
1315 | |||
1307 | $ hg log -r null:null |
|
1316 | $ hg log -r null:null | |
1308 | changeset: -1:000000000000 |
|
1317 | changeset: -1:000000000000 | |
1309 | user: |
|
1318 | user: | |
1310 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1319 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1311 |
|
1320 | |||
1312 |
|
1321 | |||
1313 | $ cd .. |
|
1322 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now