facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

commit: drop unused p1 and p2 args

Browse Source
This commit is contained in:
Matt Mackall 2009-05-14 13:20:40 -05:00
parent d229f38315
commit 771b18c870
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hgext/keyword.py
View File

@ -451,7 +451,7 @@ def reposetup(ui, repo):
def commit(self, files=None, text='', user=None, date=None,
match=None, force=False, force_editor=False,
p1=None, p2=None, extra={}, empty_ok=False):
extra={}, empty_ok=False):
wlock = lock = None
_p1 = _p2 = None
try:
@ -465,10 +465,7 @@ def reposetup(ui, repo):
ui.setconfig('hooks', name, None)
if commithooks:
# store parents for commit hook environment
if p1 is None:
_p1, _p2 = repo.dirstate.parents()
else:
_p1, _p2 = p1, p2 or nullid
_p1, _p2 = repo.dirstate.parents()
_p1 = hex(_p1)
if _p2 == nullid:
_p2 = ''
@ -476,7 +473,7 @@ def reposetup(ui, repo):
_p2 = hex(_p2)
n = super(kwrepo, self).commit(files, text, user, date, match,
force, force_editor, p1, p2,
force, force_editor,
extra, empty_ok)
# restore commit hooks

5
mercurial/localrepo.py
View File

@ -767,9 +767,8 @@ class localrepository(repo.repository):
return fparent1
def commit(self, files=None, text="", user=None, date=None,
match=None, force=False, force_editor=False,
p1=None, p2=None, extra={}, empty_ok=False):
def commit(self, files=None, text="", user=None, date=None, match=None,
force=False, force_editor=False, extra={}, empty_ok=False):
wlock = lock = None
if extra.get("close"):
force = True