mercurial/commands.py

6030:d0dbae32517c

    hg.clean(repo, node, show_stats=False)
    revert_opts = opts.copy()
    revert_opts['date'] = None
    revert_opts['all'] = True
    revert_opts['rev'] = hex(parent)
    revert(ui, repo, **revert_opts)
    commit_opts = opts.copy()
    commit_opts['addremove'] = False
    if not commit_opts['message'] and not commit_opts['logfile']:
        commit_opts['message'] = _("Backed out changeset %s") % (short(node))

    # need all matching names in dirstate and manifest of target rev,
    # so have to walk both. do not print errors if files exist in one
    # but not other.

    names = {}
    target_only = {}

    wlock = repo.wlock()
    try:
        # walk dirstate.
        for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
                                                 badmatch=mf.has_key):
            names[abs] = (rel, exact)
            if src == 'b':
                target_only[abs] = True

        # walk target manifest.

        def badmatch(path):
            if path in names:

        for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
                                                 badmatch=badmatch):
            if abs in names or src == 'b':
                continue
            names[abs] = (rel, exact)
            target_only[abs] = True

        changes = repo.status(match=names.has_key)[:5]
        modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)

        # if f is a rename, also revert the source
        cwd = repo.getcwd()
        for f in added:
            src = repo.dirstate.copied(f)

            #   make backup if not in target manifest
            (modified, revert, remove, True, True),
            (added, revert, forget, True, False),
            (removed, undelete, None, False, False),
            (deleted, revert, remove, False, False),
            (unknown, add, None, True, False),
            (target_only, add, None, False, False),
            )

        entries = names.items()
        entries.sort()

                # file has changed in dirstate
                if mfentry:
                    handle(hitlist, backuphit)
                elif misslist is not None:
                    handle(misslist, backupmiss)
                else:
                    if exact: ui.warn(_('file not managed: %s\n') % rel)
                break
            else:
                # file has not changed in dirstate
                if node == parent:
                    if exact: ui.warn(_('no changes needed to %s\n') % rel)
                    continue
                if pmf is None:

6031:7383384793fb

    hg.clean(repo, node, show_stats=False)
    revert_opts = opts.copy()
    revert_opts['date'] = None
    revert_opts['all'] = True
    revert_opts['rev'] = hex(parent)
    revert_opts['no_backup'] = None
    revert(ui, repo, **revert_opts)
    commit_opts = opts.copy()
    commit_opts['addremove'] = False
    if not commit_opts['message'] and not commit_opts['logfile']:
        commit_opts['message'] = _("Backed out changeset %s") % (short(node))

    # need all matching names in dirstate and manifest of target rev,
    # so have to walk both. do not print errors if files exist in one
    # but not other.

    names = {}

    wlock = repo.wlock()
    try:
        # walk dirstate.
        for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
                                                 badmatch=mf.has_key):
            names[abs] = (rel, exact)

        # walk target manifest.

        def badmatch(path):
            if path in names:

        for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
                                                 badmatch=badmatch):
            if abs in names or src == 'b':
                continue
            names[abs] = (rel, exact)

        changes = repo.status(match=names.has_key)[:4]
        modified, added, removed, deleted = map(dict.fromkeys, changes)

        # if f is a rename, also revert the source
        cwd = repo.getcwd()
        for f in added:
            src = repo.dirstate.copied(f)

            #   make backup if not in target manifest
            (modified, revert, remove, True, True),
            (added, revert, forget, True, False),
            (removed, undelete, None, False, False),
            (deleted, revert, remove, False, False),
            )

        entries = names.items()
        entries.sort()

                # file has changed in dirstate
                if mfentry:
                    handle(hitlist, backuphit)
                elif misslist is not None:
                    handle(misslist, backupmiss)
                break
            else:
                if abs not in repo.dirstate:
                    if mfentry:
                        handle(add, True)
                    elif exact:
                        ui.warn(_('file not managed: %s\n') % rel)
                    continue
                # file has not changed in dirstate
                if node == parent:
                    if exact: ui.warn(_('no changes needed to %s\n') % rel)
                    continue
                if pmf is None: