Add dirstate.pathto and localrepo.pathto. Every time util.pathto is called, we have to pass the repo root and the repo cwd. dirstate.pathto is a simple convenience function that knows about the root and the cwd arguments. It's still possible to pass the cwd as an optimization. localrepo.pathto is a convenience function that just calls dirstate.pathto, just like localrepo.getcwd. dirstate.pathto becomes a single point that converts most (all?) paths from the internal representation to some OS-specific relative path for display purposes.

     1

#!/bin/sh

     2

#

     3

# Corrupt an hg repo with two pulls.

     4

#

     5

     6

# create one repo with a long history

     7

hg init source1

     8

cd source1

     9

touch foo

    10

hg add foo

    11

for i in 1 2 3 4 5 6 7 8 9 10; do

    12

    echo $i >> foo

    13

    hg ci -m $i

    14

done

    15

cd ..

    16

    17

# create a third repo to pull both other repos into it

    18

hg init version2

    19

hg -R version2 pull source1 &

    20

sleep 1

    21

    22

hg clone --pull -U version2 corrupted

    23

wait

    24

hg -R corrupted verify

    25

hg -R version2 verify