mercurial/localrepo.py
changeset 5041 49059086c634
parent 5023 7f5c3fb0a37d
child 5053 47a8ea1eb2c3
equal deleted inserted replaced
5040:4f34d9b2568e 5041:49059086c634
   649 
   649 
   650     def rawcommit(self, files, text, user, date, p1=None, p2=None, extra={}):
   650     def rawcommit(self, files, text, user, date, p1=None, p2=None, extra={}):
   651         if p1 is None:
   651         if p1 is None:
   652             p1, p2 = self.dirstate.parents()
   652             p1, p2 = self.dirstate.parents()
   653         return self.commit(files=files, text=text, user=user, date=date,
   653         return self.commit(files=files, text=text, user=user, date=date,
   654                            p1=p1, p2=p2, extra=extra)
   654                            p1=p1, p2=p2, extra=extra, empty_ok=True)
   655 
   655 
   656     def commit(self, files=None, text="", user=None, date=None,
   656     def commit(self, files=None, text="", user=None, date=None,
   657                match=util.always, force=False, force_editor=False,
   657                match=util.always, force=False, force_editor=False,
   658                p1=None, p2=None, extra={}):
   658                p1=None, p2=None, extra={}, empty_ok=False):
   659         wlock = lock = tr = None
   659         wlock = lock = tr = None
   660         try:
   660         try:
   661             commit = []
   661             commit = []
   662             remove = []
   662             remove = []
   663             changed = []
   663             changed = []
   766             # add changeset
   766             # add changeset
   767             new = new.keys()
   767             new = new.keys()
   768             new.sort()
   768             new.sort()
   769 
   769 
   770             user = user or self.ui.username()
   770             user = user or self.ui.username()
   771             if not text or force_editor:
   771             if (not empty_ok and not text) or force_editor:
   772                 edittext = []
   772                 edittext = []
   773                 if text:
   773                 if text:
   774                     edittext.append(text)
   774                     edittext.append(text)
   775                 edittext.append("")
   775                 edittext.append("")
   776                 edittext.append("HG: user: %s" % user)
   776                 edittext.append("HG: user: %s" % user)