( )⚙ D11260 vfs: always use / as file separator (issue6546)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11260

vfs: always use / as file separator (issue6546)
ClosedPublic

Authored by marmoute on Aug 5 2021, 12:58 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG98c3fa6a3ac2: vfs: always use / as file separator (issue6546)
rHG190596e58295: vfs: always use / as file separator (issue6546)
rHG8f6f22f2ecb2: vfs: always use / as file separator (issue6546)
Summary

Various part of vfs already enforce / usage and using \ confuse the encoded
vfs. So we simply use / all the time.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Aug 5 2021, 12:58 PM
baymax updated this revision to Diff 29820.Aug 5 2021, 2:01 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Alphare accepted this revision.Aug 6 2021, 6:24 AM
This revision is now accepted and ready to land.Aug 6 2021, 6:24 AM
marmoute added a commit: rHG8f6f22f2ecb2: vfs: always use / as file separator (issue6546).Aug 6 2021, 6:29 AM
Closed by commit rHG8f6f22f2ecb2: vfs: always use / as file separator (issue6546) (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/vfs.py (24 lines)
Mtests/test-annotate.t (4 lines)

Diff 29820

mercurial/vfs.py

# advance mtime (see issue5418) # advance mtime (see issue5418)
util.rename(util.mktempcopy(path), path) util.rename(util.mktempcopy(path), path)
checkandavoid() checkandavoid()
class abstractvfs(object): class abstractvfs(object):
"""Abstract base class; cannot be instantiated""" """Abstract base class; cannot be instantiated"""
# default directory separator for vfs
#
# Other vfs code always use `/` and this works fine because python file API
# abstract the use of `/` and make it work transparently. For consistency
# vfs will always use `/` when joining. This avoid some confusion in
# encoded vfs (see issue6546)
_dir_sep = b'/'
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
'''Prevent instantiation; don't call this from subclasses.''' '''Prevent instantiation; don't call this from subclasses.'''
raise NotImplementedError('attempted instantiating ' + str(type(self))) raise NotImplementedError('attempted instantiating ' + str(type(self)))
def __call__(self, path, mode=b'rb', **kwargs): def __call__(self, path, mode=b'rb', **kwargs):
raise NotImplementedError raise NotImplementedError
def _auditpath(self, path, mode): def _auditpath(self, path, mode):
Unlike isfile, this doesn't follow symlinks.""" Unlike isfile, this doesn't follow symlinks."""
try: try:
st = self.lstat(path) st = self.lstat(path)
except OSError: except OSError:
return False return False
mode = st.st_mode mode = st.st_mode
return stat.S_ISREG(mode) or stat.S_ISLNK(mode) return stat.S_ISREG(mode) or stat.S_ISLNK(mode)
def _join(self, *paths):
root_idx = 0
for idx, p in enumerate(paths):
if os.path.isabs(p) or p.startswith(self._dir_sep):
root_idx = idx
if root_idx != 0:
paths = paths[root_idx:]
paths = [p for p in paths if p]
return self._dir_sep.join(paths)
def reljoin(self, *paths): def reljoin(self, *paths):
"""join various elements of a path together (as os.path.join would do) """join various elements of a path together (as os.path.join would do)
The vfs base is not injected so that path stay relative. This exists The vfs base is not injected so that path stay relative. This exists
to allow handling of strange encoding if needed.""" to allow handling of strange encoding if needed."""
return os.path.join(*paths) return self._join(*paths)
def split(self, path): def split(self, path):
"""split top-most element of a path (as os.path.split would do) """split top-most element of a path (as os.path.split would do)
This exists to allow handling of strange encoding if needed.""" This exists to allow handling of strange encoding if needed."""
return os.path.split(path) return os.path.split(path)
def lexists(self, path=None): def lexists(self, path=None):
% (src, encoding.strtolocal(err.strerror)), % (src, encoding.strtolocal(err.strerror)),
linkname, linkname,
) )
else: else:
self.write(dst, src) self.write(dst, src)
def join(self, path, *insidef): def join(self, path, *insidef):
if path: if path:
return os.path.join(self.base, path, *insidef) parts = [self.base, path]
parts.extend(insidef)
return self._join(*parts)
else: else:
return self.base return self.base
opener = vfs opener = vfs
class proxyvfs(abstractvfs): class proxyvfs(abstractvfs):

tests/test-annotate.t

11 472b18db256d : foo 11 472b18db256d : foo
20 b6bedd5477e7+: foofoo 20 b6bedd5477e7+: foofoo
annotate missing file annotate missing file
$ rm baz $ rm baz
$ hg annotate -ncr "wdir()" baz $ hg annotate -ncr "wdir()" baz
abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) abort: $TESTTMP\repo/baz: $ENOENT$ (windows !)
abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !) abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
[255] [255]
annotate removed file annotate removed file
$ hg rm baz $ hg rm baz
$ hg annotate -ncr "wdir()" baz $ hg annotate -ncr "wdir()" baz
abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) abort: $TESTTMP\repo/baz: $ENOENT$ (windows !)
abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !) abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
[255] [255]
$ hg revert --all --no-backup --quiet $ hg revert --all --no-backup --quiet
$ hg id -n $ hg id -n
20 20
Test followlines() revset; we usually check both followlines(pat, range) and Test followlines() revset; we usually check both followlines(pat, range) and