Mercurial > hg-stable
changeset 38310:88e7105b5cd9
templater: restore the original string format of {date}
Unfortunately, python-hglib relies on that. I could fix python-hglib, but
there would be other tools that take a decimal separator as the separator
of unixtime and tzoffset.
The showfmt is set per instance since new code uses '%d %d' format by default.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 13 Jun 2018 21:57:24 +0900 |
| parents | af0e88e64ede |
| children | 74b4a54002ec |
| files | mercurial/templatekw.py mercurial/templateutil.py tests/test-amend.t tests/test-command-template.t tests/test-debugbuilddag.t tests/test-mq-header-date.t |
| diffstat | 6 files changed, 155 insertions(+), 152 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templatekw.py Tue Jun 12 20:43:56 2018 -0400 +++ b/mercurial/templatekw.py Wed Jun 13 21:57:24 2018 +0900 @@ -240,7 +240,9 @@ def showdate(context, mapping): """Date information. The date when the changeset was committed.""" ctx = context.resource(mapping, 'ctx') - return templateutil.date(ctx.date()) + # the default string format is '<float(unixtime)><tzoffset>' because + # python-hglib splits date at decimal separator. + return templateutil.date(ctx.date(), showfmt='%d.0%d') @templatekeyword('desc', requires={'ctx'}) def showdescription(context, mapping):
--- a/mercurial/templateutil.py Tue Jun 12 20:43:56 2018 -0400 +++ b/mercurial/templateutil.py Wed Jun 13 21:57:24 2018 +0900 @@ -190,10 +190,11 @@ class date(mappable, wrapped): """Wrapper for date tuple""" - def __init__(self, value): + def __init__(self, value, showfmt='%d %d'): # value may be (float, int), but public interface shouldn't support # floating-point timestamp self._unixtime, self._tzoffset = map(int, value) + self._showfmt = showfmt def contains(self, context, mapping, item): raise error.ParseError(_('date is not iterable')) @@ -211,7 +212,7 @@ raise error.ParseError(_("date is not iterable")) def show(self, context, mapping): - return '%d %d' % (self._unixtime, self._tzoffset) + return self._showfmt % (self._unixtime, self._tzoffset) def tomap(self, context): return {'unixtime': self._unixtime, 'tzoffset': self._tzoffset}
--- a/tests/test-amend.t Tue Jun 12 20:43:56 2018 -0400 +++ b/tests/test-amend.t Wed Jun 13 21:57:24 2018 +0900 @@ -107,7 +107,7 @@ $ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b3e76daa-amend.hg (obsstore-off !) $ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n' - 14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000 1000 + 14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000 Amend with editor
--- a/tests/test-command-template.t Tue Jun 12 20:43:56 2018 -0400 +++ b/tests/test-command-template.t Wed Jun 13 21:57:24 2018 +0900 @@ -1548,33 +1548,33 @@ branches--debug: branches--debug: branches--debug: - date: 1577872860 0 - date: 1000000 0 - date: 1500001 0 - date: 1500000 0 - date: 1400000 0 - date: 1300000 0 - date: 1200000 0 - date: 1100000 0 - date: 1000000 0 - date--verbose: 1577872860 0 - date--verbose: 1000000 0 - date--verbose: 1500001 0 - date--verbose: 1500000 0 - date--verbose: 1400000 0 - date--verbose: 1300000 0 - date--verbose: 1200000 0 - date--verbose: 1100000 0 - date--verbose: 1000000 0 - date--debug: 1577872860 0 - date--debug: 1000000 0 - date--debug: 1500001 0 - date--debug: 1500000 0 - date--debug: 1400000 0 - date--debug: 1300000 0 - date--debug: 1200000 0 - date--debug: 1100000 0 - date--debug: 1000000 0 + date: 1577872860.00 + date: 1000000.00 + date: 1500001.00 + date: 1500000.00 + date: 1400000.00 + date: 1300000.00 + date: 1200000.00 + date: 1100000.00 + date: 1000000.00 + date--verbose: 1577872860.00 + date--verbose: 1000000.00 + date--verbose: 1500001.00 + date--verbose: 1500000.00 + date--verbose: 1400000.00 + date--verbose: 1300000.00 + date--verbose: 1200000.00 + date--verbose: 1100000.00 + date--verbose: 1000000.00 + date--debug: 1577872860.00 + date--debug: 1000000.00 + date--debug: 1500001.00 + date--debug: 1500000.00 + date--debug: 1400000.00 + date--debug: 1300000.00 + date--debug: 1200000.00 + date--debug: 1100000.00 + date--debug: 1000000.00 desc: third desc: second desc: merge @@ -2291,7 +2291,7 @@ $ hg log -r0 --template '{author|lower}\n' user name <user@hostname> $ hg log -r0 --template '{date|upper}\n' - 1000000 0 + 1000000.00 Add a commit that does all possible modifications at once @@ -2806,9 +2806,9 @@ Behind the scenes, this would throw TypeError without intype=bytes $ hg log -l 3 --template '{date|obfuscate}\n' - 0 0 - 0 0 - 1577872860 0 + 0.00 + 0.00 + 1577872860.00 Behind the scenes, this will throw a ValueError @@ -2820,9 +2820,9 @@ Behind the scenes, this would throw AttributeError without intype=bytes $ hg log -l 3 --template 'line: {date|escape}\n' - line: 0 0 - line: 0 0 - line: 1577872860 0 + line: 0.00 + line: 0.00 + line: 1577872860.00 $ hg log -l 3 --template 'line: {extras|localdate}\n' hg: parse error: localdate expects a date information @@ -4625,8 +4625,8 @@ Test with non-strings like dates $ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a - 1200000 0 - 1300000 0 + 1200000.00 + 1300000.00 Test broken string escapes:
--- a/tests/test-debugbuilddag.t Tue Jun 12 20:43:56 2018 -0400 +++ b/tests/test-debugbuilddag.t Wed Jun 13 21:57:24 2018 +0900 @@ -42,29 +42,29 @@ 000000000000 glog $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n' - o 11: r11 [] @ 11 0 + o 11: r11 [] @ 11.00 | - o 10: r10 [] @ 10 0 + o 10: r10 [] @ 10.00 | - o 9: r9 [] @ 9 0 + o 9: r9 [] @ 9.00 |\ - | o 8: r8 [temp] @ 8 0 + | o 8: r8 [temp] @ 8.00 | | - | o 7: r7 [temp] @ 7 0 + | o 7: r7 [temp] @ 7.00 | | - | o 6: r6 [temp] @ 6 0 + | o 6: r6 [temp] @ 6.00 | | - | o 5: r5 [temp] @ 5 0 + | o 5: r5 [temp] @ 5.00 | | - o | 4: r4 [] @ 4 0 + o | 4: r4 [] @ 4.00 | | - o | 3: r3 [] @ 3 0 + o | 3: r3 [] @ 3.00 | | - o | 2: r2 [] @ 2 0 + o | 2: r2 [] @ 2.00 |/ - o 1: r1 [] @ 1 0 + o 1: r1 [] @ 1.00 | - o 0: r0 [] @ 0 0 + o 0: r0 [] @ 0.00 overwritten files, starting on a non-default branch @@ -88,29 +88,29 @@ 000000000000 glog $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n' - o 11: r11 [] @ 11 0 + o 11: r11 [] @ 11.00 | - o 10: r10 [] @ 10 0 + o 10: r10 [] @ 10.00 | - o 9: r9 [] @ 9 0 + o 9: r9 [] @ 9.00 |\ - | o 8: r8 [temp] @ 8 0 + | o 8: r8 [temp] @ 8.00 | | - | o 7: r7 [temp] @ 7 0 + | o 7: r7 [temp] @ 7.00 | | - | o 6: r6 [temp] @ 6 0 + | o 6: r6 [temp] @ 6.00 | | - | o 5: r5 [temp] @ 5 0 + | o 5: r5 [temp] @ 5.00 | | - o | 4: r4 [] @ 4 0 + o | 4: r4 [] @ 4.00 | | - o | 3: r3 [] @ 3 0 + o | 3: r3 [] @ 3.00 | | - o | 2: r2 [] @ 2 0 + o | 2: r2 [] @ 2.00 |/ - o 1: r1 [] @ 1 0 + o 1: r1 [] @ 1.00 | - o 0: r0 [start] @ 0 0 + o 0: r0 [start] @ 0.00 glog of $ hg log -G --template '{rev}: {desc} [{branches}]\n' of @@ -164,29 +164,29 @@ 000000000000 glog $ hg log -G --template '{rev}: {desc} [{branches}] @ {date}\n' - o 11: r11 [] @ 11 0 + o 11: r11 [] @ 11.00 | - o 10: r10 [] @ 10 0 + o 10: r10 [] @ 10.00 | - o 9: r9 [] @ 9 0 + o 9: r9 [] @ 9.00 |\ - | o 8: r8 [temp] @ 8 0 + | o 8: r8 [temp] @ 8.00 | | - | o 7: r7 [temp] @ 7 0 + | o 7: r7 [temp] @ 7.00 | | - | o 6: r6 [temp] @ 6 0 + | o 6: r6 [temp] @ 6.00 | | - | o 5: r5 [temp] @ 5 0 + | o 5: r5 [temp] @ 5.00 | | - o | 4: r4 [] @ 4 0 + o | 4: r4 [] @ 4.00 | | - o | 3: r3 [] @ 3 0 + o | 3: r3 [] @ 3.00 | | - o | 2: r2 [] @ 2 0 + o | 2: r2 [] @ 2.00 |/ - o 1: r1 [] @ 1 0 + o 1: r1 [] @ 1.00 | - o 0: r0 [] @ 0 0 + o 0: r0 [] @ 0.00 glog mf $ hg log -G --template '{rev}: {desc} [{branches}]\n' mf
--- a/tests/test-mq-header-date.t Tue Jun 12 20:43:56 2018 -0400 +++ b/tests/test-mq-header-date.t Wed Jun 13 21:57:24 2018 +0900 @@ -202,7 +202,7 @@ ==== qnew -d Date: 3 0 - 0: 758bd2596a39 [mq]: 1.patch - test - 3 0 + 0: 758bd2596a39 [mq]: 1.patch - test - 3.00 ==== qref adding 1 Date: 3 0 @@ -212,7 +212,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: 8c640e9949a8 [mq]: 1.patch - test - 3 0 + 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00 ==== qref -d Date: 4 0 @@ -221,7 +221,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 2 diff -r ... 2 @@ -248,8 +248,8 @@ Three - 1: 2a9ef0bdefba Three - test - 6 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: 2a9ef0bdefba Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref adding 3 Date: 6 0 @@ -261,8 +261,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: 7f19ad9eea7b Three - test - 6 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: 7f19ad9eea7b Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -m Date: 6 0 @@ -273,8 +273,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: 7ff7377793e3 Drei - test - 6 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: 7ff7377793e3 Drei - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d Date: 7 0 @@ -285,8 +285,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: d89d3144f518 Drei - test - 7 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: d89d3144f518 Drei - test - 7.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d -m Date: 8 0 @@ -297,8 +297,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew -m adding 4 Four @@ -331,9 +331,9 @@ now at: 3.patch # HG changeset patch # Date 10 0 - 2: d16a272220d2 imported patch 5.patch - test - 10 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 2: d16a272220d2 imported patch 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref adding 5 # HG changeset patch @@ -345,9 +345,9 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: 5dbf69c07df9 [mq]: 5.patch - test - 10 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d # HG changeset patch # Date 11 0 @@ -358,9 +358,9 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew with plain header popping 6.patch now at: 5.patch @@ -380,10 +380,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: 038c46b02a56 [mq]: 6.patch - test - 12 0 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 3: 038c46b02a56 [mq]: 6.patch - test - 12.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d Date: 13 0 @@ -392,10 +392,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: 2785642ea4b4 [mq]: 6.patch - test - 13 0 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 popping 6.patch now at: 5.patch ==== qnew -u @@ -448,10 +448,10 @@ +++ b/7 @@ -0,0 +1,1 @@ +7 - 3: 4f9d07369cc4 [mq]: 7.patch - john - 13 0 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 8 diff -r ... 8 @@ -523,10 +523,10 @@ applying 5.patch applying 7.patch now at: 7.patch - 3: d26a5b7ffce1 imported patch 7.patch - john - 13 0 - 2: dda6cf77060a imported patch 5.patch - test - 11 0 - 1: 25e32d66c8c7 Three (again) - test - 8 0 - 0: e5011c0211fe imported patch 1.patch - test - 4 0 + 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00 + 2: dda6cf77060a imported patch 5.patch - test - 11.00 + 1: 25e32d66c8c7 Three (again) - test - 8.00 + 0: e5011c0211fe imported patch 1.patch - test - 4.00 $ rm -r sandbox ======= hg headers @@ -540,7 +540,7 @@ # Date 3 0 # Parent - 0: 758bd2596a39 [mq]: 1.patch - test - 3 0 + 0: 758bd2596a39 [mq]: 1.patch - test - 3.00 ==== qref adding 1 # HG changeset patch @@ -552,7 +552,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: 8c640e9949a8 [mq]: 1.patch - test - 3 0 + 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00 ==== qref -d # HG changeset patch # Date 4 0 @@ -563,7 +563,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 2 # HG changeset patch @@ -596,8 +596,8 @@ # Parent Three - 1: 2a9ef0bdefba Three - test - 6 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: 2a9ef0bdefba Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref adding 3 # HG changeset patch @@ -610,8 +610,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: 7f19ad9eea7b Three - test - 6 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: 7f19ad9eea7b Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -m # HG changeset patch # Date 6 0 @@ -623,8 +623,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: 7ff7377793e3 Drei - test - 6 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: 7ff7377793e3 Drei - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d # HG changeset patch # Date 7 0 @@ -636,8 +636,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: d89d3144f518 Drei - test - 7 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: d89d3144f518 Drei - test - 7.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d -m # HG changeset patch # Date 8 0 @@ -649,8 +649,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew -m adding 4 # HG changeset patch @@ -686,9 +686,9 @@ now at: 3.patch # HG changeset patch # Date 10 0 - 2: d16a272220d2 imported patch 5.patch - test - 10 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 2: d16a272220d2 imported patch 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref adding 5 # HG changeset patch @@ -700,9 +700,9 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: 5dbf69c07df9 [mq]: 5.patch - test - 10 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d # HG changeset patch # Date 11 0 @@ -713,9 +713,9 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew with plain header popping 6.patch now at: 5.patch @@ -735,10 +735,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: 038c46b02a56 [mq]: 6.patch - test - 12 0 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 3: 038c46b02a56 [mq]: 6.patch - test - 12.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d Date: 13 0 @@ -747,10 +747,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: 2785642ea4b4 [mq]: 6.patch - test - 13 0 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 popping 6.patch now at: 5.patch ==== qnew -u @@ -811,10 +811,10 @@ +++ b/7 @@ -0,0 +1,1 @@ +7 - 3: 4f9d07369cc4 [mq]: 7.patch - john - 13 0 - 2: 049de6af0c1d [mq]: 5.patch - test - 11 0 - 1: b1b6b0fe0e6d Three (again) - test - 8 0 - 0: 4a67dfeea974 [mq]: 1.patch - test - 4 0 + 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 8 # HG changeset patch @@ -894,8 +894,8 @@ applying 5.patch applying 7.patch now at: 7.patch - 3: d26a5b7ffce1 imported patch 7.patch - john - 13 0 - 2: dda6cf77060a imported patch 5.patch - test - 11 0 - 1: 25e32d66c8c7 Three (again) - test - 8 0 - 0: e5011c0211fe imported patch 1.patch - test - 4 0 + 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00 + 2: dda6cf77060a imported patch 5.patch - test - 11.00 + 1: 25e32d66c8c7 Three (again) - test - 8.00 + 0: e5011c0211fe imported patch 1.patch - test - 4.00 $ rm -r sandbox