##// END OF EJS Templates
commit: drop unused p1 and p2 args
Matt Mackall -
r8403:553909cd default
parent child Browse files
Show More
@@ -451,7 +451,7 b' def reposetup(ui, repo):'
451
451
452 def commit(self, files=None, text='', user=None, date=None,
452 def commit(self, files=None, text='', user=None, date=None,
453 match=None, force=False, force_editor=False,
453 match=None, force=False, force_editor=False,
454 p1=None, p2=None, extra={}, empty_ok=False):
454 extra={}, empty_ok=False):
455 wlock = lock = None
455 wlock = lock = None
456 _p1 = _p2 = None
456 _p1 = _p2 = None
457 try:
457 try:
@@ -465,10 +465,7 b' def reposetup(ui, repo):'
465 ui.setconfig('hooks', name, None)
465 ui.setconfig('hooks', name, None)
466 if commithooks:
466 if commithooks:
467 # store parents for commit hook environment
467 # store parents for commit hook environment
468 if p1 is None:
469 _p1, _p2 = repo.dirstate.parents()
468 _p1, _p2 = repo.dirstate.parents()
470 else:
471 _p1, _p2 = p1, p2 or nullid
472 _p1 = hex(_p1)
469 _p1 = hex(_p1)
473 if _p2 == nullid:
470 if _p2 == nullid:
474 _p2 = ''
471 _p2 = ''
@@ -476,7 +473,7 b' def reposetup(ui, repo):'
476 _p2 = hex(_p2)
473 _p2 = hex(_p2)
477
474
478 n = super(kwrepo, self).commit(files, text, user, date, match,
475 n = super(kwrepo, self).commit(files, text, user, date, match,
479 force, force_editor, p1, p2,
476 force, force_editor,
480 extra, empty_ok)
477 extra, empty_ok)
481
478
482 # restore commit hooks
479 # restore commit hooks
@@ -767,9 +767,8 b' class localrepository(repo.repository):'
767
767
768 return fparent1
768 return fparent1
769
769
770 def commit(self, files=None, text="", user=None, date=None,
770 def commit(self, files=None, text="", user=None, date=None, match=None,
771 match=None, force=False, force_editor=False,
771 force=False, force_editor=False, extra={}, empty_ok=False):
772 p1=None, p2=None, extra={}, empty_ok=False):
773 wlock = lock = None
772 wlock = lock = None
774 if extra.get("close"):
773 if extra.get("close"):
775 force = True
774 force = True
General Comments 0
You need to be logged in to leave comments. Login now