Show More
@@ -240,7 +240,9 b' def showactivebookmark(context, mapping)' | |||
|
240 | 240 | def showdate(context, mapping): |
|
241 | 241 | """Date information. The date when the changeset was committed.""" |
|
242 | 242 | ctx = context.resource(mapping, 'ctx') |
|
243 | return templateutil.date(ctx.date()) | |
|
243 | # the default string format is '<float(unixtime)><tzoffset>' because | |
|
244 | # python-hglib splits date at decimal separator. | |
|
245 | return templateutil.date(ctx.date(), showfmt='%d.0%d') | |
|
244 | 246 | |
|
245 | 247 | @templatekeyword('desc', requires={'ctx'}) |
|
246 | 248 | def showdescription(context, mapping): |
@@ -190,10 +190,11 b' class wrappedvalue(wrapped):' | |||
|
190 | 190 | class date(mappable, wrapped): |
|
191 | 191 | """Wrapper for date tuple""" |
|
192 | 192 | |
|
193 | def __init__(self, value): | |
|
193 | def __init__(self, value, showfmt='%d %d'): | |
|
194 | 194 | # value may be (float, int), but public interface shouldn't support |
|
195 | 195 | # floating-point timestamp |
|
196 | 196 | self._unixtime, self._tzoffset = map(int, value) |
|
197 | self._showfmt = showfmt | |
|
197 | 198 | |
|
198 | 199 | def contains(self, context, mapping, item): |
|
199 | 200 | raise error.ParseError(_('date is not iterable')) |
@@ -211,7 +212,7 b' class date(mappable, wrapped):' | |||
|
211 | 212 | raise error.ParseError(_("date is not iterable")) |
|
212 | 213 | |
|
213 | 214 | def show(self, context, mapping): |
|
214 |
return |
|
|
215 | return self._showfmt % (self._unixtime, self._tzoffset) | |
|
215 | 216 | |
|
216 | 217 | def tomap(self, context): |
|
217 | 218 | return {'unixtime': self._unixtime, 'tzoffset': self._tzoffset} |
@@ -107,7 +107,7 b' Matcher and metadata options' | |||
|
107 | 107 | $ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D |
|
108 | 108 | saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b3e76daa-amend.hg (obsstore-off !) |
|
109 | 109 | $ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n' |
|
110 |
14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000 |
|
|
110 | 14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000 | |
|
111 | 111 | |
|
112 | 112 | Amend with editor |
|
113 | 113 |
@@ -1548,33 +1548,33 b' Keys work:' | |||
|
1548 | 1548 | branches--debug: |
|
1549 | 1549 | branches--debug: |
|
1550 | 1550 | branches--debug: |
|
1551 |
date: 1577872860 |
|
|
1552 |
date: 1000000 |
|
|
1553 |
date: 1500001 |
|
|
1554 |
date: 1500000 |
|
|
1555 |
date: 1400000 |
|
|
1556 |
date: 1300000 |
|
|
1557 |
date: 1200000 |
|
|
1558 |
date: 1100000 |
|
|
1559 |
date: 1000000 |
|
|
1560 |
date--verbose: 1577872860 |
|
|
1561 |
date--verbose: 1000000 |
|
|
1562 |
date--verbose: 1500001 |
|
|
1563 |
date--verbose: 1500000 |
|
|
1564 |
date--verbose: 1400000 |
|
|
1565 |
date--verbose: 1300000 |
|
|
1566 |
date--verbose: 1200000 |
|
|
1567 |
date--verbose: 1100000 |
|
|
1568 |
date--verbose: 1000000 |
|
|
1569 |
date--debug: 1577872860 |
|
|
1570 |
date--debug: 1000000 |
|
|
1571 |
date--debug: 1500001 |
|
|
1572 |
date--debug: 1500000 |
|
|
1573 |
date--debug: 1400000 |
|
|
1574 |
date--debug: 1300000 |
|
|
1575 |
date--debug: 1200000 |
|
|
1576 |
date--debug: 1100000 |
|
|
1577 |
date--debug: 1000000 |
|
|
1551 | date: 1577872860.00 | |
|
1552 | date: 1000000.00 | |
|
1553 | date: 1500001.00 | |
|
1554 | date: 1500000.00 | |
|
1555 | date: 1400000.00 | |
|
1556 | date: 1300000.00 | |
|
1557 | date: 1200000.00 | |
|
1558 | date: 1100000.00 | |
|
1559 | date: 1000000.00 | |
|
1560 | date--verbose: 1577872860.00 | |
|
1561 | date--verbose: 1000000.00 | |
|
1562 | date--verbose: 1500001.00 | |
|
1563 | date--verbose: 1500000.00 | |
|
1564 | date--verbose: 1400000.00 | |
|
1565 | date--verbose: 1300000.00 | |
|
1566 | date--verbose: 1200000.00 | |
|
1567 | date--verbose: 1100000.00 | |
|
1568 | date--verbose: 1000000.00 | |
|
1569 | date--debug: 1577872860.00 | |
|
1570 | date--debug: 1000000.00 | |
|
1571 | date--debug: 1500001.00 | |
|
1572 | date--debug: 1500000.00 | |
|
1573 | date--debug: 1400000.00 | |
|
1574 | date--debug: 1300000.00 | |
|
1575 | date--debug: 1200000.00 | |
|
1576 | date--debug: 1100000.00 | |
|
1577 | date--debug: 1000000.00 | |
|
1578 | 1578 | desc: third |
|
1579 | 1579 | desc: second |
|
1580 | 1580 | desc: merge |
@@ -2291,7 +2291,7 b' Upper/lower filters:' | |||
|
2291 | 2291 | $ hg log -r0 --template '{author|lower}\n' |
|
2292 | 2292 | user name <user@hostname> |
|
2293 | 2293 | $ hg log -r0 --template '{date|upper}\n' |
|
2294 |
1000000 |
|
|
2294 | 1000000.00 | |
|
2295 | 2295 | |
|
2296 | 2296 | Add a commit that does all possible modifications at once |
|
2297 | 2297 | |
@@ -2806,9 +2806,9 b' Error on syntax:' | |||
|
2806 | 2806 | Behind the scenes, this would throw TypeError without intype=bytes |
|
2807 | 2807 | |
|
2808 | 2808 | $ hg log -l 3 --template '{date|obfuscate}\n' |
|
2809 |
0&# |
|
|
2810 |
0&# |
|
|
2811 |
1577872860&# |
|
|
2809 | 0.00 | |
|
2810 | 0.00 | |
|
2811 | 1577872860.00 | |
|
2812 | 2812 | |
|
2813 | 2813 | Behind the scenes, this will throw a ValueError |
|
2814 | 2814 | |
@@ -2820,9 +2820,9 b' Behind the scenes, this will throw a Val' | |||
|
2820 | 2820 | Behind the scenes, this would throw AttributeError without intype=bytes |
|
2821 | 2821 | |
|
2822 | 2822 | $ hg log -l 3 --template 'line: {date|escape}\n' |
|
2823 |
line: 0 |
|
|
2824 |
line: 0 |
|
|
2825 |
line: 1577872860 |
|
|
2823 | line: 0.00 | |
|
2824 | line: 0.00 | |
|
2825 | line: 1577872860.00 | |
|
2826 | 2826 | |
|
2827 | 2827 | $ hg log -l 3 --template 'line: {extras|localdate}\n' |
|
2828 | 2828 | hg: parse error: localdate expects a date information |
@@ -4625,8 +4625,8 b' Test indent and not adding to empty line' | |||
|
4625 | 4625 | Test with non-strings like dates |
|
4626 | 4626 | |
|
4627 | 4627 | $ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a |
|
4628 |
1200000 |
|
|
4629 |
1300000 |
|
|
4628 | 1200000.00 | |
|
4629 | 1300000.00 | |
|
4630 | 4630 | |
|
4631 | 4631 | Test broken string escapes: |
|
4632 | 4632 |
@@ -42,29 +42,29 b' tip' | |||
|
42 | 42 | 000000000000 |
|
43 | 43 | glog |
|
44 | 44 | $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
45 |
o 11: r11 [] @ 11 |
|
|
45 | o 11: r11 [] @ 11.00 | |
|
46 | 46 | | |
|
47 |
o 10: r10 [] @ 10 |
|
|
47 | o 10: r10 [] @ 10.00 | |
|
48 | 48 | | |
|
49 |
o 9: r9 [] @ 9 |
|
|
49 | o 9: r9 [] @ 9.00 | |
|
50 | 50 | |\ |
|
51 |
| o 8: r8 [temp] @ 8 |
|
|
51 | | o 8: r8 [temp] @ 8.00 | |
|
52 | 52 | | | |
|
53 |
| o 7: r7 [temp] @ 7 |
|
|
53 | | o 7: r7 [temp] @ 7.00 | |
|
54 | 54 | | | |
|
55 |
| o 6: r6 [temp] @ 6 |
|
|
55 | | o 6: r6 [temp] @ 6.00 | |
|
56 | 56 | | | |
|
57 |
| o 5: r5 [temp] @ 5 |
|
|
57 | | o 5: r5 [temp] @ 5.00 | |
|
58 | 58 | | | |
|
59 |
o | 4: r4 [] @ 4 |
|
|
59 | o | 4: r4 [] @ 4.00 | |
|
60 | 60 | | | |
|
61 |
o | 3: r3 [] @ 3 |
|
|
61 | o | 3: r3 [] @ 3.00 | |
|
62 | 62 | | | |
|
63 |
o | 2: r2 [] @ 2 |
|
|
63 | o | 2: r2 [] @ 2.00 | |
|
64 | 64 | |/ |
|
65 |
o 1: r1 [] @ 1 |
|
|
65 | o 1: r1 [] @ 1.00 | |
|
66 | 66 | | |
|
67 |
o 0: r0 [] @ 0 |
|
|
67 | o 0: r0 [] @ 0.00 | |
|
68 | 68 | |
|
69 | 69 | |
|
70 | 70 | overwritten files, starting on a non-default branch |
@@ -88,29 +88,29 b' tip' | |||
|
88 | 88 | 000000000000 |
|
89 | 89 | glog |
|
90 | 90 | $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
91 |
o 11: r11 [] @ 11 |
|
|
91 | o 11: r11 [] @ 11.00 | |
|
92 | 92 | | |
|
93 |
o 10: r10 [] @ 10 |
|
|
93 | o 10: r10 [] @ 10.00 | |
|
94 | 94 | | |
|
95 |
o 9: r9 [] @ 9 |
|
|
95 | o 9: r9 [] @ 9.00 | |
|
96 | 96 | |\ |
|
97 |
| o 8: r8 [temp] @ 8 |
|
|
97 | | o 8: r8 [temp] @ 8.00 | |
|
98 | 98 | | | |
|
99 |
| o 7: r7 [temp] @ 7 |
|
|
99 | | o 7: r7 [temp] @ 7.00 | |
|
100 | 100 | | | |
|
101 |
| o 6: r6 [temp] @ 6 |
|
|
101 | | o 6: r6 [temp] @ 6.00 | |
|
102 | 102 | | | |
|
103 |
| o 5: r5 [temp] @ 5 |
|
|
103 | | o 5: r5 [temp] @ 5.00 | |
|
104 | 104 | | | |
|
105 |
o | 4: r4 [] @ 4 |
|
|
105 | o | 4: r4 [] @ 4.00 | |
|
106 | 106 | | | |
|
107 |
o | 3: r3 [] @ 3 |
|
|
107 | o | 3: r3 [] @ 3.00 | |
|
108 | 108 | | | |
|
109 |
o | 2: r2 [] @ 2 |
|
|
109 | o | 2: r2 [] @ 2.00 | |
|
110 | 110 | |/ |
|
111 |
o 1: r1 [] @ 1 |
|
|
111 | o 1: r1 [] @ 1.00 | |
|
112 | 112 | | |
|
113 |
o 0: r0 [start] @ 0 |
|
|
113 | o 0: r0 [start] @ 0.00 | |
|
114 | 114 | |
|
115 | 115 | glog of |
|
116 | 116 | $ hg log -G --template '{rev}: {desc} [{branches}]\n' of |
@@ -164,29 +164,29 b' tip' | |||
|
164 | 164 | 000000000000 |
|
165 | 165 | glog |
|
166 | 166 | $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
167 |
o 11: r11 [] @ 11 |
|
|
167 | o 11: r11 [] @ 11.00 | |
|
168 | 168 | | |
|
169 |
o 10: r10 [] @ 10 |
|
|
169 | o 10: r10 [] @ 10.00 | |
|
170 | 170 | | |
|
171 |
o 9: r9 [] @ 9 |
|
|
171 | o 9: r9 [] @ 9.00 | |
|
172 | 172 | |\ |
|
173 |
| o 8: r8 [temp] @ 8 |
|
|
173 | | o 8: r8 [temp] @ 8.00 | |
|
174 | 174 | | | |
|
175 |
| o 7: r7 [temp] @ 7 |
|
|
175 | | o 7: r7 [temp] @ 7.00 | |
|
176 | 176 | | | |
|
177 |
| o 6: r6 [temp] @ 6 |
|
|
177 | | o 6: r6 [temp] @ 6.00 | |
|
178 | 178 | | | |
|
179 |
| o 5: r5 [temp] @ 5 |
|
|
179 | | o 5: r5 [temp] @ 5.00 | |
|
180 | 180 | | | |
|
181 |
o | 4: r4 [] @ 4 |
|
|
181 | o | 4: r4 [] @ 4.00 | |
|
182 | 182 | | | |
|
183 |
o | 3: r3 [] @ 3 |
|
|
183 | o | 3: r3 [] @ 3.00 | |
|
184 | 184 | | | |
|
185 |
o | 2: r2 [] @ 2 |
|
|
185 | o | 2: r2 [] @ 2.00 | |
|
186 | 186 | |/ |
|
187 |
o 1: r1 [] @ 1 |
|
|
187 | o 1: r1 [] @ 1.00 | |
|
188 | 188 | | |
|
189 |
o 0: r0 [] @ 0 |
|
|
189 | o 0: r0 [] @ 0.00 | |
|
190 | 190 | |
|
191 | 191 | glog mf |
|
192 | 192 | $ hg log -G --template '{rev}: {desc} [{branches}]\n' mf |
@@ -202,7 +202,7 b'' | |||
|
202 | 202 | ==== qnew -d |
|
203 | 203 | Date: 3 0 |
|
204 | 204 | |
|
205 |
0: 758bd2596a39 [mq]: 1.patch - test - 3 |
|
|
205 | 0: 758bd2596a39 [mq]: 1.patch - test - 3.00 | |
|
206 | 206 | ==== qref |
|
207 | 207 | adding 1 |
|
208 | 208 | Date: 3 0 |
@@ -212,7 +212,7 b'' | |||
|
212 | 212 | +++ b/1 |
|
213 | 213 | @@ -0,0 +1,1 @@ |
|
214 | 214 | +1 |
|
215 |
0: 8c640e9949a8 [mq]: 1.patch - test - 3 |
|
|
215 | 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00 | |
|
216 | 216 | ==== qref -d |
|
217 | 217 | Date: 4 0 |
|
218 | 218 | |
@@ -221,7 +221,7 b'' | |||
|
221 | 221 | +++ b/1 |
|
222 | 222 | @@ -0,0 +1,1 @@ |
|
223 | 223 | +1 |
|
224 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
224 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
225 | 225 | ==== qnew |
|
226 | 226 | adding 2 |
|
227 | 227 | diff -r ... 2 |
@@ -248,8 +248,8 b'' | |||
|
248 | 248 | |
|
249 | 249 | Three |
|
250 | 250 | |
|
251 |
1: 2a9ef0bdefba Three - test - 6 |
|
|
252 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
251 | 1: 2a9ef0bdefba Three - test - 6.00 | |
|
252 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
253 | 253 | ==== qref |
|
254 | 254 | adding 3 |
|
255 | 255 | Date: 6 0 |
@@ -261,8 +261,8 b'' | |||
|
261 | 261 | +++ b/3 |
|
262 | 262 | @@ -0,0 +1,1 @@ |
|
263 | 263 | +3 |
|
264 |
1: 7f19ad9eea7b Three - test - 6 |
|
|
265 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
264 | 1: 7f19ad9eea7b Three - test - 6.00 | |
|
265 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
266 | 266 | ==== qref -m |
|
267 | 267 | Date: 6 0 |
|
268 | 268 | |
@@ -273,8 +273,8 b'' | |||
|
273 | 273 | +++ b/3 |
|
274 | 274 | @@ -0,0 +1,1 @@ |
|
275 | 275 | +3 |
|
276 |
1: 7ff7377793e3 Drei - test - 6 |
|
|
277 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
276 | 1: 7ff7377793e3 Drei - test - 6.00 | |
|
277 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
278 | 278 | ==== qref -d |
|
279 | 279 | Date: 7 0 |
|
280 | 280 | |
@@ -285,8 +285,8 b'' | |||
|
285 | 285 | +++ b/3 |
|
286 | 286 | @@ -0,0 +1,1 @@ |
|
287 | 287 | +3 |
|
288 |
1: d89d3144f518 Drei - test - 7 |
|
|
289 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
288 | 1: d89d3144f518 Drei - test - 7.00 | |
|
289 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
290 | 290 | ==== qref -d -m |
|
291 | 291 | Date: 8 0 |
|
292 | 292 | |
@@ -297,8 +297,8 b'' | |||
|
297 | 297 | +++ b/3 |
|
298 | 298 | @@ -0,0 +1,1 @@ |
|
299 | 299 | +3 |
|
300 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
301 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
300 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
301 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
302 | 302 | ==== qnew -m |
|
303 | 303 | adding 4 |
|
304 | 304 | Four |
@@ -331,9 +331,9 b'' | |||
|
331 | 331 | now at: 3.patch |
|
332 | 332 | # HG changeset patch |
|
333 | 333 | # Date 10 0 |
|
334 |
2: d16a272220d2 imported patch 5.patch - test - 10 |
|
|
335 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
336 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
334 | 2: d16a272220d2 imported patch 5.patch - test - 10.00 | |
|
335 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
336 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
337 | 337 | ==== hg qref |
|
338 | 338 | adding 5 |
|
339 | 339 | # HG changeset patch |
@@ -345,9 +345,9 b'' | |||
|
345 | 345 | +++ b/5 |
|
346 | 346 | @@ -0,0 +1,1 @@ |
|
347 | 347 | +5 |
|
348 |
2: 5dbf69c07df9 [mq]: 5.patch - test - 10 |
|
|
349 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
350 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
348 | 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00 | |
|
349 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
350 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
351 | 351 | ==== hg qref -d |
|
352 | 352 | # HG changeset patch |
|
353 | 353 | # Date 11 0 |
@@ -358,9 +358,9 b'' | |||
|
358 | 358 | +++ b/5 |
|
359 | 359 | @@ -0,0 +1,1 @@ |
|
360 | 360 | +5 |
|
361 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
362 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
363 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
361 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
362 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
363 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
364 | 364 | ==== qnew with plain header |
|
365 | 365 | popping 6.patch |
|
366 | 366 | now at: 5.patch |
@@ -380,10 +380,10 b'' | |||
|
380 | 380 | +++ b/6 |
|
381 | 381 | @@ -0,0 +1,1 @@ |
|
382 | 382 | +6 |
|
383 |
3: 038c46b02a56 [mq]: 6.patch - test - 12 |
|
|
384 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
385 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
386 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
383 | 3: 038c46b02a56 [mq]: 6.patch - test - 12.00 | |
|
384 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
385 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
386 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
387 | 387 | ==== hg qref -d |
|
388 | 388 | Date: 13 0 |
|
389 | 389 | |
@@ -392,10 +392,10 b'' | |||
|
392 | 392 | +++ b/6 |
|
393 | 393 | @@ -0,0 +1,1 @@ |
|
394 | 394 | +6 |
|
395 |
3: 2785642ea4b4 [mq]: 6.patch - test - 13 |
|
|
396 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
397 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
398 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
395 | 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00 | |
|
396 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
397 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
398 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
399 | 399 | popping 6.patch |
|
400 | 400 | now at: 5.patch |
|
401 | 401 | ==== qnew -u |
@@ -448,10 +448,10 b'' | |||
|
448 | 448 | +++ b/7 |
|
449 | 449 | @@ -0,0 +1,1 @@ |
|
450 | 450 | +7 |
|
451 |
3: 4f9d07369cc4 [mq]: 7.patch - john - 13 |
|
|
452 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
453 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
454 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
451 | 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00 | |
|
452 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
453 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
454 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
455 | 455 | ==== qnew |
|
456 | 456 | adding 8 |
|
457 | 457 | diff -r ... 8 |
@@ -523,10 +523,10 b'' | |||
|
523 | 523 | applying 5.patch |
|
524 | 524 | applying 7.patch |
|
525 | 525 | now at: 7.patch |
|
526 |
3: d26a5b7ffce1 imported patch 7.patch - john - 13 |
|
|
527 |
2: dda6cf77060a imported patch 5.patch - test - 11 |
|
|
528 |
1: 25e32d66c8c7 Three (again) - test - 8 |
|
|
529 |
0: e5011c0211fe imported patch 1.patch - test - 4 |
|
|
526 | 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00 | |
|
527 | 2: dda6cf77060a imported patch 5.patch - test - 11.00 | |
|
528 | 1: 25e32d66c8c7 Three (again) - test - 8.00 | |
|
529 | 0: e5011c0211fe imported patch 1.patch - test - 4.00 | |
|
530 | 530 | $ rm -r sandbox |
|
531 | 531 | |
|
532 | 532 | ======= hg headers |
@@ -540,7 +540,7 b'' | |||
|
540 | 540 | # Date 3 0 |
|
541 | 541 | # Parent |
|
542 | 542 | |
|
543 |
0: 758bd2596a39 [mq]: 1.patch - test - 3 |
|
|
543 | 0: 758bd2596a39 [mq]: 1.patch - test - 3.00 | |
|
544 | 544 | ==== qref |
|
545 | 545 | adding 1 |
|
546 | 546 | # HG changeset patch |
@@ -552,7 +552,7 b'' | |||
|
552 | 552 | +++ b/1 |
|
553 | 553 | @@ -0,0 +1,1 @@ |
|
554 | 554 | +1 |
|
555 |
0: 8c640e9949a8 [mq]: 1.patch - test - 3 |
|
|
555 | 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00 | |
|
556 | 556 | ==== qref -d |
|
557 | 557 | # HG changeset patch |
|
558 | 558 | # Date 4 0 |
@@ -563,7 +563,7 b'' | |||
|
563 | 563 | +++ b/1 |
|
564 | 564 | @@ -0,0 +1,1 @@ |
|
565 | 565 | +1 |
|
566 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
566 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
567 | 567 | ==== qnew |
|
568 | 568 | adding 2 |
|
569 | 569 | # HG changeset patch |
@@ -596,8 +596,8 b'' | |||
|
596 | 596 | # Parent |
|
597 | 597 | Three |
|
598 | 598 | |
|
599 |
1: 2a9ef0bdefba Three - test - 6 |
|
|
600 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
599 | 1: 2a9ef0bdefba Three - test - 6.00 | |
|
600 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
601 | 601 | ==== qref |
|
602 | 602 | adding 3 |
|
603 | 603 | # HG changeset patch |
@@ -610,8 +610,8 b'' | |||
|
610 | 610 | +++ b/3 |
|
611 | 611 | @@ -0,0 +1,1 @@ |
|
612 | 612 | +3 |
|
613 |
1: 7f19ad9eea7b Three - test - 6 |
|
|
614 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
613 | 1: 7f19ad9eea7b Three - test - 6.00 | |
|
614 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
615 | 615 | ==== qref -m |
|
616 | 616 | # HG changeset patch |
|
617 | 617 | # Date 6 0 |
@@ -623,8 +623,8 b'' | |||
|
623 | 623 | +++ b/3 |
|
624 | 624 | @@ -0,0 +1,1 @@ |
|
625 | 625 | +3 |
|
626 |
1: 7ff7377793e3 Drei - test - 6 |
|
|
627 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
626 | 1: 7ff7377793e3 Drei - test - 6.00 | |
|
627 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
628 | 628 | ==== qref -d |
|
629 | 629 | # HG changeset patch |
|
630 | 630 | # Date 7 0 |
@@ -636,8 +636,8 b'' | |||
|
636 | 636 | +++ b/3 |
|
637 | 637 | @@ -0,0 +1,1 @@ |
|
638 | 638 | +3 |
|
639 |
1: d89d3144f518 Drei - test - 7 |
|
|
640 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
639 | 1: d89d3144f518 Drei - test - 7.00 | |
|
640 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
641 | 641 | ==== qref -d -m |
|
642 | 642 | # HG changeset patch |
|
643 | 643 | # Date 8 0 |
@@ -649,8 +649,8 b'' | |||
|
649 | 649 | +++ b/3 |
|
650 | 650 | @@ -0,0 +1,1 @@ |
|
651 | 651 | +3 |
|
652 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
653 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
652 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
653 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
654 | 654 | ==== qnew -m |
|
655 | 655 | adding 4 |
|
656 | 656 | # HG changeset patch |
@@ -686,9 +686,9 b'' | |||
|
686 | 686 | now at: 3.patch |
|
687 | 687 | # HG changeset patch |
|
688 | 688 | # Date 10 0 |
|
689 |
2: d16a272220d2 imported patch 5.patch - test - 10 |
|
|
690 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
691 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
689 | 2: d16a272220d2 imported patch 5.patch - test - 10.00 | |
|
690 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
691 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
692 | 692 | ==== hg qref |
|
693 | 693 | adding 5 |
|
694 | 694 | # HG changeset patch |
@@ -700,9 +700,9 b'' | |||
|
700 | 700 | +++ b/5 |
|
701 | 701 | @@ -0,0 +1,1 @@ |
|
702 | 702 | +5 |
|
703 |
2: 5dbf69c07df9 [mq]: 5.patch - test - 10 |
|
|
704 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
705 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
703 | 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00 | |
|
704 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
705 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
706 | 706 | ==== hg qref -d |
|
707 | 707 | # HG changeset patch |
|
708 | 708 | # Date 11 0 |
@@ -713,9 +713,9 b'' | |||
|
713 | 713 | +++ b/5 |
|
714 | 714 | @@ -0,0 +1,1 @@ |
|
715 | 715 | +5 |
|
716 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
717 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
718 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
716 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
717 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
718 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
719 | 719 | ==== qnew with plain header |
|
720 | 720 | popping 6.patch |
|
721 | 721 | now at: 5.patch |
@@ -735,10 +735,10 b'' | |||
|
735 | 735 | +++ b/6 |
|
736 | 736 | @@ -0,0 +1,1 @@ |
|
737 | 737 | +6 |
|
738 |
3: 038c46b02a56 [mq]: 6.patch - test - 12 |
|
|
739 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
740 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
741 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
738 | 3: 038c46b02a56 [mq]: 6.patch - test - 12.00 | |
|
739 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
740 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
741 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
742 | 742 | ==== hg qref -d |
|
743 | 743 | Date: 13 0 |
|
744 | 744 | |
@@ -747,10 +747,10 b'' | |||
|
747 | 747 | +++ b/6 |
|
748 | 748 | @@ -0,0 +1,1 @@ |
|
749 | 749 | +6 |
|
750 |
3: 2785642ea4b4 [mq]: 6.patch - test - 13 |
|
|
751 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
752 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
753 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
750 | 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00 | |
|
751 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
752 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
753 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
754 | 754 | popping 6.patch |
|
755 | 755 | now at: 5.patch |
|
756 | 756 | ==== qnew -u |
@@ -811,10 +811,10 b'' | |||
|
811 | 811 | +++ b/7 |
|
812 | 812 | @@ -0,0 +1,1 @@ |
|
813 | 813 | +7 |
|
814 |
3: 4f9d07369cc4 [mq]: 7.patch - john - 13 |
|
|
815 |
2: 049de6af0c1d [mq]: 5.patch - test - 11 |
|
|
816 |
1: b1b6b0fe0e6d Three (again) - test - 8 |
|
|
817 |
0: 4a67dfeea974 [mq]: 1.patch - test - 4 |
|
|
814 | 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00 | |
|
815 | 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 | |
|
816 | 1: b1b6b0fe0e6d Three (again) - test - 8.00 | |
|
817 | 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 | |
|
818 | 818 | ==== qnew |
|
819 | 819 | adding 8 |
|
820 | 820 | # HG changeset patch |
@@ -894,8 +894,8 b'' | |||
|
894 | 894 | applying 5.patch |
|
895 | 895 | applying 7.patch |
|
896 | 896 | now at: 7.patch |
|
897 |
3: d26a5b7ffce1 imported patch 7.patch - john - 13 |
|
|
898 |
2: dda6cf77060a imported patch 5.patch - test - 11 |
|
|
899 |
1: 25e32d66c8c7 Three (again) - test - 8 |
|
|
900 |
0: e5011c0211fe imported patch 1.patch - test - 4 |
|
|
897 | 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00 | |
|
898 | 2: dda6cf77060a imported patch 5.patch - test - 11.00 | |
|
899 | 1: 25e32d66c8c7 Three (again) - test - 8.00 | |
|
900 | 0: e5011c0211fe imported patch 1.patch - test - 4.00 | |
|
901 | 901 | $ rm -r sandbox |
General Comments 0
You need to be logged in to leave comments.
Login now