##// 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:

r22046:7a9cbb31 default
r22285:85bded43 default
Show More
test-hgwebdirsym.t
80 lines | 1.7 KiB | text/troff | Tads3Lexer
/ tests / test-hgwebdirsym.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve symlink
Matt Mackall
tests: unify test-hgwebdirsym
r12444
Matt Mackall
tests: replace exit 80 with #require
r22046 Tests whether or not hgwebdir properly handles various symlink topologies.
Mads Kiilerich
tests: add missing no-outer-repo requirements...
r17015
hide outer repo
$ hg init
Matt Mackall
tests: unify test-hgwebdirsym
r12444 $ hg init a
$ echo a > a/a
$ hg --cwd a ci -Ama -d'1 0'
adding a
$ mkdir webdir
$ cd webdir
$ hg init b
$ echo b > b/b
$ hg --cwd b ci -Amb -d'2 0'
adding b
$ hg init c
$ echo c > c/c
$ hg --cwd c ci -Amc -d'3 0'
adding c
$ ln -s ../a al
$ ln -s ../webdir circle
$ root=`pwd`
$ cd ..
$ cat > collections.conf <<EOF
> [collections]
> $root=$root
> EOF
$ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
> -A access-collections.log -E error-collections.log
$ cat hg.pid >> $DAEMON_PIDS
should succeed
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 200 Script output follows
/al/
/b/
/c/
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'al/file/tip/a?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 200 Script output follows
a
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'b/file/tip/b?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 200 Script output follows
b
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'c/file/tip/c?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 200 Script output follows
c
should fail
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/al/file/tip/a?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 404 Not Found
Wagner Bruna
hgwebdir: fix incorrect index generation for invalid paths (issue2023)...
r13066 error: repository circle/al/file/tip/a not found
Matt Mackall
tests: unify test-hgwebdirsym
r12444 [1]
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/b/file/tip/a?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 404 Not Found
Wagner Bruna
hgwebdir: fix incorrect index generation for invalid paths (issue2023)...
r13066 error: repository circle/b/file/tip/a not found
Matt Mackall
tests: unify test-hgwebdirsym
r12444 [1]
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'circle/c/file/tip/a?style=raw'
Matt Mackall
tests: unify test-hgwebdirsym
r12444 404 Not Found
Wagner Bruna
hgwebdir: fix incorrect index generation for invalid paths (issue2023)...
r13066 error: repository circle/c/file/tip/a not found
Matt Mackall
tests: unify test-hgwebdirsym
r12444 [1]
collections errors
$ cat error-collections.log