Teach walk code about absolute paths. The first consequence of this is that absolute and relative paths now all work in the same way. The second is that paths that lie outside the repository now cause an error to be reported, instead of something arbitrary and expensive being done. Internally, all of the serious work is in the util package. The new canonpath function takes an arbitrary path and either returns a canonical path or raises an error. Because it needs to know where the repository root is, it must be fed a repository or dirstate object, which has given commands.matchpats and friends a new parameter to pass along. The util.matcher function uses this to canonicalise globs and relative path names. Meanwhile, I've moved the Abort exception from commands to util, and killed off the redundant util.CommandError exception.

     1

+ hg init

     2

+ hg add a

     3

+ hg commit -m ancestor -d 0 0

     4

+ hg commit -m branch1 -d 0 0

     5

+ hg co 0

     6

+ hg commit -m branch2 -d 0 0

     7

+ hg up -m 1

     8

merge: warning: conflicts during merge

     9

merging a

    10

merging a failed!

    11

+ hg id

    12

32e80765d7fe+75234512624c+ tip

    13

something else

    14

=======

    15

something

    16

+ hg status

    17

M a