Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 51810:a53162bd73ed
subrepo: drop the default value of None for the archive matcher
This was flagged by pytype after adding hints to `match.subdirmatcher` that it
takes a non-optional matcher. That matcher argument is used without a guard in
the subdirmatcher constructor, so that's the correct restriction.
I don't think this fixes a bug in practice because the only way these are
invoked is either by a parent `hgsubrepo.archive()`, `archival.archive()`, or
the largefiles override of these. The `hgsubrepo.archive()` case (and the
largefiles override) uses what the caller provided, so the caller will
eventually be `archival.archive()` (or the largfiles override) up the call
chain. The `archival.archive()` method also has None for its matcher's default
arg. However, the three callers of that (`commands.archive()`,
`webcommands.archive()`, and `extdiff.snapshot()`) all provide a matcher
argument, so the None case can never occur unless a 3rd party extension swaps it
for None. Sadly, we can't make the argument on the `archival.archive()`
non-optional because there is a kwarg prior to it.
Even though the largefiles override of `archival.archive()` is provided a valid
matcher, we duplicate the internal creation of the matcher that the original
`archival.archive()` does for consistency. By eliminating an impossible to hit
case, we can simplify some of the subrepo code too, by dropping unreachable
code.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 01 Aug 2024 01:52:11 -0400 |
parents | e14ed26b72cb |
children | a1e4fa9330d8 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Thu Aug 01 16:42:38 2024 +0200 +++ b/hgext/largefiles/overrides.py Thu Aug 01 01:52:11 2024 -0400 @@ -1252,8 +1252,11 @@ else: prefix = archival.tidyprefix(dest, kind, prefix) + if not match: + match = scmutil.matchall(repo) + def write(name, mode, islink, getdata): - if match and not match(name): + if not match(name): return data = getdata() if decode: @@ -1314,7 +1317,7 @@ @eh.wrapfunction(subrepo.hgsubrepo, 'archive') -def hgsubrepoarchive(orig, repo, archiver, prefix, match=None, decode=True): +def hgsubrepoarchive(orig, repo, archiver, prefix, match, decode=True): lfenabled = hasattr(repo._repo, '_largefilesenabled') if not lfenabled or not repo._repo.lfstatus: return orig(repo, archiver, prefix, match, decode) @@ -1329,7 +1332,7 @@ def write(name, mode, islink, getdata): # At this point, the standin has been replaced with the largefile name, # so the normal matcher works here without the lfutil variants. - if match and not match(f): + if not match(f): return data = getdata() if decode: