Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 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 |
comparison
equal
deleted
inserted
replaced
2299:dacf718e1d48 | 2300:52b9b6751b2c |
---|---|
1390 if fp != sys.stdout: | 1390 if fp != sys.stdout: |
1391 ui.note("%s\n" % fp.name) | 1391 ui.note("%s\n" % fp.name) |
1392 | 1392 |
1393 fp.write("# HG changeset patch\n") | 1393 fp.write("# HG changeset patch\n") |
1394 fp.write("# User %s\n" % change[1]) | 1394 fp.write("# User %s\n" % change[1]) |
1395 fp.write("# Timestamp %d %d\n" % (change[2][0], change[2][1])) | 1395 fp.write("# Date %d %d\n" % change[2]) |
1396 fp.write("# Node ID %s\n" % hex(node)) | 1396 fp.write("# Node ID %s\n" % hex(node)) |
1397 fp.write("# Parent %s\n" % hex(prev)) | 1397 fp.write("# Parent %s\n" % hex(prev)) |
1398 if len(parents) > 1: | 1398 if len(parents) > 1: |
1399 fp.write("# Parent %s\n" % hex(parents[1])) | 1399 fp.write("# Parent %s\n" % hex(parents[1])) |
1400 fp.write(change[4].rstrip()) | 1400 fp.write(change[4].rstrip()) |
1703 elif hgpatch: | 1703 elif hgpatch: |
1704 # parse values when importing the result of an hg export | 1704 # parse values when importing the result of an hg export |
1705 if line.startswith("# User "): | 1705 if line.startswith("# User "): |
1706 user = line[7:] | 1706 user = line[7:] |
1707 ui.debug(_('User: %s\n') % user) | 1707 ui.debug(_('User: %s\n') % user) |
1708 elif line.startswith("# Timestamp "): | 1708 elif line.startswith("# Date "): |
1709 date = line[12:] | 1709 date = line[7:] |
1710 elif not line.startswith("# ") and line: | 1710 elif not line.startswith("# ") and line: |
1711 message.append(line) | 1711 message.append(line) |
1712 hgpatch = False | 1712 hgpatch = False |
1713 elif line == '# HG changeset patch': | 1713 elif line == '# HG changeset patch': |
1714 hgpatch = True | 1714 hgpatch = True |