Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 4525:78b6add1f966
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 08 Jun 2007 23:49:12 -0300 |
parents | fffc8a733bf9 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -m "commit #0" -d "1000000 0" echo This is file b22 > b hg commit -m"comment #1" -d "1000000 0" hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" # in theory, we shouldn't need the "-y" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" hg update -y 1 exit 0