( )⚙ D11971 subrepo: make -S work again on Windows for incoming/outgoing to remote repos

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11971

subrepo: make -S work again on Windows for incoming/outgoing to remote repos
ClosedPublic

Authored by mharbison72 on Jan 10 2022, 11:51 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf98d4d0a299a: subrepo: make -S work again on Windows for incoming/outgoing to remote repos
rHG21bb97351ef9: subrepo: make -S work again on Windows for incoming/outgoing to remote repos
Summary

While it worked fine for the top level repo, the remote path for the subrepo got
mangled to something like "https://server/prefix\repo\subrepo", which I've seen
result in both a 400 and a 404, depending on the server. We need to normpath
at least the subpath because of "http://user:***@localhost:$HGPORT/main/../sub"
in test-subrepo-relative-path.t. Keep the os.path flavor for handling
filesystem based remote repos, since this string is also displayed.

This is one case where the automatic substitution of '\' for '/' and rematching
done by the test runner is unfortunate- I don't see how to write a test to catch
this.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (13 lines)

Diff 31661

mercurial/hg.py

# hg.py - repository classes for mercurial # hg.py - repository classes for mercurial
# #
# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import os import os
import posixpath
import shutil import shutil
import stat import stat
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
sha1nodeconstants, sha1nodeconstants,
path = srcs[0] path = srcs[0]
source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch')) source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch'))
if subpath is not None: if subpath is not None:
subpath = urlutil.url(subpath) subpath = urlutil.url(subpath)
if subpath.isabs(): if subpath.isabs():
source = bytes(subpath) source = bytes(subpath)
else: else:
p = urlutil.url(source) p = urlutil.url(source)
p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) if p.islocal():
normpath = os.path.normpath
else:
normpath = posixpath.normpath
p.path = normpath(b'%s/%s' % (p.path, subpath))
source = bytes(p) source = bytes(p)
other = peer(repo, opts, source) other = peer(repo, opts, source)
cleanupfn = other.close cleanupfn = other.close
try: try:
ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source)) ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev')) revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
if revs: if revs:
for path in urlutil.get_push_paths(repo, ui, dests): for path in urlutil.get_push_paths(repo, ui, dests):
dest = path.pushloc or path.loc dest = path.pushloc or path.loc
if subpath is not None: if subpath is not None:
subpath = urlutil.url(subpath) subpath = urlutil.url(subpath)
if subpath.isabs(): if subpath.isabs():
dest = bytes(subpath) dest = bytes(subpath)
else: else:
p = urlutil.url(dest) p = urlutil.url(dest)
p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) if p.islocal():
normpath = os.path.normpath
else:
normpath = posixpath.normpath
p.path = normpath(b'%s/%s' % (p.path, subpath))
dest = bytes(p) dest = bytes(p)
branches = path.branch, opts.get(b'branch') or [] branches = path.branch, opts.get(b'branch') or []
ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest)) ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev')) revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
if revs: if revs:
revs = [repo[rev].node() for rev in logcmdutil.revrange(repo, revs)] revs = [repo[rev].node() for rev in logcmdutil.revrange(repo, revs)]