##// END OF EJS Templates
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

File last commit:

r22046:7a9cbb31 default
r22287:f3ac9677 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