| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (43 lines) | |||
| M | tests/test-revert.t (17 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz |
| # but not other. in both cases, filesets should be evaluated against | # but not other. in both cases, filesets should be evaluated against | ||||
| # workingctx to get consistent result (issue4497). this means 'set:**' | # workingctx to get consistent result (issue4497). this means 'set:**' | ||||
| # cannot be used to select missing files from target rev. | # cannot be used to select missing files from target rev. | ||||
| # `names` is a mapping for all elements in working copy and target revision | # `names` is a mapping for all elements in working copy and target revision | ||||
| # The mapping is in the form: | # The mapping is in the form: | ||||
| # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>) | # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>) | ||||
| names = {} | names = {} | ||||
| uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) | |||||
| with repo.wlock(): | with repo.wlock(): | ||||
| ## filling of the `names` mapping | ## filling of the `names` mapping | ||||
| # walk dirstate to fill `names` | # walk dirstate to fill `names` | ||||
| interactive = opts.get('interactive', False) | interactive = opts.get('interactive', False) | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| m = scmutil.match(wctx, pats, opts) | m = scmutil.match(wctx, pats, opts) | ||||
| # we'll need this later | # we'll need this later | ||||
| targetsubs = sorted(s for s in wctx.substate if m(s)) | targetsubs = sorted(s for s in wctx.substate if m(s)) | ||||
| if not m.always(): | if not m.always(): | ||||
| matcher = matchmod.badmatch(m, lambda x, y: False) | matcher = matchmod.badmatch(m, lambda x, y: False) | ||||
| for abs in wctx.walk(matcher): | for abs in wctx.walk(matcher): | ||||
| names[abs] = m.rel(abs), m.exact(abs) | names[abs] = m.exact(abs) | ||||
| # walk target manifest to fill `names` | # walk target manifest to fill `names` | ||||
| def badfn(path, msg): | def badfn(path, msg): | ||||
| if path in names: | if path in names: | ||||
| return | return | ||||
| if path in ctx.substate: | if path in ctx.substate: | ||||
| return | return | ||||
| path_ = path + '/' | path_ = path + '/' | ||||
| for f in names: | for f in names: | ||||
| if f.startswith(path_): | if f.startswith(path_): | ||||
| return | return | ||||
| ui.warn("%s: %s\n" % (m.rel(path), msg)) | ui.warn("%s: %s\n" % (m.rel(path), msg)) | ||||
| for abs in ctx.walk(matchmod.badmatch(m, badfn)): | for abs in ctx.walk(matchmod.badmatch(m, badfn)): | ||||
| if abs not in names: | if abs not in names: | ||||
| names[abs] = m.rel(abs), m.exact(abs) | names[abs] = m.exact(abs) | ||||
| # Find status of all file in `names`. | # Find status of all file in `names`. | ||||
| m = scmutil.matchfiles(repo, names) | m = scmutil.matchfiles(repo, names) | ||||
| changes = repo.status(node1=node, match=m, | changes = repo.status(node1=node, match=m, | ||||
| unknown=True, ignored=True, clean=True) | unknown=True, ignored=True, clean=True) | ||||
| else: | else: | ||||
| changes = repo.status(node1=node, match=m) | changes = repo.status(node1=node, match=m) | ||||
| for kind in changes: | for kind in changes: | ||||
| for abs in kind: | for abs in kind: | ||||
| names[abs] = m.rel(abs), m.exact(abs) | names[abs] = m.exact(abs) | ||||
| m = scmutil.matchfiles(repo, names) | m = scmutil.matchfiles(repo, names) | ||||
| modified = set(changes.modified) | modified = set(changes.modified) | ||||
| added = set(changes.added) | added = set(changes.added) | ||||
| removed = set(changes.removed) | removed = set(changes.removed) | ||||
| _deleted = set(changes.deleted) | _deleted = set(changes.deleted) | ||||
| unknown = set(changes.unknown) | unknown = set(changes.unknown) | ||||
| mergeadd = set(dsmodified) | mergeadd = set(dsmodified) | ||||
| for path in dsmodified: | for path in dsmodified: | ||||
| if path in mf: | if path in mf: | ||||
| mergeadd.remove(path) | mergeadd.remove(path) | ||||
| dsadded |= mergeadd | dsadded |= mergeadd | ||||
| dsmodified -= mergeadd | dsmodified -= mergeadd | ||||
| # if f is a rename, update `names` to also revert the source | # if f is a rename, update `names` to also revert the source | ||||
| cwd = repo.getcwd() | |||||
| for f in localchanges: | for f in localchanges: | ||||
| src = repo.dirstate.copied(f) | src = repo.dirstate.copied(f) | ||||
| # XXX should we check for rename down to target node? | # XXX should we check for rename down to target node? | ||||
| if src and src not in names and repo.dirstate[src] == 'r': | if src and src not in names and repo.dirstate[src] == 'r': | ||||
| dsremoved.add(src) | dsremoved.add(src) | ||||
| names[src] = (repo.pathto(src, cwd), True) | names[src] = True | ||||
| # determine the exact nature of the deleted changesets | # determine the exact nature of the deleted changesets | ||||
| deladded = set(_deleted) | deladded = set(_deleted) | ||||
| for path in _deleted: | for path in _deleted: | ||||
| if path in mf: | if path in mf: | ||||
| deladded.remove(path) | deladded.remove(path) | ||||
| deleted = _deleted - deladded | deleted = _deleted - deladded | ||||
| (dsremovunk, actions['undelete'], check), | (dsremovunk, actions['undelete'], check), | ||||
| ## the following sets does not result in any file changes | ## the following sets does not result in any file changes | ||||
| # File with no modification | # File with no modification | ||||
| (clean, actions['noop'], discard), | (clean, actions['noop'], discard), | ||||
| # Existing file, not tracked anywhere | # Existing file, not tracked anywhere | ||||
| (unknown, actions['unknown'], discard), | (unknown, actions['unknown'], discard), | ||||
| ) | ) | ||||
| for abs, (rel, exact) in sorted(names.items()): | for abs, exact in sorted(names.items()): | ||||
| # target file to be touch on disk (relative to cwd) | # target file to be touch on disk (relative to cwd) | ||||
| target = repo.wjoin(abs) | target = repo.wjoin(abs) | ||||
| # search the entry in the dispatch table. | # search the entry in the dispatch table. | ||||
| # if the file is in any of these sets, it was touched in the working | # if the file is in any of these sets, it was touched in the working | ||||
| # directory parent and we are sure it needs to be reverted. | # directory parent and we are sure it needs to be reverted. | ||||
| for table, (xlist, msg), dobackup in disptable: | for table, (xlist, msg), dobackup in disptable: | ||||
| if abs not in table: | if abs not in table: | ||||
| continue | continue | ||||
| if xlist is not None: | if xlist is not None: | ||||
| xlist.append(abs) | xlist.append(abs) | ||||
| if dobackup: | if dobackup: | ||||
| # If in interactive mode, don't automatically create | # If in interactive mode, don't automatically create | ||||
| # .orig files (issue4793) | # .orig files (issue4793) | ||||
| if dobackup == backupinteractive: | if dobackup == backupinteractive: | ||||
| tobackup.add(abs) | tobackup.add(abs) | ||||
| elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])): | elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])): | ||||
| bakname = scmutil.backuppath(ui, repo, abs) | absbakname = scmutil.backuppath(ui, repo, abs) | ||||
| relbakname = os.path.relpath(bakname) | bakname = os.path.relpath(absbakname, | ||||
| start=repo.root) | |||||
| ui.note(_('saving current version of %s as %s\n') % | ui.note(_('saving current version of %s as %s\n') % | ||||
| (rel, relbakname)) | (uipathfn(abs), uipathfn(bakname))) | ||||
| if not opts.get('dry_run'): | if not opts.get('dry_run'): | ||||
| if interactive: | if interactive: | ||||
| util.copyfile(target, bakname) | util.copyfile(target, absbakname) | ||||
| else: | else: | ||||
| util.rename(target, bakname) | util.rename(target, absbakname) | ||||
| if opts.get('dry_run'): | if opts.get('dry_run'): | ||||
| if ui.verbose or not exact: | if ui.verbose or not exact: | ||||
| ui.status(msg % rel) | ui.status(msg % uipathfn(abs)) | ||||
| elif exact: | elif exact: | ||||
| ui.warn(msg % rel) | ui.warn(msg % uipathfn(abs)) | ||||
| break | break | ||||
| if not opts.get('dry_run'): | if not opts.get('dry_run'): | ||||
| needdata = ('revert', 'add', 'undelete') | needdata = ('revert', 'add', 'undelete') | ||||
| oplist = [actions[name][0] for name in needdata] | oplist = [actions[name][0] for name in needdata] | ||||
| prefetch = scmutil.prefetchfiles | prefetch = scmutil.prefetchfiles | ||||
| matchfiles = scmutil.matchfiles | matchfiles = scmutil.matchfiles | ||||
| prefetch(repo, [ctx.rev()], | prefetch(repo, [ctx.rev()], | ||||
| matchfiles(repo, | matchfiles(repo, | ||||
| [f for sublist in oplist for f in sublist])) | [f for sublist in oplist for f in sublist])) | ||||
| _performrevert(repo, parents, ctx, names, actions, interactive, | _performrevert(repo, parents, ctx, names, uipathfn, actions, | ||||
| tobackup) | interactive, tobackup) | ||||
| if targetsubs: | if targetsubs: | ||||
| # Revert the subrepos on the revert list | # Revert the subrepos on the revert list | ||||
| for sub in targetsubs: | for sub in targetsubs: | ||||
| try: | try: | ||||
| wctx.sub(sub).revert(ctx.substate[sub], *pats, | wctx.sub(sub).revert(ctx.substate[sub], *pats, | ||||
| **pycompat.strkwargs(opts)) | **pycompat.strkwargs(opts)) | ||||
| except KeyError: | except KeyError: | ||||
| raise error.Abort("subrepository '%s' does not exist in %s!" | raise error.Abort("subrepository '%s' does not exist in %s!" | ||||
| % (sub, short(ctx.node()))) | % (sub, short(ctx.node()))) | ||||
| def _performrevert(repo, parents, ctx, names, actions, interactive=False, | def _performrevert(repo, parents, ctx, names, uipathfn, actions, | ||||
| tobackup=None): | interactive=False, tobackup=None): | ||||
| """function that actually perform all the actions computed for revert | """function that actually perform all the actions computed for revert | ||||
| This is an independent function to let extension to plug in and react to | This is an independent function to let extension to plug in and react to | ||||
| the imminent revert. | the imminent revert. | ||||
| Make sure you have the working directory locked when calling this function. | Make sure you have the working directory locked when calling this function. | ||||
| """ | """ | ||||
| parent, p2 = parents | parent, p2 = parents | ||||
| node = ctx.node() | node = ctx.node() | ||||
| excluded_files = [] | excluded_files = [] | ||||
| def checkout(f): | def checkout(f): | ||||
| fc = ctx[f] | fc = ctx[f] | ||||
| repo.wwrite(f, fc.data(), fc.flags()) | repo.wwrite(f, fc.data(), fc.flags()) | ||||
| def doremove(f): | def doremove(f): | ||||
| try: | try: | ||||
| rmdir = repo.ui.configbool('experimental', 'removeemptydirs') | rmdir = repo.ui.configbool('experimental', 'removeemptydirs') | ||||
| repo.wvfs.unlinkpath(f, rmdir=rmdir) | repo.wvfs.unlinkpath(f, rmdir=rmdir) | ||||
| except OSError: | except OSError: | ||||
| pass | pass | ||||
| repo.dirstate.remove(f) | repo.dirstate.remove(f) | ||||
| def prntstatusmsg(action, f): | def prntstatusmsg(action, f): | ||||
| rel, exact = names[f] | exact = names[f] | ||||
| if repo.ui.verbose or not exact: | if repo.ui.verbose or not exact: | ||||
| repo.ui.status(actions[action][1] % rel) | repo.ui.status(actions[action][1] % uipathfn(f)) | ||||
| audit_path = pathutil.pathauditor(repo.root, cached=True) | audit_path = pathutil.pathauditor(repo.root, cached=True) | ||||
| for f in actions['forget'][0]: | for f in actions['forget'][0]: | ||||
| if interactive: | if interactive: | ||||
| choice = repo.ui.promptchoice( | choice = repo.ui.promptchoice( | ||||
| _("forget added file %s (Yn)?$$ &Yes $$ &No") % f) | _("forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)) | ||||
| if choice == 0: | if choice == 0: | ||||
| prntstatusmsg('forget', f) | prntstatusmsg('forget', f) | ||||
| repo.dirstate.drop(f) | repo.dirstate.drop(f) | ||||
| else: | else: | ||||
| excluded_files.append(f) | excluded_files.append(f) | ||||
| else: | else: | ||||
| prntstatusmsg('forget', f) | prntstatusmsg('forget', f) | ||||
| repo.dirstate.drop(f) | repo.dirstate.drop(f) | ||||
| for f in actions['remove'][0]: | for f in actions['remove'][0]: | ||||
| audit_path(f) | audit_path(f) | ||||
| if interactive: | if interactive: | ||||
| choice = repo.ui.promptchoice( | choice = repo.ui.promptchoice( | ||||
| _("remove added file %s (Yn)?$$ &Yes $$ &No") % f) | _("remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)) | ||||
| if choice == 0: | if choice == 0: | ||||
| prntstatusmsg('remove', f) | prntstatusmsg('remove', f) | ||||
| doremove(f) | doremove(f) | ||||
| else: | else: | ||||
| excluded_files.append(f) | excluded_files.append(f) | ||||
| else: | else: | ||||
| prntstatusmsg('remove', f) | prntstatusmsg('remove', f) | ||||
| doremove(f) | doremove(f) | ||||
| $ hg add newdir/newfile | $ hg add newdir/newfile | ||||
| $ hg revert b newdir | $ hg revert b newdir | ||||
| forgetting newdir/newfile | forgetting newdir/newfile | ||||
| reverting b/b | reverting b/b | ||||
| $ echo foobar > b/b | $ echo foobar > b/b | ||||
| $ hg revert . | $ hg revert . | ||||
| reverting b/b | reverting b/b | ||||
| respects ui.relative-paths | |||||
| -------------------------- | |||||
| $ echo foo > newdir/newfile | |||||
| $ hg add newdir/newfile | |||||
| $ hg revert --all --cwd newdir | |||||
| forgetting newfile | |||||
| $ echo foo > newdir/newfile | |||||
| $ hg add newdir/newfile | |||||
| $ hg revert --all --cwd newdir --config ui.relative-paths=True | |||||
| forgetting newfile | |||||
| $ echo foo > newdir/newfile | |||||
| $ hg add newdir/newfile | |||||
| $ hg revert --all --cwd newdir --config ui.relative-paths=False | |||||
| forgetting newdir/newfile | |||||
| reverting a rename target should revert the source | reverting a rename target should revert the source | ||||
| -------------------------------------------------- | -------------------------------------------------- | ||||
| $ hg mv a newa | $ hg mv a newa | ||||
| $ hg revert newa | $ hg revert newa | ||||
| $ hg st a newa | $ hg st a newa | ||||
| ? newa | ? newa | ||||