##// END OF EJS Templates
Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.

File last commit:

r10179:83cfa1ba stable
r10521:bde1bb25 stable
Show More
test-mv-cp-st-diff
95 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-mv-cp-st-diff
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 #!/bin/sh
add()
{
echo $2 >> $1
}
hg init t
cd t
# set up a boring main branch
add a a
hg add a
Matt Mackall
copies: skip directory rename checks when not merging...
r6425 mkdir x
add x/x x
hg add x/x
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 hg ci -m0
add a m1
hg ci -m1
add a m2
Matt Mackall
copies: skip directory rename checks when not merging...
r6425 add x/y y1
hg add x/y
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 hg ci -m2
Benoit Boissinot
update --clean: do not unlink added files (issue575)
r8518 cd ..
Matt Mackall
copies: add tests for status -C/diff --git...
r6278
show()
{
echo "- $2: $1"
hg st -C $1
echo
hg diff --git $1
echo
}
Alexis S. L. Carvalho
test-mv-cp-st-diff: avoid linkrev collisions...
r6282 count=0
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 # make a new branch and get diff/status output
# $1 - first commit
# $2 - second commit
# $3 - working dir action
# $4 - test description
tb()
{
Benoit Boissinot
update --clean: do not unlink added files (issue575)
r8518 hg clone t t2 ; cd t2
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 hg co -q -C 0
Alexis S. L. Carvalho
test-mv-cp-st-diff: avoid linkrev collisions...
r6282 add a $count
count=`expr $count + 1`
hg ci -m "t0"
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 $1
hg ci -m "t1"
$2
hg ci -m "t2"
$3
echo "** $4 **"
echo "** $1 / $2 / $3"
show "" "working to parent"
show "--rev 0" "working to root"
show "--rev 2" "working to branch"
show "--rev 0 --rev ." "root to parent"
show "--rev . --rev 0" "parent to root"
show "--rev 2 --rev ." "branch to parent"
show "--rev . --rev 2" "parent to branch"
echo
Benoit Boissinot
update --clean: do not unlink added files (issue575)
r8518 cd ..
rm -rf t2
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 }
Matt Mackall
copies: skip directory rename checks when not merging...
r6425
Matt Mackall
copies: add tests for status -C/diff --git...
r6278 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir"
tb "add a a1" "add a a2" "hg cp a b" "copy in working dir"
tb "hg mv a b" "add b b1" "add b w" "single rename"
tb "hg cp a b" "add b b1" "add a w" "single copy"
tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain"
tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain"
Alexis S. L. Carvalho
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...
r6286 tb "add a a1" "hg mv a b" "hg mv b a" "circular rename"
Matt Mackall
copies: skip directory rename checks when not merging...
r6425
tb "hg mv x y" "add y/x x1" "add y/x x2" "directory move"
Patrick Mezard
copies: don't report copies with unrelated branch
r10179
# Cannot implement unrelated branch with tb
echo '% testing copies with unrelated branch'
hg init unrelated
cd unrelated
add a a
hg ci -Am adda
hg mv a b
hg ci -m movea
hg up -C null
add a a
hg ci -Am addunrelateda
echo '% unrelated branch diff'
hg diff --git -r 2 -r 1
cd ..