diff -r 1c3a9f84dbbc -r 78796cd3e7d0 hgkw/keyword.py --- a/hgkw/keyword.py Thu Apr 10 01:48:29 2008 +0200 +++ b/hgkw/keyword.py Tue May 13 08:33:23 2008 +0200 @@ -257,8 +257,8 @@ '''Bails out if [keyword] configuration is not active. Returns status of working directory.''' if kwt: - files, match, anypats = cmdutil.matchpats(repo, pats, opts) - return repo.status(files=files, match=match, list_clean=True) + matcher = cmdutil.match(repo, pats, opts) + return repo.status(match=matcher, list_clean=True) if ui.configitems('keyword'): raise util.Abort(_('[keyword] patterns cannot match')) raise util.Abort(_('no [keyword] patterns configured')) @@ -458,7 +458,7 @@ return kwt.wread(filename, data) def commit(self, files=None, text='', user=None, date=None, - match=util.always, force=False, force_editor=False, + match=None, force=False, force_editor=False, p1=None, p2=None, extra={}, empty_ok=False): wlock = lock = None _p1 = _p2 = None @@ -505,7 +505,7 @@ # shrink keywords read from working dir self.lines = kwt.shrinklines(self.fname, self.lines) - def kw_diff(repo, node1=None, node2=None, files=None, match=util.always, + def kw_diff(repo, node1=None, node2=None, match=None, fp=None, changes=None, opts=None): '''Monkeypatch patch.diff to avoid expansion except when comparing against working dir.'''