This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5855

mq: migrate to scmutil.backuppath()
ClosedPublic

Authored by martinvonz on Feb 5 2019, 12:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG106b0bec162a: mq: migrate to scmutil.backuppath()
rHGa2caf9974995: mq: migrate to scmutil.backuppath()
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 5 2019, 12:52 PM
martinvonz updated this revision to Diff 13860.Feb 6 2019, 6:59 PM
Closed by commit rHGa2caf9974995: mq: migrate to scmutil.backuppath() (authored by martinvonz). · Explain WhyFeb 6 2019, 9:03 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Feb 7 2019, 7:58 AM
  • absorig = scmutil.origpath(self.ui, repo, absf)

+ absorig = scmutil.backuppath(self.ui, repo, f)

self.ui.note(_('saving current version of %s as %s\n') %
  • (f, os.path.relpath(absorig)))

+ (f, os.path.relpath(absorig, start=repo.root)))

Why printing a repo-relative path instead of cwd-relative one?

martinvonz added a comment.Feb 7 2019, 9:22 AM
In D5855#86020, @yuja wrote:
  • absorig = scmutil.origpath(self.ui, repo, absf)

+ absorig = scmutil.backuppath(self.ui, repo, f)

self.ui.note(_('saving current version of %s as %s\n') %
  • (f, os.path.relpath(absorig)))

+ (f, os.path.relpath(absorig, start=repo.root)))

Why printing a repo-relative path instead of cwd-relative one?

Oops, not intended. Feel free to fix it. Otherwise I'll do that in about two hours.

martinvonz added a comment.Feb 7 2019, 11:01 AM
In D5855#86040, @martinvonz wrote:
In D5855#86020, @yuja wrote:
  • absorig = scmutil.origpath(self.ui, repo, absf)

+ absorig = scmutil.backuppath(self.ui, repo, f)

self.ui.note(_('saving current version of %s as %s\n') %
  • (f, os.path.relpath(absorig)))

+ (f, os.path.relpath(absorig, start=repo.root)))

Why printing a repo-relative path instead of cwd-relative one?

Oops, not intended. Feel free to fix it. Otherwise I'll do that in about two hours.

Fixed in the hg-committed repo.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (4 lines)

Diff 13877

hgext/mq.py

self.ui.warn(_('error removing undo: %s\n') % self.ui.warn(_('error removing undo: %s\n') %
stringutil.forcebytestr(inst)) stringutil.forcebytestr(inst))
def backup(self, repo, files, copy=False): def backup(self, repo, files, copy=False):
# backup local changes in --force case # backup local changes in --force case
for f in sorted(files): for f in sorted(files):
absf = repo.wjoin(f) absf = repo.wjoin(f)
if os.path.lexists(absf): if os.path.lexists(absf):
absorig = scmutil.origpath(self.ui, repo, absf) absorig = scmutil.backuppath(self.ui, repo, f)
self.ui.note(_('saving current version of %s as %s\n') % self.ui.note(_('saving current version of %s as %s\n') %
(f, os.path.relpath(absorig))) (f, os.path.relpath(absorig, start=repo.root)))
if copy: if copy:
util.copyfile(absf, absorig) util.copyfile(absf, absorig)
else: else:
util.rename(absf, absorig) util.rename(absf, absorig)
def printdiff(self, repo, diffopts, node1, node2=None, files=None, def printdiff(self, repo, diffopts, node1, node2=None, files=None,
fp=None, changes=None, opts=None): fp=None, changes=None, opts=None):