Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2267:d812d91c5a84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Force editor to appear for an 'hg backout' if a message or logfile aren't supplied. Pre-fill the commit message with the changeset being backed out. Fixes bug 238.
author john.levon@sun.com
date Thu, 11 May 2006 14:32:09 -0700
parents 181b0643ffb1
children 8cb77698f5fd
comparison
equal deleted inserted replaced
2263:2f64cbaa1e92 2267:d812d91c5a84
444 tr.close() 444 tr.close()
445 if update_dirstate: 445 if update_dirstate:
446 self.dirstate.setparents(n, nullid) 446 self.dirstate.setparents(n, nullid)
447 447
448 def commit(self, files=None, text="", user=None, date=None, 448 def commit(self, files=None, text="", user=None, date=None,
449 match=util.always, force=False, lock=None, wlock=None): 449 match=util.always, force=False, lock=None, wlock=None,
450 force_editor=False):
450 commit = [] 451 commit = []
451 remove = [] 452 remove = []
452 changed = [] 453 changed = []
453 454
454 if files: 455 if files:
533 # add changeset 534 # add changeset
534 new = new.keys() 535 new = new.keys()
535 new.sort() 536 new.sort()
536 537
537 user = user or self.ui.username() 538 user = user or self.ui.username()
538 if not text: 539 if not text or force_editor:
539 edittext = [""] 540 edittext = []
541 if text:
542 edittext.append(text)
543 edittext.append("")
540 if p2 != nullid: 544 if p2 != nullid:
541 edittext.append("HG: branch merge") 545 edittext.append("HG: branch merge")
542 edittext.extend(["HG: changed %s" % f for f in changed]) 546 edittext.extend(["HG: changed %s" % f for f in changed])
543 edittext.extend(["HG: removed %s" % f for f in remove]) 547 edittext.extend(["HG: removed %s" % f for f in remove])
544 if not changed and not remove: 548 if not changed and not remove: