Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 11109:a2bc2f2d77a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: normalize path part of URLs so that pulling subrepos from webdir works For a "all projects at root" repo layout eg: /main /sub Where subrepos are used such that a clone of main has this layout: ./main/ ./main/.hgsub ./main/sub/ And the .hgsub content is: sub = ../sub This allows a pull from a hgweb where main and sub are exposed at the root (or same directory level) The current code doesn't normalize the path component of a pull url. this results in trying to pull from http://server.com/hg/main/../sub Current hgweb implementation doesn't reduce the path component so this results in a 404 error though everything is setup logically. This patch adresses this 404 error on the puller side normalizing the URLs used for pulling sub repos. For this example, the URL would be reduced to http://server.com/hg/sub Fix + test
author Edouard Gomez <ed.gomez@free.fr>
date Sat, 01 May 2010 23:05:19 +0200
parents 37d1b20168d1
children d2da9e6dd13e
comparison
equal deleted inserted replaced
11108:8d0cdeaa12f3 11109:a2bc2f2d77a9
3 # Copyright 2009-2010 Matt Mackall <mpm@selenic.com> 3 # Copyright 2009-2010 Matt Mackall <mpm@selenic.com>
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 import errno, os, re, xml.dom.minidom, shutil 8 import errno, os, re, xml.dom.minidom, shutil, urlparse, posixpath
9 from i18n import _ 9 from i18n import _
10 import config, util, node, error 10 import config, util, node, error
11 hg = None 11 hg = None
12 12
13 nullstate = ('', '', 'empty') 13 nullstate = ('', '', 'empty')
133 return source 133 return source
134 parent = _abssource(repo._subparent, push) 134 parent = _abssource(repo._subparent, push)
135 if '://' in parent: 135 if '://' in parent:
136 if parent[-1] == '/': 136 if parent[-1] == '/':
137 parent = parent[:-1] 137 parent = parent[:-1]
138 return parent + '/' + source 138 r = urlparse.urlparse(parent + '/' + source)
139 return os.path.join(parent, repo._subsource) 139 r = urlparse.urlunparse((r[0], r[1],
140 posixpath.normpath(r.path),
141 r[3], r[4], r[5]))
142 return r
143 return posixpath.normpath(os.path.join(parent, repo._subsource))
140 if push and repo.ui.config('paths', 'default-push'): 144 if push and repo.ui.config('paths', 'default-push'):
141 return repo.ui.config('paths', 'default-push', repo.root) 145 return repo.ui.config('paths', 'default-push', repo.root)
142 return repo.ui.config('paths', 'default', repo.root) 146 return repo.ui.config('paths', 'default', repo.root)
143 147
144 def subrepo(ctx, path): 148 def subrepo(ctx, path):