Mercurial > hg
changeset 23884:ec2c2e1400f0
largefiles: don't pop largefile-specific arguments to the add command
The arguments will need to stay present when making add work with subrepos.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 31 Dec 2014 18:24:32 -0500 |
| parents | 7e71898a7cdc |
| children | 9994f45ba714 |
| files | hgext/largefiles/overrides.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Sun Jan 11 16:20:15 2015 +0100 +++ b/hgext/largefiles/overrides.py Wed Dec 31 18:24:32 2014 -0500 @@ -90,9 +90,9 @@ scmutil.matchandpats) def addlargefiles(ui, repo, isaddremove, matcher, **opts): - large = opts.pop('large', None) + large = opts.get('large') lfsize = lfutil.getminsize( - ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None)) + ui, lfutil.islfilesrepo(repo), opts.get('lfsize')) lfmatcher = None if lfutil.islfilesrepo(repo): @@ -247,7 +247,7 @@ # matcher which matches only the normal files and runs the original # version of add. def overrideadd(orig, ui, repo, *pats, **opts): - normal = opts.pop('normal') + normal = opts.get('normal') if normal: if opts.get('large'): raise util.Abort(_('--normal cannot be used with --large'))