comparison mercurial/sparse.py @ 33375:df6dd6d536bb

sparse: clean up updateconfig()

* Use context manager for wlock
* Rename oldsparsematch to oldmatcher
* Always call parseconfig() because parsing an empty string yields
  the same result as the old code

33374:4dc04cdf2520

    Only one of the actions may be performed.

    The new config is written out and a working directory refresh is performed.
    """
    wlock = repo.wlock()
    try:
        oldsparsematch = matcher(repo)

        raw = repo.vfs.tryread('sparse')
        if raw:
            oldinclude, oldexclude, oldprofiles = map(
                set, parseconfig(repo.ui, raw))
        else:
            oldinclude = set()
            oldexclude = set()
            oldprofiles = set()

        try:
            if reset:
                newinclude = set()
                newexclude = set()

            writeconfig(repo, newinclude, newexclude, newprofiles)

            fcounts = map(
                len,
                refreshwdir(repo, oldstatus, oldsparsematch, force=force))

            profilecount = (len(newprofiles - oldprofiles) -
                            len(oldprofiles - newprofiles))
            includecount = (len(newinclude - oldinclude) -
                            len(oldinclude - newinclude))

            printchanges(repo.ui, opts, profilecount, includecount,
                         excludecount, *fcounts)
        except Exception:
            writeconfig(repo, oldinclude, oldexclude, oldprofiles)
            raise
    finally:
        wlock.release()

def printchanges(ui, opts, profilecount=0, includecount=0, excludecount=0,
                 added=0, dropped=0, conflicting=0):
    """Print output summarizing sparse config changes."""
    with ui.formatter('sparse', opts) as fm:

33375:df6dd6d536bb

    Only one of the actions may be performed.

    The new config is written out and a working directory refresh is performed.
    """
    with repo.wlock():
        oldmatcher = matcher(repo)

        raw = repo.vfs.tryread('sparse')
        oldinclude, oldexclude, oldprofiles = parseconfig(repo.ui, raw)
        oldprofiles = set(oldprofiles)

        try:
            if reset:
                newinclude = set()
                newexclude = set()

            writeconfig(repo, newinclude, newexclude, newprofiles)

            fcounts = map(
                len,
                refreshwdir(repo, oldstatus, oldmatcher, force=force))

            profilecount = (len(newprofiles - oldprofiles) -
                            len(oldprofiles - newprofiles))
            includecount = (len(newinclude - oldinclude) -
                            len(oldinclude - newinclude))

            printchanges(repo.ui, opts, profilecount, includecount,
                         excludecount, *fcounts)
        except Exception:
            writeconfig(repo, oldinclude, oldexclude, oldprofiles)
            raise

def printchanges(ui, opts, profilecount=0, includecount=0, excludecount=0,
                 added=0, dropped=0, conflicting=0):
    """Print output summarizing sparse config changes."""
    with ui.formatter('sparse', opts) as fm: