[PATCH 4 of 5] keyword: make overwrite() arguments mandatory
Christian Ebert
blacktrash at gmx.net
Mon Apr 7 12:10:32 CDT 2008
# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1207578384 -7200
# Node ID 84f1bb1bcfc873a31ae97b73b9a2a4711234f92b
# Parent 3154ebf52d38fc77be80be8aaf064f19182525f7
keyword: make overwrite() arguments mandatory
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -169,7 +169,7 @@
Caveat: localrepository._link fails on Windows.'''
return self.matcher(path) and not islink(path)
- def overwrite(self, node=None, expand=True, files=None):
+ def overwrite(self, node, expand, files):
'''Overwrites selected files expanding/shrinking keywords.'''
ctx = self.repo.changectx(node)
mf = ctx.manifest()
@@ -272,7 +272,7 @@
try:
wlock = repo.wlock()
lock = repo.lock()
- kwt.overwrite(expand=expand, files=clean)
+ kwt.overwrite(None, expand, clean)
finally:
del wlock, lock
@@ -489,7 +489,7 @@
for name, cmd in commithooks.iteritems():
ui.setconfig('hooks', name, cmd)
if n is not None:
- kwt.overwrite(node=n)
+ kwt.overwrite(n, True, None)
repo.hook('commit', node=n, parent1=_p1, parent2=_p2)
return n
finally:
More information about the Mercurial-devel
mailing list