Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-walk.out @ 5210:90d9ec0dc69d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: forcefully mark files that we get from the second parent as dirty After a hg merge, we want to include in the commit all the files that we got from the second parent, so that we have the correct file-level history. To make them visible to hg commit, we try to mark them as dirty. Unfortunately, right now we can't really mark them as dirty[1] - the best we can do is to mark them as needing a full comparison of their contents, but they will still be considered clean if they happen to be identical to the version in the first parent. This changeset extends the dirstate format in a compatible way, so that we can mark a file as dirty: Right now we use a negative file size to indicate we don't have valid stat data for this entry. In practice, this size is always -1. This patch uses -2 to indicate that the entry is dirty. Older versions of hg won't choke on this dirstate, but they may happily mark the file as clean after a full comparison, destroying all of our hard work. The patch adds a dirstate.normallookup method with the semantics of the current normaldirty, and changes normaldirty to forcefully mark the entry as dirty. This should fix issue522. [1] - well, we could put them in state 'm', but that state has a different meaning.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 23 Aug 2007 01:48:29 -0300
parents 36abb07c79d4
children
line wrap: on
line source

adding beans/black
adding beans/borlotti
adding beans/kidney
adding beans/navy
adding beans/pinto
adding beans/turtle
adding fennel
adding fenugreek
adding fiddlehead
adding glob:glob
adding mammals/Procyonidae/cacomistle
adding mammals/Procyonidae/coatimundi
adding mammals/Procyonidae/raccoon
adding mammals/skunk
hg debugwalk 
f  beans/black                     beans/black
f  beans/borlotti                  beans/borlotti
f  beans/kidney                    beans/kidney
f  beans/navy                      beans/navy
f  beans/pinto                     beans/pinto
f  beans/turtle                    beans/turtle
f  fennel                          fennel
f  fenugreek                       fenugreek
f  fiddlehead                      fiddlehead
f  glob:glob                       glob:glob
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk

hg debugwalk -I.
f  beans/black                     beans/black
f  beans/borlotti                  beans/borlotti
f  beans/kidney                    beans/kidney
f  beans/navy                      beans/navy
f  beans/pinto                     beans/pinto
f  beans/turtle                    beans/turtle
f  fennel                          fennel
f  fenugreek                       fenugreek
f  fiddlehead                      fiddlehead
f  glob:glob                       glob:glob
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk

cd mammals

hg debugwalk 
f  beans/black                     ../beans/black
f  beans/borlotti                  ../beans/borlotti
f  beans/kidney                    ../beans/kidney
f  beans/navy                      ../beans/navy
f  beans/pinto                     ../beans/pinto
f  beans/turtle                    ../beans/turtle
f  fennel                          ../fennel
f  fenugreek                       ../fenugreek
f  fiddlehead                      ../fiddlehead
f  glob:glob                       ../glob:glob
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk

hg debugwalk -X ../beans
f  fennel                          ../fennel
f  fenugreek                       ../fenugreek
f  fiddlehead                      ../fiddlehead
f  glob:glob                       ../glob:glob
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk

hg debugwalk -I *k
f  mammals/skunk  skunk

hg debugwalk -I glob:*k
f  mammals/skunk  skunk

hg debugwalk -I relglob:*k
f  beans/black    ../beans/black
f  fenugreek      ../fenugreek
f  mammals/skunk  skunk

hg debugwalk -I relglob:*k .
f  mammals/skunk  skunk

hg debugwalk -I re:.*k$
f  beans/black    ../beans/black
f  fenugreek      ../fenugreek
f  mammals/skunk  skunk

hg debugwalk -I relre:.*k$
f  beans/black    ../beans/black
f  fenugreek      ../fenugreek
f  mammals/skunk  skunk

hg debugwalk -I path:beans
f  beans/black     ../beans/black
f  beans/borlotti  ../beans/borlotti
f  beans/kidney    ../beans/kidney
f  beans/navy      ../beans/navy
f  beans/pinto     ../beans/pinto
f  beans/turtle    ../beans/turtle

hg debugwalk -I relpath:../beans
f  beans/black     ../beans/black
f  beans/borlotti  ../beans/borlotti
f  beans/kidney    ../beans/kidney
f  beans/navy      ../beans/navy
f  beans/pinto     ../beans/pinto
f  beans/turtle    ../beans/turtle

hg debugwalk .
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk

hg debugwalk -I.
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk

hg debugwalk Procyonidae
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon

cd Procyonidae

hg debugwalk .
f  mammals/Procyonidae/cacomistle  cacomistle
f  mammals/Procyonidae/coatimundi  coatimundi
f  mammals/Procyonidae/raccoon     raccoon

hg debugwalk ..
f  mammals/Procyonidae/cacomistle  cacomistle
f  mammals/Procyonidae/coatimundi  coatimundi
f  mammals/Procyonidae/raccoon     raccoon
f  mammals/skunk                   ../skunk

cd ..

hg debugwalk ../beans
f  beans/black     ../beans/black
f  beans/borlotti  ../beans/borlotti
f  beans/kidney    ../beans/kidney
f  beans/navy      ../beans/navy
f  beans/pinto     ../beans/pinto
f  beans/turtle    ../beans/turtle

hg debugwalk .
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
f  mammals/skunk                   skunk

hg debugwalk .hg
.hg: No such file or directory

hg debugwalk ../.hg
abort: path contains illegal component: .hg

cd ..

hg debugwalk -Ibeans
f  beans/black     beans/black
f  beans/borlotti  beans/borlotti
f  beans/kidney    beans/kidney
f  beans/navy      beans/navy
f  beans/pinto     beans/pinto
f  beans/turtle    beans/turtle

hg debugwalk glob:mammals/../beans/b*
f  beans/black     beans/black
f  beans/borlotti  beans/borlotti

hg debugwalk -X*/Procyonidae mammals
f  mammals/skunk  mammals/skunk

hg debugwalk path:mammals
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk

hg debugwalk ..
abort: .. not under root

hg debugwalk beans/../..
abort: beans/../.. not under root

hg debugwalk .hg
abort: path contains illegal component: .hg

hg debugwalk beans/../.hg
abort: path contains illegal component: .hg

hg debugwalk beans/../.hg/data
abort: path contains illegal component: .hg/data

hg debugwalk beans/.hg
beans/.hg: No such file or directory

hg debugwalk glob:*
f  fennel      fennel
f  fenugreek   fenugreek
f  fiddlehead  fiddlehead
f  glob:glob   glob:glob

hg debugwalk glob:**e
f  beans/turtle                    beans/turtle
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle

hg debugwalk re:.*[kb]$
f  beans/black    beans/black
f  fenugreek      fenugreek
f  glob:glob      glob:glob
f  mammals/skunk  mammals/skunk

hg debugwalk path:beans/black
f  beans/black  beans/black  exact

hg debugwalk path:beans//black
f  beans/black  beans/black  exact

hg debugwalk relglob:Procyonidae

hg debugwalk relglob:Procyonidae/**
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon

hg debugwalk relglob:Procyonidae/** fennel
f  fennel                          fennel                          exact
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon

hg debugwalk beans glob:beans/*
f  beans/black     beans/black
f  beans/borlotti  beans/borlotti
f  beans/kidney    beans/kidney
f  beans/navy      beans/navy
f  beans/pinto     beans/pinto
f  beans/turtle    beans/turtle

hg debugwalk glob:mamm**
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk

hg debugwalk glob:mamm** fennel
f  fennel                          fennel                          exact
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
f  mammals/skunk                   mammals/skunk

hg debugwalk glob:j*

hg debugwalk NOEXIST
NOEXIST: No such file or directory

hg debugwalk fifo
fifo: unsupported file type (type is fifo)

hg debugwalk fenugreek
m  fenugreek  fenugreek  exact

hg debugwalk fenugreek
m  fenugreek  fenugreek  exact

hg debugwalk new
f  new  new  exact

cd ..

hg debugwalk -R t t/mammals/skunk
f  mammals/skunk  t/mammals/skunk  exact

cd t2

hg debugwalk -R ../t ../t/mammals/skunk
f  mammals/skunk  ../t/mammals/skunk  exact

hg debugwalk --cwd ../t mammals/skunk
f  mammals/skunk  mammals/skunk  exact