2277 |
2277 |
2278 for subpath in sorted(wctx.substate): |
2278 for subpath in sorted(wctx.substate): |
2279 sub = wctx.sub(subpath) |
2279 sub = wctx.sub(subpath) |
2280 try: |
2280 try: |
2281 submatch = matchmod.subdirmatcher(subpath, match) |
2281 submatch = matchmod.subdirmatcher(subpath, match) |
2282 if opts.get('subrepos'): |
2282 if opts.get(r'subrepos'): |
2283 bad.extend(sub.add(ui, submatch, prefix, False, **opts)) |
2283 bad.extend(sub.add(ui, submatch, prefix, False, **opts)) |
2284 else: |
2284 else: |
2285 bad.extend(sub.add(ui, submatch, prefix, True, **opts)) |
2285 bad.extend(sub.add(ui, submatch, prefix, True, **opts)) |
2286 except error.LookupError: |
2286 except error.LookupError: |
2287 ui.status(_("skipping missing subrepository: %s\n") |
2287 ui.status(_("skipping missing subrepository: %s\n") |
2288 % join(subpath)) |
2288 % join(subpath)) |
2289 |
2289 |
2290 if not opts.get('dry_run'): |
2290 if not opts.get(r'dry_run'): |
2291 rejected = wctx.add(names, prefix) |
2291 rejected = wctx.add(names, prefix) |
2292 bad.extend(f for f in rejected if f in match.files()) |
2292 bad.extend(f for f in rejected if f in match.files()) |
2293 return bad |
2293 return bad |
2294 |
2294 |
2295 def addwebdirpath(repo, serverpath, webconf): |
2295 def addwebdirpath(repo, serverpath, webconf): |