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

     1

# node.py - basic nodeid manipulation for mercurial

     2

#

     3

# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

     4

#

     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.

     7

     8

import binascii

     9

    10

nullrev = -1

    11

nullid = "\0" * 20

    12

    13

# This ugly style has a noticeable effect in manifest parsing

    14

hex = binascii.hexlify

    15

bin = binascii.unhexlify

    16

    17

def short(node):

    18

    return hex(node[:6])