Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1709:069129d24b26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create default commit message in a more pythonic way.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 09 Feb 2006 07:24:34 +0100
parents 4fdcfedf2a19
children 21dcf38e5d7d
comparison
equal deleted inserted replaced
1708:4fdcfedf2a19 1709:069129d24b26
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 = "\n" 440 edittext = [""]
441 if p2 != nullid: 441 if p2 != nullid:
442 edittext += "HG: branch merge\n" 442 edittext.append("HG: branch merge")
443 edittext += "".join(["HG: changed %s\n" % f for f in changed]) 443 edittext.extend(["HG: changed %s" % f for f in changed])
444 edittext += "".join(["HG: removed %s\n" % f for f in remove]) 444 edittext.extend(["HG: removed %s" % f for f in remove])
445 if not changed and not remove: 445 if not changed and not remove:
446 edittext += "HG: no files changed\n" 446 edittext.append("HG: no files changed")
447 edittext.append("")
447 # run editor in the repository root 448 # run editor in the repository root
448 olddir = os.getcwd() 449 olddir = os.getcwd()
449 os.chdir(self.root) 450 os.chdir(self.root)
450 edittext = self.ui.edit(edittext) 451 edittext = self.ui.edit("\n".join(edittext))
451 os.chdir(olddir) 452 os.chdir(olddir)
452 if not edittext.rstrip(): 453 if not edittext.rstrip():
453 return None 454 return None
454 text = edittext 455 text = edittext
455 456