D5939: commit: respect ui.relative-paths
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Feb 13 07:16:07 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8fc63f5fb50d: commit: respect ui.relative-paths (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5939?vs=14035&id=14061
REVISION DETAIL
https://phab.mercurial-scm.org/D5939
AFFECTED FILES
mercurial/localrepo.py
CHANGE DETAILS
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2455,10 +2455,11 @@
# commit subs and write new state
if subs:
+ uipathfn = scmutil.getuipathfn(self)
for s in sorted(commitsubs):
sub = wctx.sub(s)
self.ui.status(_('committing subrepository %s\n') %
- subrepoutil.subrelpath(sub))
+ uipathfn(subrepoutil.subrelpath(sub)))
sr = sub.commit(cctx._text, user, date)
newstate[s] = (newstate[s][0], sr)
subrepoutil.writestate(self, newstate)
@@ -2526,8 +2527,9 @@
removed = list(ctx.removed())
linkrev = len(self)
self.ui.note(_("committing files:\n"))
+ uipathfn = scmutil.getuipathfn(self)
for f in sorted(ctx.modified() + ctx.added()):
- self.ui.note(f + "\n")
+ self.ui.note(uipathfn(f) + "\n")
try:
fctx = ctx[f]
if fctx is None:
@@ -2538,12 +2540,14 @@
trp, changed)
m.setflag(f, fctx.flags())
except OSError:
- self.ui.warn(_("trouble committing %s!\n") % f)
+ self.ui.warn(_("trouble committing %s!\n") %
+ uipathfn(f))
raise
except IOError as inst:
errcode = getattr(inst, 'errno', errno.ENOENT)
if error or errcode and errcode != errno.ENOENT:
- self.ui.warn(_("trouble committing %s!\n") % f)
+ self.ui.warn(_("trouble committing %s!\n") %
+ uipathfn(f))
raise
# update manifest
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list