Mercurial > hg
comparison mercurial/commands.py @ 310:273f6a01d18b
hg patch: add default commit text
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg patch: add default commit text
I was doing some benchmarks via hg import and found a few patches where
the commit string ended up empty. hg would then try to prompt you for the
commit string. The patch below forces a default string based on the patch
name.
Signed-off-by: Chris Mason <mason@suse.com>
Modified to only be added if there's no commit text - mpm
manifest hash: 35da46e3832a98e2d288604e6be8c82e85405ef8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqg+/ywK+sNU5EO8RAqCIAJ4/Nj6c3MusY3HyD8HeHjqc+GlFMQCbBWA5
HhCmOoJuL5Uoz7WlGPlpumw=
=M3/j
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 10 Jun 2005 14:10:07 -0800 |
parents | 61414da06fe5 |
children | 09375250eb31 |
comparison
equal
deleted
inserted
replaced
309:61414da06fe5 | 310:273f6a01d18b |
---|---|
385 | 385 |
386 text = "" | 386 text = "" |
387 for l in file(pf): | 387 for l in file(pf): |
388 if l[:4] == "--- ": break | 388 if l[:4] == "--- ": break |
389 text += l | 389 text += l |
390 | |
391 # make sure text isn't empty | |
392 if not text: text = "imported patch %s\n" % patch | |
390 | 393 |
391 f = os.popen("lsdiff --strip %d %s" % (strip, pf)) | 394 f = os.popen("lsdiff --strip %d %s" % (strip, pf)) |
392 files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines())) | 395 files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines())) |
393 f.close() | 396 f.close() |
394 | 397 |