##// END OF EJS Templates
largefiles: don't pop largefile-specific arguments to the add command...
Matt Harbison -
r23884:ec2c2e14 default
parent child Browse files
Show More
@@ -90,9 +90,9 b' def restorematchandpatsfn():'
90 scmutil.matchandpats)
90 scmutil.matchandpats)
91
91
92 def addlargefiles(ui, repo, isaddremove, matcher, **opts):
92 def addlargefiles(ui, repo, isaddremove, matcher, **opts):
93 large = opts.pop('large', None)
93 large = opts.get('large')
94 lfsize = lfutil.getminsize(
94 lfsize = lfutil.getminsize(
95 ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None))
95 ui, lfutil.islfilesrepo(repo), opts.get('lfsize'))
96
96
97 lfmatcher = None
97 lfmatcher = None
98 if lfutil.islfilesrepo(repo):
98 if lfutil.islfilesrepo(repo):
@@ -247,7 +247,7 b' def decodepath(orig, path):'
247 # matcher which matches only the normal files and runs the original
247 # matcher which matches only the normal files and runs the original
248 # version of add.
248 # version of add.
249 def overrideadd(orig, ui, repo, *pats, **opts):
249 def overrideadd(orig, ui, repo, *pats, **opts):
250 normal = opts.pop('normal')
250 normal = opts.get('normal')
251 if normal:
251 if normal:
252 if opts.get('large'):
252 if opts.get('large'):
253 raise util.Abort(_('--normal cannot be used with --large'))
253 raise util.Abort(_('--normal cannot be used with --large'))
General Comments 0
You need to be logged in to leave comments. Login now