| hg-reviewers |
This helps make some future patches easier when I replace origpath()
by another function that works with repo-relative paths (origpath()
works with cwd-relative paths).
Always showing a relative path seems a little more user-friendly and
is more consistent between configured ui.origbackuppath and not. OTOH,
it's annoying if ui.origbackuppath is far outside the repo. This is
just --verbose output, so I don't think it's worth spending much time
on (I've already wasted too many hours on it).
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (3 lines) | |||
| M | tests/test-largefiles-misc.t (2 lines) | |||
| M | tests/test-revert.t (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Feb 6 2019, 5:57 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| 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.origpath(ui, repo, rel) | bakname = scmutil.origpath(ui, repo, rel) | ||||
| relbakname = os.path.relpath(bakname) | |||||
| ui.note(_('saving current version of %s as %s\n') % | ui.note(_('saving current version of %s as %s\n') % | ||||
| (rel, bakname)) | (rel, relbakname)) | ||||
| if not opts.get('dry_run'): | if not opts.get('dry_run'): | ||||
| if interactive: | if interactive: | ||||
| util.copyfile(target, bakname) | util.copyfile(target, bakname) | ||||
| else: | else: | ||||
| util.rename(target, bakname) | util.rename(target, bakname) | ||||
| 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 % rel) | ||||
| $ hg revert anotherlarge | $ hg revert anotherlarge | ||||
| $ hg st | $ hg st | ||||
| ? sub/anotherlarge.orig | ? sub/anotherlarge.orig | ||||
| Test orig files go where we want them | Test orig files go where we want them | ||||
| $ echo moremore >> anotherlarge | $ echo moremore >> anotherlarge | ||||
| $ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups' | $ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups' | ||||
| creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub | creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub | ||||
| saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge | saving current version of ../.hglf/sub/anotherlarge as ../.hg/origbackups/.hglf/sub/anotherlarge | ||||
| reverting ../.hglf/sub/anotherlarge | reverting ../.hglf/sub/anotherlarge | ||||
| creating directory: $TESTTMP/addrm2/.hg/origbackups/sub | creating directory: $TESTTMP/addrm2/.hg/origbackups/sub | ||||
| found 90c622cf65cebe75c5842f9136c459333faf392e in store | found 90c622cf65cebe75c5842f9136c459333faf392e in store | ||||
| found 90c622cf65cebe75c5842f9136c459333faf392e in store | found 90c622cf65cebe75c5842f9136c459333faf392e in store | ||||
| $ ls ../.hg/origbackups/sub | $ ls ../.hg/origbackups/sub | ||||
| anotherlarge | anotherlarge | ||||
| $ cd .. | $ cd .. | ||||
| reverting e | reverting e | ||||
| Test creation of backup (.orig) file in configured file location | Test creation of backup (.orig) file in configured file location | ||||
| ---------------------------------------------------------------- | ---------------------------------------------------------------- | ||||
| $ echo z > e | $ echo z > e | ||||
| $ hg revert --all -v --config 'ui.origbackuppath=.hg/origbackups' | $ hg revert --all -v --config 'ui.origbackuppath=.hg/origbackups' | ||||
| creating directory: $TESTTMP/repo/.hg/origbackups | creating directory: $TESTTMP/repo/.hg/origbackups | ||||
| saving current version of e as $TESTTMP/repo/.hg/origbackups/e | saving current version of e as .hg/origbackups/e | ||||
| reverting e | reverting e | ||||
| $ rm -rf .hg/origbackups | $ rm -rf .hg/origbackups | ||||
| revert on clean file (no change) | revert on clean file (no change) | ||||
| -------------------------------- | -------------------------------- | ||||
| $ hg revert a | $ hg revert a | ||||
| no changes needed to a | no changes needed to a | ||||