Mercurial > hg
comparison mercurial/cmdutil.py @ 26938:080276d377d9
revert: allow configuring the .orig file location
| author | Christian Delahousse <cdelahousse@fb.com> |
|---|---|
| date | Thu, 12 Nov 2015 17:00:08 -0600 |
| parents | dda0aa3baedd |
| children | 93bcc73df8d5 |
comparison
equal
deleted
inserted
replaced
| 26937:dda0aa3baedd | 26938:080276d377d9 |
|---|---|
| 3080 continue | 3080 continue |
| 3081 if xlist is not None: | 3081 if xlist is not None: |
| 3082 xlist.append(abs) | 3082 xlist.append(abs) |
| 3083 if dobackup and (backup <= dobackup | 3083 if dobackup and (backup <= dobackup |
| 3084 or wctx[abs].cmp(ctx[abs])): | 3084 or wctx[abs].cmp(ctx[abs])): |
| 3085 bakname = "%s.orig" % rel | 3085 bakname = origpath(ui, repo, rel) |
| 3086 ui.note(_('saving current version of %s as %s\n') % | 3086 ui.note(_('saving current version of %s as %s\n') % |
| 3087 (rel, bakname)) | 3087 (rel, bakname)) |
| 3088 if not opts.get('dry_run'): | 3088 if not opts.get('dry_run'): |
| 3089 if interactive: | 3089 if interactive: |
| 3090 util.copyfile(target, bakname) | 3090 util.copyfile(target, bakname) |