Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1707:33d09f4a6fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Put the empty line in commit text above the branch merge line.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 09 Feb 2006 07:14:05 +0100
parents 20b621154e17
children 4fdcfedf2a19
comparison
equal deleted inserted replaced
1706:20b621154e17 1707:33d09f4a6fef
435 # add changeset 435 # add changeset
436 new = new.keys() 436 new = new.keys()
437 new.sort() 437 new.sort()
438 438
439 if not text: 439 if not text:
440 edittext = "" 440 edittext = "\n"
441 if p2 != nullid: 441 if p2 != nullid:
442 edittext += "HG: branch merge\n" 442 edittext += "HG: branch merge\n"
443 edittext += "\n" + "HG: manifest hash %s\n" % hex(mn) 443 edittext += "HG: manifest hash %s\n" % hex(mn)
444 edittext += "".join(["HG: changed %s\n" % f for f in changed]) 444 edittext += "".join(["HG: changed %s\n" % f for f in changed])
445 edittext += "".join(["HG: removed %s\n" % f for f in remove]) 445 edittext += "".join(["HG: removed %s\n" % f for f in remove])
446 if not changed and not remove: 446 if not changed and not remove:
447 edittext += "HG: no files changed\n" 447 edittext += "HG: no files changed\n"
448 # run editor in the repository root 448 # run editor in the repository root