( )⚙ D5939 commit: respect ui.relative-paths

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5939

commit: respect ui.relative-paths
ClosedPublic

Authored by martinvonz on Feb 11 2019, 12:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGec7bba81ebf4: commit: respect ui.relative-paths
rHG8fc63f5fb50d: commit: respect ui.relative-paths
Summary

The command usually doesn't print any paths, but there are some
warnings and verbose messages that includes paths.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 11 2019, 12:50 PM
Closed by commit rHG8fc63f5fb50d: commit: respect ui.relative-paths (authored by martinvonz). · Explain WhyFeb 13 2019, 7:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (12 lines)

Diff 14035

mercurial/localrepo.py

# Save commit message in case this transaction gets rolled back # Save commit message in case this transaction gets rolled back
# (e.g. by a pretxncommit hook). Leave the content alone on # (e.g. by a pretxncommit hook). Leave the content alone on
# the assumption that the user will use the same editor again. # the assumption that the user will use the same editor again.
msgfn = self.savecommitmessage(cctx._text) msgfn = self.savecommitmessage(cctx._text)
# commit subs and write new state # commit subs and write new state
if subs: if subs:
uipathfn = scmutil.getuipathfn(self)
for s in sorted(commitsubs): for s in sorted(commitsubs):
sub = wctx.sub(s) sub = wctx.sub(s)
self.ui.status(_('committing subrepository %s\n') % self.ui.status(_('committing subrepository %s\n') %
subrepoutil.subrelpath(sub)) uipathfn(subrepoutil.subrelpath(sub)))
sr = sub.commit(cctx._text, user, date) sr = sub.commit(cctx._text, user, date)
newstate[s] = (newstate[s][0], sr) newstate[s] = (newstate[s][0], sr)
subrepoutil.writestate(self, newstate) subrepoutil.writestate(self, newstate)
p1, p2 = self.dirstate.parents() p1, p2 = self.dirstate.parents()
hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
try: try:
self.hook("precommit", throw=True, parent1=hookp1, self.hook("precommit", throw=True, parent1=hookp1,
m2 = m2ctx.read() m2 = m2ctx.read()
# check in files # check in files
added = [] added = []
changed = [] changed = []
removed = list(ctx.removed()) removed = list(ctx.removed())
linkrev = len(self) linkrev = len(self)
self.ui.note(_("committing files:\n")) self.ui.note(_("committing files:\n"))
uipathfn = scmutil.getuipathfn(self)
for f in sorted(ctx.modified() + ctx.added()): for f in sorted(ctx.modified() + ctx.added()):
self.ui.note(f + "\n") self.ui.note(uipathfn(f) + "\n")
try: try:
fctx = ctx[f] fctx = ctx[f]
if fctx is None: if fctx is None:
removed.append(f) removed.append(f)
else: else:
added.append(f) added.append(f)
m[f] = self._filecommit(fctx, m1, m2, linkrev, m[f] = self._filecommit(fctx, m1, m2, linkrev,
trp, changed) trp, changed)
m.setflag(f, fctx.flags()) m.setflag(f, fctx.flags())
except OSError: except OSError:
self.ui.warn(_("trouble committing %s!\n") % f) self.ui.warn(_("trouble committing %s!\n") %
uipathfn(f))
raise raise
except IOError as inst: except IOError as inst:
errcode = getattr(inst, 'errno', errno.ENOENT) errcode = getattr(inst, 'errno', errno.ENOENT)
if error or errcode and errcode != 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 raise
# update manifest # update manifest
removed = [f for f in sorted(removed) if f in m1 or f in m2] removed = [f for f in sorted(removed) if f in m1 or f in m2]
drop = [f for f in removed if f in m] drop = [f for f in removed if f in m]
for f in drop: for f in drop:
del m[f] del m[f]
files = changed + removed files = changed + removed