Show More
@@ -2279,7 +2279,7 b' def add(ui, repo, match, prefix, explici' | |||
|
2279 | 2279 | sub = wctx.sub(subpath) |
|
2280 | 2280 | try: |
|
2281 | 2281 | submatch = matchmod.subdirmatcher(subpath, match) |
|
2282 | if opts.get('subrepos'): | |
|
2282 | if opts.get(r'subrepos'): | |
|
2283 | 2283 | bad.extend(sub.add(ui, submatch, prefix, False, **opts)) |
|
2284 | 2284 | else: |
|
2285 | 2285 | bad.extend(sub.add(ui, submatch, prefix, True, **opts)) |
@@ -2287,7 +2287,7 b' def add(ui, repo, match, prefix, explici' | |||
|
2287 | 2287 | ui.status(_("skipping missing subrepository: %s\n") |
|
2288 | 2288 | % join(subpath)) |
|
2289 | 2289 | |
|
2290 | if not opts.get('dry_run'): | |
|
2290 | if not opts.get(r'dry_run'): | |
|
2291 | 2291 | rejected = wctx.add(names, prefix) |
|
2292 | 2292 | bad.extend(f for f in rejected if f in match.files()) |
|
2293 | 2293 | return bad |
@@ -255,8 +255,7 b' def add(ui, repo, *pats, **opts):' | |||
|
255 | 255 | Returns 0 if all files are successfully added. |
|
256 | 256 | """ |
|
257 | 257 | |
|
258 |
|
|
|
259 | m = scmutil.match(repo[None], pats, opts) | |
|
258 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) | |
|
260 | 259 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) |
|
261 | 260 | return rejected and 1 or 0 |
|
262 | 261 |
General Comments 0
You need to be logged in to leave comments.
Login now