##// END OF EJS Templates
hgweb: Make get_mtime use repository to find store path....
Brendan Cully -
r10078:97c75ad3 default
parent child Browse files
Show More
@@ -86,15 +86,12 b' def _statusmessage(code):'
86 def statusmessage(code, message=None):
86 def statusmessage(code, message=None):
87 return '%d %s' % (code, message or _statusmessage(code))
87 return '%d %s' % (code, message or _statusmessage(code))
88
88
89 def get_mtime(repo_path):
89 def get_mtime(spath):
90 store_path = os.path.join(repo_path, ".hg")
90 cl_path = os.path.join(spath, "00changelog.i")
91 if not os.path.isdir(os.path.join(store_path, "data")):
92 store_path = os.path.join(store_path, "store")
93 cl_path = os.path.join(store_path, "00changelog.i")
94 if os.path.exists(cl_path):
91 if os.path.exists(cl_path):
95 return os.stat(cl_path).st_mtime
92 return os.stat(cl_path).st_mtime
96 else:
93 else:
97 return os.stat(store_path).st_mtime
94 return os.stat(spath).st_mtime
98
95
99 def staticfile(directory, fname, req):
96 def staticfile(directory, fname, req):
100 """return a file inside directory with guessed Content-Type header
97 """return a file inside directory with guessed Content-Type header
@@ -57,7 +57,7 b' class hgweb(object):'
57 def refresh(self, request=None):
57 def refresh(self, request=None):
58 if request:
58 if request:
59 self.repo.ui.environ = request.env
59 self.repo.ui.environ = request.env
60 mtime = get_mtime(self.repo.root)
60 mtime = get_mtime(self.repo.spath)
61 if mtime != self.mtime:
61 if mtime != self.mtime:
62 self.mtime = mtime
62 self.mtime = mtime
63 self.repo = hg.repository(self.repo.ui, self.repo.root)
63 self.repo = hg.repository(self.repo.ui, self.repo.root)
@@ -235,7 +235,8 b' class hgwebdir(object):'
235
235
236 # update time with local timezone
236 # update time with local timezone
237 try:
237 try:
238 d = (get_mtime(path), util.makedate()[1])
238 r = hg.repository(self.ui, path)
239 d = (get_mtime(r.spath), util.makedate()[1])
239 except OSError:
240 except OSError:
240 continue
241 continue
241
242
@@ -41,3 +41,8 b' hg log'
41 hg update
41 hg update
42 cat b # should exist with one "b"
42 cat b # should exist with one "b"
43
43
44 echo % hg serve shared clone
45 hg serve -n test -p $HGPORT -d --pid-file=hg.pid
46 cat hg.pid >> $DAEMON_PIDS
47
48 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-file/'
@@ -43,3 +43,11 b' summary: init'
43
43
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
45 b
45 b
46 % hg serve shared clone
47 200 Script output follows
48
49
50 -rw-r--r-- 4 a
51 -rw-r--r-- 2 b
52
53
General Comments 0
You need to be logged in to leave comments. Login now