# HG changeset patch # User Martin von Zweigbergk # Date 2019-11-15 22:47:31 # Node ID f965b1027fb0153054663927d17029e7a3643cbf # Parent 7f443cce2972d3fc303d593577005c7fcefe53a9 commit: drop unused "vdirs" argument from repo.checkcommitpatterns() Differential Revision: https://phab.mercurial-scm.org/D7438 diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -427,9 +427,7 @@ def dorecord( force = opts.get(b'force') if not force: - vdirs = [] match = matchmod.badmatch(match, fail) - match.explicitdir = vdirs.append status = repo.status(match=match) @@ -457,7 +455,7 @@ def dorecord( raise error.Abort(dirtyreason) if not force: - repo.checkcommitpatterns(wctx, vdirs, match, status, fail) + repo.checkcommitpatterns(wctx, match, status, fail) diffopts = patch.difffeatureopts( ui, opts=opts, diff --git a/mercurial/interfaces/repository.py b/mercurial/interfaces/repository.py --- a/mercurial/interfaces/repository.py +++ b/mercurial/interfaces/repository.py @@ -1746,7 +1746,7 @@ class ilocalrepositorymain(interfaceutil def currentwlock(): """Return the wlock if it's held or None.""" - def checkcommitpatterns(wctx, vdirs, match, status, fail): + def checkcommitpatterns(wctx, match, status, fail): pass def commit( diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -2789,7 +2789,7 @@ class localrepository(object): return fparent1 - def checkcommitpatterns(self, wctx, vdirs, match, status, fail): + def checkcommitpatterns(self, wctx, match, status, fail): """check for commit arguments that aren't committable""" if match.isexact() or match.prefix(): matched = set(status.modified + status.added + status.removed) @@ -2838,8 +2838,6 @@ class localrepository(object): match = matchmod.always() if not force: - vdirs = [] - match.explicitdir = vdirs.append match.bad = fail # lock() for recent changelog (see issue4368) @@ -2868,7 +2866,7 @@ class localrepository(object): # make sure all explicit patterns are matched if not force: - self.checkcommitpatterns(wctx, vdirs, match, status, fail) + self.checkcommitpatterns(wctx, match, status, fail) cctx = context.workingcommitctx( self, status, text, user, date, extra