comparison tests/test-subrepo-relative-path.out @ 11109:a2bc2f2d77a9

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
children
comparison
equal deleted inserted replaced
11108:8d0cdeaa12f3 11109:a2bc2f2d77a9
1 % Preparing the subrepository sub
2 adding sub/sub
3 % Preparing the main repo which depends on the subrepo sub
4 updating to branch default
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 adding main/.hgsub
7 adding main/main
8 committing subrepository sub
9 % Cleaning both repositories, just as a clone -U
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
12 % Serving them both using hgweb
13 % Clone main from hgweb
14 requesting all changes
15 adding changesets
16 adding manifests
17 adding file changes
18 added 1 changesets with 3 changes to 3 files
19 updating to branch default
20 pulling ...sub
21 requesting all changes
22 adding changesets
23 adding manifests
24 adding file changes
25 added 1 changesets with 1 changes to 1 files
26 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 % Checking cloned repo ids
28 fdfeeb3e979e tip
29 863c1745b441 tip
30 % subrepo debug for main clone
31 path sub
32 source ../sub
33 revision 863c1745b441bd97a8c4a096e87793073f4fb215