Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1983:ae12a81549a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass correct username as $HGUSER to hgeditor if "commit -u" is used. And only use the new util.system parameter to set the environment.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 21 Mar 2006 12:45:27 +0100
parents 736b6c96bbbc
children 719cf07b076d
comparison
equal deleted inserted replaced
1982:70ba0c86da8b 1983:ae12a81549a7
440 440
441 # add changeset 441 # add changeset
442 new = new.keys() 442 new = new.keys()
443 new.sort() 443 new.sort()
444 444
445 user = user or self.ui.username()
445 if not text: 446 if not text:
446 edittext = [""] 447 edittext = [""]
447 if p2 != nullid: 448 if p2 != nullid:
448 edittext.append("HG: branch merge") 449 edittext.append("HG: branch merge")
449 edittext.extend(["HG: changed %s" % f for f in changed]) 450 edittext.extend(["HG: changed %s" % f for f in changed])
452 edittext.append("HG: no files changed") 453 edittext.append("HG: no files changed")
453 edittext.append("") 454 edittext.append("")
454 # run editor in the repository root 455 # run editor in the repository root
455 olddir = os.getcwd() 456 olddir = os.getcwd()
456 os.chdir(self.root) 457 os.chdir(self.root)
457 edittext = self.ui.edit("\n".join(edittext)) 458 edittext = self.ui.edit("\n".join(edittext), user)
458 os.chdir(olddir) 459 os.chdir(olddir)
459 if not edittext.rstrip(): 460 if not edittext.rstrip():
460 return None 461 return None
461 text = edittext 462 text = edittext
462 463
463 user = user or self.ui.username()
464 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date) 464 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date)
465 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, 465 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
466 parent2=xp2) 466 parent2=xp2)
467 tr.close() 467 tr.close()
468 468