Mercurial > hg
view tests/test-hgwebdir.t @ 22196:23fe278bde43
largefiles: keep largefiles from colliding with normal one during linear merge
Before this patch, linear merging of modified or newly added largefile
causes unexpected result, if (1) largefile collides with same name
normal one in the target revision and (2) "local" largefile is chosen,
even though branch merging between such revisions doesn't.
Expected result of such linear merging is:
(1) (not yet recorded) largefile is kept in the working directory
(2) largefile is marked as (re-)"added"
(3) colliding normal file is marked as "removed"
But actual result is:
(1) largefile in the working directory is unlinked
(2) largefile is marked as "normal" (so treated as "missing")
(3) the dirstate entry for colliding normal file is just dropped
(1) is very serious, because there is no way to restore temporarily
modified largefiles.
(3) prevents the next commit from adding the manifest with correct
"removal of (normal) file" information for newly created changeset.
The root cause of this problem is putting "lfile" into "actions['r']"
in linear-merging case. At liner merging, "actions['r']" causes:
- unlinking "target file" in the working directory, but "lfile" as
"target file" is also largefile itself in this case
- dropping the dirstate entry for target file
"actions['f']" (= "forget") does only the latter, and this is reason
why this patch doesn't choose putting "lfile" into it instead of
"actions['r']".
This patch newly introduces action "lfmr" (LargeFiles: Mark as
Removed) to mark colliding normal file as "removed" without unlinking
it.
This patch uses "hg debugdirstate" instead of "hg status" in test,
because:
- choosing "local largefile" hides "removed" status of "remote
normal file" in "hg status" output, and
- "hg status" for "large2" in this case has another problem fixed in
the subsequent patch
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 15 Aug 2014 20:28:51 +0900 |
parents | 7a9cbb315d84 |
children | fdf7794be41d |
line wrap: on
line source
#require serve hide outer repo and work in dir without '.hg' $ hg init $ mkdir dir $ cd dir Tests some basic hgwebdir functionality. Tests setting up paths and collection, different forms of 404s and the subdirectory support. $ mkdir webdir $ cd webdir $ hg init a $ echo a > a/a $ hg --cwd a ci -Ama -d'1 0' adding a create a mercurial queue repository $ hg --cwd a qinit --config extensions.hgext.mq= -c $ hg init b $ echo b > b/b $ hg --cwd b ci -Amb -d'2 0' adding b create a nested repository $ cd b $ hg init d $ echo d > d/d $ hg --cwd d ci -Amd -d'3 0' adding d $ cd .. $ hg init c $ echo c > c/c $ hg --cwd c ci -Amc -d'3 0' adding c create a subdirectory containing repositories and subrepositories $ mkdir notrepo $ cd notrepo $ hg init e $ echo e > e/e $ hg --cwd e ci -Ame -d'4 0' adding e $ hg init e/e2 $ echo e2 > e/e2/e2 $ hg --cwd e/e2 ci -Ame2 -d '4 0' adding e2 $ hg init f $ echo f > f/f $ hg --cwd f ci -Amf -d'4 0' adding f $ hg init f/f2 $ echo f2 > f/f2/f2 $ hg --cwd f/f2 ci -Amf2 -d '4 0' adding f2 $ cd .. create repository without .hg/store $ hg init nostore $ rm -R nostore/.hg/store $ root=`pwd` $ cd .. serve $ cat > paths.conf <<EOF > [paths] > a=$root/a > b=$root/b > EOF $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-1.log $ cat hg.pid >> $DAEMON_PIDS should give a 404 - file does not exist $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/file/tip/bork?style=raw' 404 Not Found error: bork@8580ff50825a: not found in manifest [1] should succeed $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '?style=raw' 200 Script output follows /a/ /b/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/file/tip/a?style=raw' 200 Script output follows a $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'b/file/tip/b?style=raw' 200 Script output follows b should give a 404 - repo is not published $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'c/file/tip/c?style=raw' 404 Not Found error: repository c/file/tip/c not found [1] atom-log without basedir $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/atom-log' | grep '<link' <link rel="self" href="http://*:$HGPORT/a/atom-log"/> (glob) <link rel="alternate" href="http://*:$HGPORT/a/"/> (glob) <link href="http://*:$HGPORT/a/rev/8580ff50825a"/> (glob) rss-log without basedir $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'a/rss-log' | grep '<guid' <guid isPermaLink="true">http://*:$HGPORT/a/rev/8580ff50825a</guid> (glob) $ cat > paths.conf <<EOF > [paths] > t/a/=$root/a > b=$root/b > coll=$root/* > rcoll=$root/** > star=* > starstar=** > astar=webdir/a/* > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-2.log $ cat hg.pid >> $DAEMON_PIDS should succeed, slashy names $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' 200 Script output follows /t/a/ /b/ /coll/a/ /coll/a/.hg/patches/ /coll/b/ /coll/c/ /coll/notrepo/e/ /coll/notrepo/f/ /rcoll/a/ /rcoll/a/.hg/patches/ /rcoll/b/ /rcoll/b/d/ /rcoll/c/ /rcoll/notrepo/e/ /rcoll/notrepo/e/e2/ /rcoll/notrepo/f/ /rcoll/notrepo/f/f2/ /star/webdir/a/ /star/webdir/a/.hg/patches/ /star/webdir/b/ /star/webdir/c/ /star/webdir/notrepo/e/ /star/webdir/notrepo/f/ /starstar/webdir/a/ /starstar/webdir/a/.hg/patches/ /starstar/webdir/b/ /starstar/webdir/b/d/ /starstar/webdir/c/ /starstar/webdir/notrepo/e/ /starstar/webdir/notrepo/e/e2/ /starstar/webdir/notrepo/f/ /starstar/webdir/notrepo/f/f2/ /astar/ /astar/.hg/patches/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=paper' 200 Script output follows <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> <link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <script type="text/javascript" src="/static/mercurial.js"></script> <title>Mercurial repositories index</title> </head> <body> <div class="container"> <div class="menu"> <a href="http://mercurial.selenic.com/"> <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <table class="bigtable"> <tr> <th><a href="?sort=name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> <th><a href="?sort=lastchange">Last modified</a></th> <th> </th> <th> </th> </tr> <tbody class="stripes2"> <tr> <td><a href="/t/a/?style=paper">t/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/t/a/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/b/?style=paper">b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/b/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/coll/a/?style=paper">coll/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/coll/a/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/coll/a/.hg/patches/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/coll/b/?style=paper">coll/b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/coll/b/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/coll/c/?style=paper">coll/c</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/coll/c/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/coll/notrepo/e/?style=paper">coll/notrepo/e</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/coll/notrepo/e/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/coll/notrepo/f/?style=paper">coll/notrepo/f</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/coll/notrepo/f/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/a/?style=paper">rcoll/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/a/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/a/.hg/patches/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/b/?style=paper">rcoll/b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/b/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/b/d/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/c/?style=paper">rcoll/c</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/c/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/notrepo/e/?style=paper">rcoll/notrepo/e</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/notrepo/e/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/notrepo/e/e2/?style=paper">rcoll/notrepo/e/e2</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/notrepo/e/e2/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/notrepo/f/?style=paper">rcoll/notrepo/f</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/notrepo/f/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/rcoll/notrepo/f/f2/?style=paper">rcoll/notrepo/f/f2</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/rcoll/notrepo/f/f2/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/star/webdir/a/?style=paper">star/webdir/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/star/webdir/a/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/star/webdir/a/.hg/patches/?style=paper">star/webdir/a/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/star/webdir/a/.hg/patches/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/star/webdir/b/?style=paper">star/webdir/b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/star/webdir/b/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/star/webdir/c/?style=paper">star/webdir/c</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/star/webdir/c/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/star/webdir/notrepo/e/?style=paper">star/webdir/notrepo/e</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/star/webdir/notrepo/e/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/star/webdir/notrepo/f/?style=paper">star/webdir/notrepo/f</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/star/webdir/notrepo/f/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/a/?style=paper">starstar/webdir/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/a/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/a/.hg/patches/?style=paper">starstar/webdir/a/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/a/.hg/patches/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/b/?style=paper">starstar/webdir/b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/b/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/b/d/?style=paper">starstar/webdir/b/d</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/b/d/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/c/?style=paper">starstar/webdir/c</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/c/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/notrepo/e/?style=paper">starstar/webdir/notrepo/e</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/notrepo/e/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/notrepo/e/e2/?style=paper">starstar/webdir/notrepo/e/e2</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/notrepo/e/e2/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/notrepo/f/?style=paper">starstar/webdir/notrepo/f</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/notrepo/f/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/starstar/webdir/notrepo/f/f2/?style=paper">starstar/webdir/notrepo/f/f2</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/starstar/webdir/notrepo/f/f2/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/astar/?style=paper">astar</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/astar/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> <tr> <td><a href="/astar/.hg/patches/?style=paper">astar/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/astar/.hg/patches/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> </tbody> </table> </div> </div> <script type="text/javascript">process_dates()</script> </body> </html> $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't?style=raw' 200 Script output follows /t/a/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' 200 Script output follows /t/a/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=paper' 200 Script output follows <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> <link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <script type="text/javascript" src="/static/mercurial.js"></script> <title>Mercurial repositories index</title> </head> <body> <div class="container"> <div class="menu"> <a href="http://mercurial.selenic.com/"> <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> > <a href="/t">t</a> </h2> <table class="bigtable"> <tr> <th><a href="?sort=name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> <th><a href="?sort=lastchange">Last modified</a></th> <th> </th> <th> </th> </tr> <tbody class="stripes2"> <tr> <td><a href="/t/a/?style=paper">a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">*</td> (glob) <td class="indexlinks"></td> <td> <a href="/t/a/atom-log" title="subscribe to repository atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="subscribe to repository atom feed"> </a> </td> </tr> </tbody> </table> </div> </div> <script type="text/javascript">process_dates()</script> </body> </html> $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/a?style=atom' 200 Script output follows <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://www.w3.org/2005/Atom"> <!-- Changelog --> <id>http://*:$HGPORT1/t/a/</id> (glob) <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob) <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob) <title>t/a Changelog</title> <updated>1970-01-01T00:00:01+00:00</updated> <entry> <title>[default] a</title> <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob) <author> <name>test</name> <email>test</email> </author> <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> <table xmlns="http://www.w3.org/1999/xhtml"> <tr> <th style="text-align:left;">changeset</th> <td>8580ff50825a</td> </tr> <tr> <th style="text-align:left;">branch</th> <td>default</td> </tr> <tr> <th style="text-align:left;">bookmark</th> <td></td> </tr> <tr> <th style="text-align:left;">tag</th> <td>tip</td> </tr> <tr> <th style="text-align:left;">user</th> <td>test</td> </tr> <tr> <th style="text-align:left;vertical-align:top;">description</th> <td>a</td> </tr> <tr> <th style="text-align:left;vertical-align:top;">files</th> <td>a<br /></td> </tr> </table> </content> </entry> </feed> $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/a/?style=atom' 200 Script output follows <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://www.w3.org/2005/Atom"> <!-- Changelog --> <id>http://*:$HGPORT1/t/a/</id> (glob) <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob) <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob) <title>t/a Changelog</title> <updated>1970-01-01T00:00:01+00:00</updated> <entry> <title>[default] a</title> <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob) <author> <name>test</name> <email>test</email> </author> <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> <table xmlns="http://www.w3.org/1999/xhtml"> <tr> <th style="text-align:left;">changeset</th> <td>8580ff50825a</td> </tr> <tr> <th style="text-align:left;">branch</th> <td>default</td> </tr> <tr> <th style="text-align:left;">bookmark</th> <td></td> </tr> <tr> <th style="text-align:left;">tag</th> <td>tip</td> </tr> <tr> <th style="text-align:left;">user</th> <td>test</td> </tr> <tr> <th style="text-align:left;vertical-align:top;">description</th> <td>a</td> </tr> <tr> <th style="text-align:left;vertical-align:top;">files</th> <td>a<br /></td> </tr> </table> </content> </entry> </feed> $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/a/file/tip/a?style=raw' 200 Script output follows a Test [paths] '*' extension $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/?style=raw' 200 Script output follows /coll/a/ /coll/a/.hg/patches/ /coll/b/ /coll/c/ /coll/notrepo/e/ /coll/notrepo/f/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' 200 Script output follows a Test [paths] '**' extension $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/?style=raw' 200 Script output follows /rcoll/a/ /rcoll/a/.hg/patches/ /rcoll/b/ /rcoll/b/d/ /rcoll/c/ /rcoll/notrepo/e/ /rcoll/notrepo/e/e2/ /rcoll/notrepo/f/ /rcoll/notrepo/f/f2/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' 200 Script output follows d Test collapse = True $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ cat >> paths.conf <<EOF > [web] > collapse=true > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-3.log $ cat hg.pid >> $DAEMON_PIDS $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/?style=raw' 200 Script output follows /coll/a/ /coll/a/.hg/patches/ /coll/b/ /coll/c/ /coll/notrepo/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' 200 Script output follows a $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/?style=raw' 200 Script output follows /rcoll/a/ /rcoll/a/.hg/patches/ /rcoll/b/ /rcoll/b/d/ /rcoll/c/ /rcoll/notrepo/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' 200 Script output follows d Test intermediate directories $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/?style=raw' 200 Script output follows /rcoll/notrepo/e/ /rcoll/notrepo/e/e2/ /rcoll/notrepo/f/ /rcoll/notrepo/f/f2/ Test repositories inside intermediate directories $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/e/file/tip/e?style=raw' 200 Script output follows e Test subrepositories inside intermediate directories $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/f/f2/file/tip/f2?style=raw' 200 Script output follows f2 Test descend = False $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ cat >> paths.conf <<EOF > descend=false > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-4.log $ cat hg.pid >> $DAEMON_PIDS $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/?style=raw' 200 Script output follows /coll/a/ /coll/b/ /coll/c/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'coll/a/file/tip/a?style=raw' 200 Script output follows a $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/?style=raw' 200 Script output follows /rcoll/a/ /rcoll/b/ /rcoll/c/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/b/d/file/tip/d?style=raw' 200 Script output follows d Test intermediate directories $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/?style=raw' 200 Script output follows /rcoll/notrepo/e/ /rcoll/notrepo/f/ Test repositories inside intermediate directories $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/e/file/tip/e?style=raw' 200 Script output follows e Test subrepositories inside intermediate directories $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 'rcoll/notrepo/f/f2/file/tip/f2?style=raw' 200 Script output follows f2 Test [paths] '*' in a repo root $ hg id http://localhost:$HGPORT1/astar 8580ff50825a $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ cat > paths.conf <<EOF > [paths] > t/a = $root/a > t/b = $root/b > c = $root/c > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-5.log $ cat hg.pid >> $DAEMON_PIDS $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' 200 Script output follows /t/a/ /t/b/ /c/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' 200 Script output follows /t/a/ /t/b/ Test collapse = True $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ cat >> paths.conf <<EOF > [web] > collapse=true > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-6.log $ cat hg.pid >> $DAEMON_PIDS $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' 200 Script output follows /t/ /c/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' 200 Script output follows /t/a/ /t/b/ test descend = False $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ cat >> paths.conf <<EOF > descend=false > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-7.log $ cat hg.pid >> $DAEMON_PIDS $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '?style=raw' 200 Script output follows /c/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 't/?style=raw' 200 Script output follows /t/a/ /t/b/ $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ cat > paths.conf <<EOF > [paths] > nostore = $root/nostore > inexistent = $root/inexistent > EOF $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ > -A access-paths.log -E error-paths-8.log $ cat hg.pid >> $DAEMON_PIDS test inexistent and inaccessible repo should be ignored silently $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '' 200 Script output follows <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> <link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <script type="text/javascript" src="/static/mercurial.js"></script> <title>Mercurial repositories index</title> </head> <body> <div class="container"> <div class="menu"> <a href="http://mercurial.selenic.com/"> <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <table class="bigtable"> <tr> <th><a href="?sort=name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> <th><a href="?sort=lastchange">Last modified</a></th> <th> </th> <th> </th> </tr> <tbody class="stripes2"> </tbody> </table> </div> </div> <script type="text/javascript">process_dates()</script> </body> </html> $ cat > collections.conf <<EOF > [collections] > $root=$root > EOF $ hg serve --config web.baseurl=http://hg.example.com:8080/ -p $HGPORT2 -d \ > --pid-file=hg.pid --webdir-conf collections.conf \ > -A access-collections.log -E error-collections.log $ cat hg.pid >> $DAEMON_PIDS collections: should succeed $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '?style=raw' 200 Script output follows /a/ /a/.hg/patches/ /b/ /c/ /notrepo/e/ /notrepo/f/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/file/tip/a?style=raw' 200 Script output follows a $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'b/file/tip/b?style=raw' 200 Script output follows b $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'c/file/tip/c?style=raw' 200 Script output follows c atom-log with basedir / $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/atom-log' | grep '<link' <link rel="self" href="http://hg.example.com:8080/a/atom-log"/> <link rel="alternate" href="http://hg.example.com:8080/a/"/> <link href="http://hg.example.com:8080/a/rev/8580ff50825a"/> rss-log with basedir / $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/rss-log' | grep '<guid' <guid isPermaLink="true">http://hg.example.com:8080/a/rev/8580ff50825a</guid> $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS $ hg serve --config web.baseurl=http://hg.example.com:8080/foo/ -p $HGPORT2 -d \ > --pid-file=hg.pid --webdir-conf collections.conf \ > -A access-collections-2.log -E error-collections-2.log $ cat hg.pid >> $DAEMON_PIDS atom-log with basedir /foo/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/atom-log' | grep '<link' <link rel="self" href="http://hg.example.com:8080/foo/a/atom-log"/> <link rel="alternate" href="http://hg.example.com:8080/foo/a/"/> <link href="http://hg.example.com:8080/foo/a/rev/8580ff50825a"/> rss-log with basedir /foo/ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/rss-log' | grep '<guid' <guid isPermaLink="true">http://hg.example.com:8080/foo/a/rev/8580ff50825a</guid> paths errors 1 $ cat error-paths-1.log paths errors 2 $ cat error-paths-2.log paths errors 3 $ cat error-paths-3.log paths errors 4 $ cat error-paths-4.log paths errors 5 $ cat error-paths-5.log paths errors 6 $ cat error-paths-6.log paths errors 7 $ cat error-paths-7.log paths errors 8 $ cat error-paths-8.log collections errors $ cat error-collections.log collections errors 2 $ cat error-collections-2.log