[PATCH 16 of 16 V3] largefiles: rename match_ to matchmod import in lfutil

[Augie Fackler]

On Sat, Jun 04, 2016 at 05:23:42PM +0200, liscju wrote:
> # HG changeset patch
> # User liscju <piotr.listkiewicz at gmail.com>
> # Date 1463701324 -7200
> #      Fri May 20 01:42:04 2016 +0200
> # Node ID 015ff2ac0fba00f5b3e83ae6963645c9f432bd71
> # Parent  ea49abffbda9f854e04c1e9c4085f144a9a427e7
> largefiles: rename match_ to matchmod import in lfutil

Nice work. I like the storefactory module name, it's
entertaining. Queued the series.

>
> diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
> --- a/hgext/largefiles/lfutil.py
> +++ b/hgext/largefiles/lfutil.py
> @@ -20,7 +20,7 @@ from mercurial import (
>      dirstate,
>      error,
>      httpconnection,
> -    match as match_,
> +    match as matchmod,
>      node,
>      scmutil,
>      util,
> @@ -161,7 +161,7 @@ def openlfdirstate(ui, repo, create=True
>
>  def lfdirstatestatus(lfdirstate, repo):
>      wctx = repo['.']
> -    match = match_.always(repo.root, repo.getcwd())
> +    match = matchmod.always(repo.root, repo.getcwd())
>      unsure, s = lfdirstate.status(match, [], False, False, False)
>      modified, clean = s.modified, s.clean
>      for lfile in unsure:
> @@ -542,7 +542,7 @@ def updatestandinsbymatch(repo, match):
>          # otherwise to update all standins if the largefiles are
>          # large.
>          lfdirstate = openlfdirstate(ui, repo)
> -        dirtymatch = match_.always(repo.root, repo.getcwd())
> +        dirtymatch = matchmod.always(repo.root, repo.getcwd())
>          unsure, s = lfdirstate.status(dirtymatch, [], False, False,
>                                        False)
>          modifiedfiles = unsure + s.modified + s.added + s.removed
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel