Changeset f1ce494fb484…
Parent 057a60864ad4…
by
Changes to one file · Browse files at f1ce494fb484 Showing diff from parent 057a60864ad4 Diff from another changeset...
@@ -272,19 +272,19 @@ def add(parent, ui, repo, files):
if 'kbfiles' in repo.extensions():
bfiles = []
- minsize = int(ui.config('kilnbfiles', 'size', default=10))
+ usekbf = os.path.exists(repo.wjoin('.kbf'))
+ minsize = int(ui.config('kilnbfiles', 'size', default='10'))
patterns = ui.config('kilnbfiles', 'patterns', default=())
if patterns:
patterns = patterns.split(' ')
matcher = match.match(repo.root, '', list(patterns))
else:
matcher = None
- if minsize == 0 or minsize >= 10:
- for wfile in files:
- if not matcher or not matcher(wfile):
- filesize = os.path.getsize(repo.wjoin(wfile))
- if filesize >= 10*1024*1024 and filesize < minsize*1024*1024:
- bfiles.append(wfile)
+ for wfile in files:
+ if not matcher or not matcher(wfile) or not usekbf:
+ filesize = os.path.getsize(repo.wjoin(wfile))
+ if filesize >= 10*1024*1024 and (filesize < minsize*1024*1024 or not usekbf):
+ bfiles.append(wfile)
if bfiles:
ret = qtlib.BfilesPrompt(parent, files).run()
if ret == 0:
|
Loading...