This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5898

debugignore: respect ui.relative-paths
ClosedPublic

Authored by martinvonz on Feb 8 2019, 12:45 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbe8741d42836: debugignore: respect ui.relative-paths
Summary

Not because I care about this, but I want to get rid of match.uipath()
and it's easier to respect the config than not.

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 8 2019, 12:45 PM
pulkit accepted this revision.Feb 9 2019, 4:44 PM
Closed by commit rHGbe8741d42836: debugignore: respect ui.relative-paths (authored by martinvonz). · Explain WhyFeb 9 2019, 5:16 PM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Feb 16 2019, 10:53 PM

This seems to have converted a test from dos to unix style. I'm not sure if that was intentional, or if this feature is still a WIP. (Sorry, I've been busy lately, and haven't had time to follow this closely)

https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1274/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

martinvonz added a comment.Feb 17 2019, 1:03 AM
In D5898#87275, @mharbison72 wrote:

This seems to have converted a test from dos to unix style. I'm not sure if that was intentional, or if this feature is still a WIP. (Sorry, I've been busy lately, and haven't had time to follow this closely)
https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1274/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

It wasn't intentional, and it took me a while to figure out why it changed, but I'm pretty confident it's just changed in the tests, since the test runner sets ui.slash. The old code called m.uipath() and that called util.pathto(). The new code calls repo.path(), which calls dirstate.pathto(), which also calls util.pathto(). However, if ui.slash is set, dirstate.pathto() also calls util.pconvert() to convert it back to a slash-separated path. Please send a patch to update the test case if you have access to a Windows machine.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (7 lines)

Diff 13966

mercurial/debugcommands.py

if so, show the ignore rule (file and line number) that matched it. if so, show the ignore rule (file and line number) that matched it.
""" """
ignore = repo.dirstate._ignore ignore = repo.dirstate._ignore
if not files: if not files:
# Show all the patterns # Show all the patterns
ui.write("%s\n" % pycompat.byterepr(ignore)) ui.write("%s\n" % pycompat.byterepr(ignore))
else: else:
m = scmutil.match(repo[None], pats=files) m = scmutil.match(repo[None], pats=files)
uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
for f in m.files(): for f in m.files():
nf = util.normpath(f) nf = util.normpath(f)
ignored = None ignored = None
ignoredata = None ignoredata = None
if nf != '.': if nf != '.':
if ignore(nf): if ignore(nf):
ignored = nf ignored = nf
ignoredata = repo.dirstate._ignorefileandline(nf) ignoredata = repo.dirstate._ignorefileandline(nf)
else: else:
for p in util.finddirs(nf): for p in util.finddirs(nf):
if ignore(p): if ignore(p):
ignored = p ignored = p
ignoredata = repo.dirstate._ignorefileandline(p) ignoredata = repo.dirstate._ignorefileandline(p)
break break
if ignored: if ignored:
if ignored == nf: if ignored == nf:
ui.write(_("%s is ignored\n") % m.uipath(f)) ui.write(_("%s is ignored\n") % uipathfn(f))
else: else:
ui.write(_("%s is ignored because of " ui.write(_("%s is ignored because of "
"containing folder %s\n") "containing folder %s\n")
% (m.uipath(f), ignored)) % (uipathfn(f), ignored))
ignorefile, lineno, line = ignoredata ignorefile, lineno, line = ignoredata
ui.write(_("(ignore rule in %s, line %d: '%s')\n") ui.write(_("(ignore rule in %s, line %d: '%s')\n")
% (ignorefile, lineno, line)) % (ignorefile, lineno, line))
else: else:
ui.write(_("%s is not ignored\n") % m.uipath(f)) ui.write(_("%s is not ignored\n") % uipathfn(f))
@command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts, @command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts,
_('-c|-m|FILE')) _('-c|-m|FILE'))
def debugindex(ui, repo, file_=None, **opts): def debugindex(ui, repo, file_=None, **opts):
"""dump index data for a storage primitive""" """dump index data for a storage primitive"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
store = cmdutil.openstorage(repo, 'debugindex', file_, opts) store = cmdutil.openstorage(repo, 'debugindex', file_, opts)