This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7725

match: don't util.normpath() cwd
ClosedPublic

Authored by mharbison72 on Dec 26 2019, 7:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8a81fa44f7bb: match: don't util.normpath() cwd
Summary

The problem here is that util.normpath() calls util.pconvert(), which
switches to Unix style separators. That results in two test failures like this
since 5685ce2ea3bf:

    • c:/Users/Matt/hg/tests/test-globalopts.t +++ c:/Users/Matt/hg/tests/test-globalopts.t.err @@ -89,7 +89,7 @@ [255] $ hg -R b ann a/a abort: a/a not under root '$TESTTMP/b'
  • (consider using '--cwd b') + (consider using '--cwd ..\$TESTTMP\b') [255] $ hg log abort: no repository found in '$TESTTMP' (.hg not found)!

    ERROR: test-globalopts.t output changed

Martin originally had os.path.normpath() (which *would* work here too), but
changed it during review. He didn't remember why he thought any form is needed
here. Most uses simply pass '' or repo.getcwd(), so these should generally be
in local format anyway. It seems better if cwd and root use consistent
styles here.

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

mharbison72 created this revision.Dec 26 2019, 7:29 PM
mharbison72 added a commit: rHG8a81fa44f7bb: match: don't util.normpath() cwd.Dec 27 2019, 12:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8a81fa44f7bb: match: don't util.normpath() cwd (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (2 lines)

Diff 18946

mercurial/match.py

2. Using the exact() method only returns True if the file name matches one 2. Using the exact() method only returns True if the file name matches one
of the exact patterns (i.e. not re: or glob: patterns): of the exact patterns (i.e. not re: or glob: patterns):
>>> m.exact(b'a') >>> m.exact(b'a')
True True
>>> m.exact(b'main.c') >>> m.exact(b'main.c')
False False
""" """
assert os.path.isabs(root) assert os.path.isabs(root)
cwd = util.normpath(os.path.join(root, cwd)) cwd = os.path.join(root, util.localpath(cwd))
normalize = _donormalize normalize = _donormalize
if icasefs: if icasefs:
dirstate = ctx.repo().dirstate dirstate = ctx.repo().dirstate
dsnormalize = dirstate.normalize dsnormalize = dirstate.normalize
def normalize(patterns, default, root, cwd, auditor, warn): def normalize(patterns, default, root, cwd, auditor, warn):
kp = _donormalize(patterns, default, root, cwd, auditor, warn) kp = _donormalize(patterns, default, root, cwd, auditor, warn)
kindpats = [] kindpats = []