# HG changeset patch # User Matt Harbison # Date 1420068678 18000 # Node ID 6b1428e55728c7b3380e101aa697ed9c698b34b1 # Parent 749dc66e932901f2f5dcdbfa960315c191105096 largefiles: return the list of added files from addlargefiles() This will be used to exclude largefile candidates from the normal file matcher, which will allow add and addremove dryruns to not print a file as both a normal and a large file. diff -r 749dc66e9329 -r 6b1428e55728 hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py Fri Nov 28 21:44:41 2014 -0500 +++ b/hgext/largefiles/overrides.py Wed Dec 31 18:31:18 2014 -0500 @@ -154,9 +154,11 @@ bad += [lfutil.splitstandin(f) for f in repo[None].add(standins) if f in m.files()] + + added = [f for f in lfnames if f not in bad] finally: wlock.release() - return bad + return added, bad def removelargefiles(ui, repo, isaddremove, matcher, **opts): after = opts.get('after') @@ -247,7 +249,7 @@ raise util.Abort(_('--normal cannot be used with --large')) return orig(ui, repo, *pats, **opts) matcher = scmutil.match(repo[None], pats, opts) - bad = addlargefiles(ui, repo, False, matcher, **opts) + added, bad = addlargefiles(ui, repo, False, matcher, **opts) installnormalfilesmatchfn(repo[None].manifest()) result = orig(ui, repo, *pats, **opts) restorematchfn()