comparison hgext/largefiles/overrides.py @ 41650:f8b18583049f

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

For now, the uipathfn we pass around always prints relative paths just
like before, so this should have no effect. Well, there's one little
change: I also made the "skipping missing subrepository: %s\n" message
relative.

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

41649:799e156785f7

    if opts.get(r'normal') and opts.get(r'large'):
        raise error.Abort(_('--normal cannot be used with --large'))
    return orig(ui, repo, *pats, **opts)

@eh.wrapfunction(cmdutil, 'add')
def cmdutiladd(orig, ui, repo, matcher, prefix, explicitonly, **opts):
    # The --normal flag short circuits this override
    if opts.get(r'normal'):
        return orig(ui, repo, matcher, prefix, explicitonly, **opts)

    ladded, lbad = addlargefiles(ui, repo, False, matcher, **opts)
    normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(),
                                             ladded)
    bad = orig(ui, repo, normalmatcher, prefix, explicitonly, **opts)

    bad.extend(f for f in lbad)
    return bad

@eh.wrapfunction(cmdutil, 'remove')

41650:f8b18583049f

    if opts.get(r'normal') and opts.get(r'large'):
        raise error.Abort(_('--normal cannot be used with --large'))
    return orig(ui, repo, *pats, **opts)

@eh.wrapfunction(cmdutil, 'add')
def cmdutiladd(orig, ui, repo, matcher, prefix, uipathfn, explicitonly, **opts):
    # The --normal flag short circuits this override
    if opts.get(r'normal'):
        return orig(ui, repo, matcher, prefix, uipathfn, explicitonly, **opts)

    ladded, lbad = addlargefiles(ui, repo, False, matcher, **opts)
    normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(),
                                             ladded)
    bad = orig(ui, repo, normalmatcher, prefix, uipathfn, explicitonly, **opts)

    bad.extend(f for f in lbad)
    return bad

@eh.wrapfunction(cmdutil, 'remove')