Mercurial > hg
changeset 2300:52b9b6751b2c
Use "# Date" instead of "# Timestamp" for dated export/import of patches.
And don't break up list for % formatting.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 17 May 2006 19:00:16 +0200 |
| parents | dacf718e1d48 |
| children | 7c2623aedeb4 |
| files | hgext/mq.py mercurial/commands.py |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed May 17 18:54:30 2006 +0200 +++ b/hgext/mq.py Wed May 17 19:00:16 2006 +0200 @@ -120,8 +120,8 @@ # parse values when importing the result of an hg export if line.startswith("# User "): user = line[7:] - elif line.startswith("# Timestamp "): - date = line[12:] + elif line.startswith("# Date "): + date = line[7:] elif not line.startswith("# ") and line: message.append(line) format = None
--- a/mercurial/commands.py Wed May 17 18:54:30 2006 +0200 +++ b/mercurial/commands.py Wed May 17 19:00:16 2006 +0200 @@ -1392,7 +1392,7 @@ fp.write("# HG changeset patch\n") fp.write("# User %s\n" % change[1]) - fp.write("# Timestamp %d %d\n" % (change[2][0], change[2][1])) + fp.write("# Date %d %d\n" % change[2]) fp.write("# Node ID %s\n" % hex(node)) fp.write("# Parent %s\n" % hex(prev)) if len(parents) > 1: @@ -1705,8 +1705,8 @@ if line.startswith("# User "): user = line[7:] ui.debug(_('User: %s\n') % user) - elif line.startswith("# Timestamp "): - date = line[12:] + elif line.startswith("# Date "): + date = line[7:] elif not line.startswith("# ") and line: message.append(line) hgpatch = False