diff --git a/hgext/fix.py b/hgext/fix.py --- a/hgext/fix.py +++ b/hgext/fix.py @@ -46,8 +46,10 @@ to false. The :pattern suboption determines which files will be passed through each -configured tool. See :hg:`help patterns` for possible values. If there are file -arguments to :hg:`fix`, the intersection of these patterns is used. +configured tool. See :hg:`help patterns` for possible values. However, all +patterns are relative to the repo root, even if that text says they are relative +to the current working directory. If there are file arguments to :hg:`fix`, the +intersection of these patterns is used. There is also a configurable limit for the maximum size of file that will be processed by :hg:`fix`:: @@ -140,6 +142,7 @@ context, copies, error, + match as matchmod, mdiff, merge, obsolete, @@ -843,7 +846,11 @@ def affects(self, opts, fixctx, path): """Should this fixer run on the file at the given path and context?""" - return scmutil.match(fixctx, [self._pattern], opts)(path) + repo = fixctx.repo() + matcher = matchmod.match( + repo.root, repo.root, [self._pattern], ctx=fixctx + ) + return matcher(path) def shouldoutputmetadata(self): """Should the stdout of this fixer start with JSON and a null byte?""" diff --git a/tests/test-fix.t b/tests/test-fix.t --- a/tests/test-fix.t +++ b/tests/test-fix.t @@ -157,8 +157,10 @@ :skipclean suboption to false. The :pattern suboption determines which files will be passed through each - configured tool. See 'hg help patterns' for possible values. If there are file - arguments to 'hg fix', the intersection of these patterns is used. + configured tool. See 'hg help patterns' for possible values. However, all + patterns are relative to the repo root, even if that text says they are + relative to the current working directory. If there are file arguments to 'hg + fix', the intersection of these patterns is used. There is also a configurable limit for the maximum size of file that will be processed by 'hg fix': @@ -1321,7 +1323,7 @@ $ echo modified > bar $ hg fix -w bar $ cat bar - modified + $TESTTMP/subprocesscwd $ cd ../..