##// END OF EJS Templates
largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

File last commit:

r16912:6ef3107c default
r22285:85bded43 default
Show More
test-locate.t
121 lines | 1.5 KiB | text/troff | Tads3Lexer
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ hg init repo
$ cd repo
Adrian Buehlmann
tests: unify test-locate
r12206 $ echo 0 > a
$ echo 0 > b
$ echo 0 > t.h
$ mkdir t
$ echo 0 > t/x
$ echo 0 > t/b
$ echo 0 > t/e.h
$ mkdir dir.h
$ echo 0 > dir.h/foo
$ hg ci -A -m m
adding a
adding b
adding dir.h/foo
adding t.h
adding t/b
adding t/e.h
adding t/x
$ touch nottracked
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg locate a
Adrian Buehlmann
tests: unify test-locate
r12206 a
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg locate NONEXISTENT
[1]
Adrian Buehlmann
tests: unify test-locate
r12206
$ hg locate
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x
$ hg rm a
$ hg ci -m m
$ hg locate a
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate relpath:NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate
b
dir.h/foo
t.h
t/b
t/e.h
t/x
$ hg locate -r 0 a
a
$ hg locate -r 0 NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate -r 0 relpath:NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate -r 0
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x
-I/-X with relative path should work:
$ cd t
$ hg locate
b
dir.h/foo
t.h
t/b
t/e.h
t/x
$ hg locate -I ../t
t/b
t/e.h
t/x
Martin Geisler
tests: added a short description to issue numbers...
r12399 Issue294: hg remove --after dir fails when dir.* also exists
Adrian Buehlmann
tests: unify test-locate
r12206
$ cd ..
$ rm -r t
$ hg locate 't/**'
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 t/b (glob)
t/e.h (glob)
t/x (glob)
Adrian Buehlmann
tests: unify test-locate
r12206
$ mkdir otherdir
$ cd otherdir
$ hg locate b
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../b (glob)
../t/b (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate '*.h'
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../t.h (glob)
../t/e.h (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate path:t/x
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../t/x (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate 're:.*\.h$'
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../t.h (glob)
../t/e.h (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate -r 0 b
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../b (glob)
../t/b (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate -r 0 '*.h'
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../t.h (glob)
../t/e.h (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate -r 0 path:t/x
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../t/x (glob)
Adrian Buehlmann
tests: unify test-locate
r12206 $ hg locate -r 0 're:.*\.h$'
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 ../t.h (glob)
../t/e.h (glob)
Adrian Buehlmann
tests: unify test-locate
r12206
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ cd ../..