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

% file replaced with directory

     2

adding a

     3

% should fail - would corrupt dirstate

     4

abort: file named 'a' already in dirstate

     5

% directory replaced with file

     6

adding a/a

     7

% should fail - would corrupt dirstate

     8

abort: directory named 'a' already in dirstate

     9

% directory replaced with file

    10

adding b/c/d

    11

% should fail - would corrupt dirstate

    12

abort: directory named 'b' already in dirstate