comparison hgext/largefiles/overrides.py @ 41653:16a49c778bde

forget: pass around uipathfn and use instead of m.rel() (API)

Differential Revision: https://phab.mercurial-scm.org/D5911

41652:6a447a3d1bd0

        return orig(repo, *args, **kwargs)
    finally:
        repo.lfstatus = False

@eh.wrapfunction(cmdutil, 'forget')
def cmdutilforget(orig, ui, repo, match, prefix, explicitonly, dryrun,
                  interactive):
    normalmatcher = composenormalfilematcher(match, repo[None].manifest())
    bad, forgot = orig(ui, repo, normalmatcher, prefix, explicitonly, dryrun,
                       interactive)
    m = composelargefilematcher(match, repo[None].manifest())

    try:
        repo.lfstatus = True
        s = repo.status(match=m, clean=True)

    for f in forget:
        fstandin = lfutil.standin(f)
        if fstandin not in repo.dirstate and not repo.wvfs.isdir(fstandin):
            ui.warn(_('not removing %s: file is already untracked\n')
                    % m.rel(f))
            bad.append(f)

    for f in forget:
        if ui.verbose or not m.exact(f):
            ui.status(_('removing %s\n') % m.rel(f))

    # Need to lock because standin files are deleted then removed from the
    # repository and we could race in-between.
    with repo.wlock():
        lfdirstate = lfutil.openlfdirstate(ui, repo)

41653:16a49c778bde

        return orig(repo, *args, **kwargs)
    finally:
        repo.lfstatus = False

@eh.wrapfunction(cmdutil, 'forget')
def cmdutilforget(orig, ui, repo, match, prefix, uipathfn, explicitonly, dryrun,
                  interactive):
    normalmatcher = composenormalfilematcher(match, repo[None].manifest())
    bad, forgot = orig(ui, repo, normalmatcher, prefix, uipathfn, explicitonly,
                       dryrun, interactive)
    m = composelargefilematcher(match, repo[None].manifest())

    try:
        repo.lfstatus = True
        s = repo.status(match=m, clean=True)

    for f in forget:
        fstandin = lfutil.standin(f)
        if fstandin not in repo.dirstate and not repo.wvfs.isdir(fstandin):
            ui.warn(_('not removing %s: file is already untracked\n')
                    % uipathfn(f))
            bad.append(f)

    for f in forget:
        if ui.verbose or not m.exact(f):
            ui.status(_('removing %s\n') % uipathfn(f))

    # Need to lock because standin files are deleted then removed from the
    # repository and we could race in-between.
    with repo.wlock():
        lfdirstate = lfutil.openlfdirstate(ui, repo)