mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
46ea8095fd
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
34 lines
1.0 KiB
Plaintext
34 lines
1.0 KiB
Plaintext
% Preparing the subrepository sub
|
|
adding sub/sub
|
|
% Preparing the main repo which depends on the subrepo sub
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
adding main/.hgsub
|
|
adding main/main
|
|
committing subrepository sub
|
|
% Cleaning both repositories, just as a clone -U
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
% Serving them both using hgweb
|
|
% Clone main from hgweb
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 3 changes to 3 files
|
|
updating to branch default
|
|
pulling ...sub
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% Checking cloned repo ids
|
|
fdfeeb3e979e tip
|
|
863c1745b441 tip
|
|
% subrepo debug for main clone
|
|
path sub
|
|
source ../sub
|
|
revision 863c1745b441bd97a8c4a096e87793073f4fb215
|