Comments
Patch
@@ -2279,7 +2279,7 @@
sub = wctx.sub(subpath)
try:
submatch = matchmod.subdirmatcher(subpath, match)
- if opts.get('subrepos'):
+ if opts.get(r'subrepos'):
bad.extend(sub.add(ui, submatch, prefix, False, **opts))
else:
bad.extend(sub.add(ui, submatch, prefix, True, **opts))
@@ -2287,7 +2287,7 @@
ui.status(_("skipping missing subrepository: %s\n")
% join(subpath))
- if not opts.get('dry_run'):
+ if not opts.get(r'dry_run'):
rejected = wctx.add(names, prefix)
bad.extend(f for f in rejected if f in match.files())
return bad
@@ -255,8 +255,7 @@
Returns 0 if all files are successfully added.
"""
- opts = pycompat.byteskwargs(opts)
- m = scmutil.match(repo[None], pats, opts)
+ m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
rejected = cmdutil.add(ui, repo, m, "", False, **opts)
return rejected and 1 or 0
@@ -1771,7 +1771,7 @@
if exact:
rejected.append(f)
continue
- if not opts.get('dry_run'):
+ if not opts.get(r'dry_run'):
self._gitcommand(command + [f])
for f in rejected: