Show More
@@ -0,0 +1,37 b'' | |||||
|
1 | #require serve | |||
|
2 | ||||
|
3 | $ hg init server | |||
|
4 | $ cd server | |||
|
5 | $ cat >> .hg/hgrc << EOF | |||
|
6 | > [extensions] | |||
|
7 | > strip= | |||
|
8 | > EOF | |||
|
9 | ||||
|
10 | $ echo 1 > foo | |||
|
11 | $ hg commit -A -m 'first' | |||
|
12 | adding foo | |||
|
13 | $ echo 2 > bar | |||
|
14 | $ hg commit -A -m 'second' | |||
|
15 | adding bar | |||
|
16 | ||||
|
17 | Produce a bundle to use | |||
|
18 | ||||
|
19 | $ hg strip -r 1 | |||
|
20 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
21 | saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-backup.hg (glob) | |||
|
22 | ||||
|
23 | Serve from a bundle file | |||
|
24 | ||||
|
25 | $ hg serve -R .hg/strip-backup/ed602e697e0f-backup.hg -d -p $HGPORT --pid-file=hg.pid | |||
|
26 | $ cat hg.pid >> $DAEMON_PIDS | |||
|
27 | ||||
|
28 | Ensure we're serving from the bundle | |||
|
29 | ||||
|
30 | $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/?style=raw') | |||
|
31 | 200 Script output follows | |||
|
32 | ||||
|
33 | ||||
|
34 | -rw-r--r-- 2 bar | |||
|
35 | -rw-r--r-- 2 foo | |||
|
36 | ||||
|
37 |
@@ -110,7 +110,7 b' class hgweb(object):' | |||||
110 | # compare changelog size in addition to mtime to catch |
|
110 | # compare changelog size in addition to mtime to catch | |
111 | # rollbacks made less than a second ago |
|
111 | # rollbacks made less than a second ago | |
112 | if st.st_mtime != self.mtime or st.st_size != self.size: |
|
112 | if st.st_mtime != self.mtime or st.st_size != self.size: | |
113 |
r = hg.repository(self.repo.baseui, self.repo. |
|
113 | r = hg.repository(self.repo.baseui, self.repo.url()) | |
114 | self.repo = self._getview(r) |
|
114 | self.repo = self._getview(r) | |
115 | self.maxchanges = int(self.config("web", "maxchanges", 10)) |
|
115 | self.maxchanges = int(self.config("web", "maxchanges", 10)) | |
116 | self.stripecount = int(self.config("web", "stripes", 1)) |
|
116 | self.stripecount = int(self.config("web", "stripes", 1)) |
General Comments 0
You need to be logged in to leave comments.
Login now