diff -r ec2c2e1400f0 -r 9994f45ba714 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed Dec 31 18:24:32 2014 -0500 +++ b/mercurial/cmdutil.py Mon Jan 12 20:59:17 2015 -0500 @@ -1979,7 +1979,7 @@ nodes = nodes[:limit] return graphmod.nodes(repo, nodes) -def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly): +def add(ui, repo, match, prefix, explicitonly, **opts): join = lambda f: os.path.join(prefix, f) bad = [] oldbad = match.bad @@ -2003,17 +2003,15 @@ sub = wctx.sub(subpath) try: submatch = matchmod.narrowmatcher(subpath, match) - if listsubrepos: - bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, - False)) + if opts.get('subrepos'): + bad.extend(sub.add(ui, submatch, prefix, False, **opts)) else: - bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, - True)) + bad.extend(sub.add(ui, submatch, prefix, True, **opts)) except error.LookupError: ui.status(_("skipping missing subrepository: %s\n") % join(subpath)) - if not dryrun: + if not opts.get('dry_run'): rejected = wctx.add(names, prefix) bad.extend(f for f in rejected if f in match.files()) return bad