This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11060

windows: use abspath in chgserver
ClosedPublic

Authored by marmoute on Jul 10 2021, 1:45 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG227bbb078c2c: windows: use abspath in chgserver
Summary

We replace os.path.abspath with util.abspath. This should solve more "drive
capitalization" issue on Windows.

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

marmoute created this revision.Jul 10 2021, 1:45 PM
Alphare accepted this revision.Jul 13 2021, 11:39 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:39 AM
marmoute added a commit: rHG227bbb078c2c: windows: use abspath in chgserver.Jul 16 2021, 5:20 AM
Closed by commit rHG227bbb078c2c: windows: use abspath in chgserver (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (2 lines)

Diff 29306

mercurial/chgserver.py

""" """
def __init__(self, in_, out, channel): def __init__(self, in_, out, channel):
self.in_ = in_ self.in_ = in_
self.out = out self.out = out
self.channel = channel self.channel = channel
def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None): def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None):
args = [type, cmd, os.path.abspath(cwd or b'.')] args = [type, cmd, util.abspath(cwd or b'.')]
args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ)) args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ))
data = b'\0'.join(args) data = b'\0'.join(args)
self.out.write(struct.pack(b'>cI', self.channel, len(data))) self.out.write(struct.pack(b'>cI', self.channel, len(data)))
self.out.write(data) self.out.write(data)
self.out.flush() self.out.flush()
if type == b'system': if type == b'system':
length = self.in_.read(4) length = self.in_.read(4)