Mercurial > hg > pyhgsh
annotate mercurial/hgweb.py @ 198:c88ef31fb5c0
hgweb: fix tip so that it doesn't need refreshing
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb: fix tip so that it doesn't need refreshing
manifest hash: 5bf1837a29c5612872ab206053f9d15e899e3664
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCm1mhywK+sNU5EO8RAjdQAKCLrRFv2/rfHYNI2tFvF5HKINaTjQCfRhxo
ca39aZ0SaNeCBqc1nMPOTcw=
=4pHG
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Mon, 30 May 2005 10:21:21 -0800 |
| parents | b388603984fc |
| children | f918a6fa2572 |
| rev | line source |
|---|---|
| 131 | 1 #!/usr/bin/env python |
| 2 # | |
| 132 | 3 # hgweb.py - 0.2 - 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
| 131 | 4 # - web interface to a mercurial repository |
| 5 # | |
| 6 # This software may be used and distributed according to the terms | |
| 7 # of the GNU General Public License, incorporated herein by reference. | |
| 8 | |
| 9 # useful for debugging | |
| 10 import cgitb | |
| 11 cgitb.enable() | |
| 12 | |
| 13 import os, cgi, time, re, difflib, sys, zlib | |
| 138 | 14 from mercurial.hg import * |
| 15 | |
|
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
16 def templatepath(): |
|
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
17 for f in "templates/map", "../templates/map": |
|
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
18 p = os.path.join(os.path.dirname(__file__), f) |
|
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
19 if os.path.isfile(p): return p |
|
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
20 |
| 138 | 21 def age(t): |
| 22 def plural(t, c): | |
| 23 if c == 1: return t | |
| 24 return t + "s" | |
| 25 def fmt(t, c): | |
| 26 return "%d %s" % (c, plural(t, c)) | |
| 27 | |
| 28 now = time.time() | |
| 29 delta = max(1, int(now - t)) | |
| 30 | |
| 31 scales = [["second", 1], | |
| 32 ["minute", 60], | |
| 33 ["hour", 3600], | |
| 34 ["day", 3600 * 24], | |
| 35 ["week", 3600 * 24 * 7], | |
| 36 ["month", 3600 * 24 * 30], | |
| 37 ["year", 3600 * 24 * 365]] | |
| 38 | |
| 39 scales.reverse() | |
| 40 | |
| 41 for t, s in scales: | |
| 42 n = delta / s | |
| 195 | 43 if n >= 2 or s == 1: return fmt(t, n) |
| 131 | 44 |
| 45 def nl2br(text): | |
| 138 | 46 return text.replace('\n', '<br/>') |
| 131 | 47 |
| 48 def obfuscate(text): | |
| 138 | 49 return ''.join([ '&#%d' % ord(c) for c in text ]) |
| 50 | |
| 51 def up(p): | |
| 52 if p[0] != "/": p = "/" + p | |
| 53 if p[-1] == "/": p = p[:-1] | |
| 54 up = os.path.dirname(p) | |
| 55 if up == "/": | |
| 56 return "/" | |
| 57 return up + "/" | |
| 131 | 58 |
| 59 def httphdr(type): | |
| 60 print 'Content-type: %s\n' % type | |
| 61 | |
| 135 | 62 def write(*things): |
| 63 for thing in things: | |
| 64 if hasattr(thing, "__iter__"): | |
| 65 for part in thing: | |
| 66 write(part) | |
| 67 else: | |
| 68 sys.stdout.write(str(thing)) | |
| 69 | |
| 138 | 70 def template(tmpl, **map): |
| 71 while tmpl: | |
| 72 m = re.search(r"#([a-zA-Z0-9]+)#", tmpl) | |
| 73 if m: | |
| 74 yield tmpl[:m.start(0)] | |
| 75 v = map.get(m.group(1), "") | |
| 76 yield callable(v) and v() or v | |
| 77 tmpl = tmpl[m.end(0):] | |
| 78 else: | |
| 79 yield tmpl | |
| 80 return | |
| 81 | |
| 82 class templater: | |
| 83 def __init__(self, mapfile): | |
| 84 self.cache = {} | |
| 85 self.map = {} | |
| 86 self.base = os.path.dirname(mapfile) | |
| 87 | |
| 88 for l in file(mapfile): | |
| 89 m = re.match(r'(\S+)\s*=\s*"(.*)"$', l) | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
90 if m: |
| 138 | 91 self.cache[m.group(1)] = m.group(2) |
| 92 else: | |
| 93 m = re.match(r'(\S+)\s*=\s*(\S+)', l) | |
| 94 if m: | |
| 95 self.map[m.group(1)] = os.path.join(self.base, m.group(2)) | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
96 else: |
| 138 | 97 raise "unknown map entry '%s'" % l |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
98 |
| 138 | 99 def __call__(self, t, **map): |
| 100 try: | |
| 101 tmpl = self.cache[t] | |
| 102 except KeyError: | |
| 103 tmpl = self.cache[t] = file(self.map[t]).read() | |
| 104 return template(tmpl, **map) | |
| 105 | |
| 106 class hgweb: | |
| 107 maxchanges = 20 | |
| 108 maxfiles = 10 | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
109 |
|
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
110 def __init__(self, path, name, templatemap = ""): |
|
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
111 templatemap = templatemap or templatepath() |
|
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
112 |
| 138 | 113 self.reponame = name |
| 114 self.repo = repository(ui(), path) | |
| 115 self.t = templater(templatemap) | |
| 197 | 116 self.viewonly = 0 |
| 131 | 117 |
| 138 | 118 def date(self, cs): |
| 119 return time.asctime(time.gmtime(float(cs[2].split(' ')[0]))) | |
| 120 | |
| 121 def listfiles(self, files, mf): | |
| 122 for f in files[:self.maxfiles]: | |
| 123 yield self.t("filenodelink", node = hex(mf[f]), file = f) | |
| 124 if len(files) > self.maxfiles: | |
| 125 yield self.t("fileellipses") | |
| 126 | |
| 127 def listfilediffs(self, files, changeset): | |
| 128 for f in files[:self.maxfiles]: | |
| 129 yield self.t("filedifflink", node = hex(changeset), file = f) | |
| 130 if len(files) > self.maxfiles: | |
| 131 yield self.t("fileellipses") | |
| 132 | |
| 156 | 133 def parent(self, t1, node=nullid, rev=-1, **args): |
| 142 | 134 if node != hex(nullid): |
| 156 | 135 yield self.t(t1, node = node, rev = rev, **args) |
| 142 | 136 |
| 138 | 137 def diff(self, node1, node2, files): |
| 138 def filterfiles(list, files): | |
| 139 l = [ x for x in list if x in files ] | |
| 140 | |
| 141 for f in files: | |
| 142 if f[-1] != os.sep: f += os.sep | |
| 143 l += [ x for x in list if x.startswith(f) ] | |
| 144 return l | |
| 131 | 145 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
146 parity = [0] |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
147 def diffblock(diff, f, fn): |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
148 yield self.t("diffblock", |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
149 lines = prettyprintlines(diff), |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
150 parity = parity[0], |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
151 file = f, |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
152 filenode = hex(fn)) |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
153 parity[0] = 1 - parity[0] |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
154 |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
155 def prettyprintlines(diff): |
| 138 | 156 for l in diff.splitlines(1): |
| 157 line = cgi.escape(l) | |
| 158 if line.startswith('+'): | |
| 159 yield self.t("difflineplus", line = line) | |
| 160 elif line.startswith('-'): | |
| 161 yield self.t("difflineminus", line = line) | |
| 162 elif line.startswith('@'): | |
| 163 yield self.t("difflineat", line = line) | |
| 164 else: | |
| 165 yield self.t("diffline", line = line) | |
| 131 | 166 |
| 138 | 167 r = self.repo |
| 168 cl = r.changelog | |
| 169 mf = r.manifest | |
| 170 change1 = cl.read(node1) | |
| 171 change2 = cl.read(node2) | |
| 172 mmap1 = mf.read(change1[0]) | |
| 173 mmap2 = mf.read(change2[0]) | |
| 174 date1 = self.date(change1) | |
| 175 date2 = self.date(change2) | |
| 131 | 176 |
| 138 | 177 c, a, d = r.diffrevs(node1, node2) |
| 178 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d)) | |
| 131 | 179 |
| 138 | 180 for f in c: |
| 181 to = r.file(f).read(mmap1[f]) | |
| 182 tn = r.file(f).read(mmap2[f]) | |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
183 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
| 138 | 184 for f in a: |
| 185 to = "" | |
| 186 tn = r.file(f).read(mmap2[f]) | |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
187 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
| 138 | 188 for f in d: |
| 189 to = r.file(f).read(mmap1[f]) | |
| 190 tn = "" | |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
191 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
| 131 | 192 |
| 142 | 193 def header(self): |
| 194 yield self.t("header", repo = self.reponame) | |
| 195 | |
| 196 def footer(self): | |
| 197 yield self.t("footer", repo = self.reponame) | |
| 198 | |
| 180 | 199 def changelog(self, pos): |
| 138 | 200 def changenav(): |
| 201 def seq(factor = 1): | |
| 202 yield 1 * factor | |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
203 yield 3 * factor |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
204 #yield 5 * factor |
| 138 | 205 for f in seq(factor * 10): |
| 206 yield f | |
| 131 | 207 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
208 l = [] |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
209 for f in seq(): |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
210 if f < self.maxchanges / 2: continue |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
211 if f > count: break |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
212 r = "%d" % f |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
213 if pos + f < count - (f/2): l.append(("+" + r, pos + f)) |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
214 if pos - f >= 0 + (f/2): l.insert(0, ("-" + r, pos - f)) |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
215 |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
216 yield self.t("naventry", rev = 0, label="(0)") |
| 138 | 217 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
218 for label, rev in l: |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
219 yield self.t("naventry", label = label, rev = rev) |
|
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
220 |
|
198
c88ef31fb5c0
hgweb: fix tip so that it doesn't need refreshing
mpm@selenic.com
parents:
197
diff
changeset
|
221 yield self.t("naventry", label="tip") |
| 131 | 222 |
| 138 | 223 def changelist(): |
| 142 | 224 parity = (start - end) & 1 |
| 138 | 225 cl = self.repo.changelog |
| 226 l = [] # build a list in forward order for efficiency | |
| 227 for i in range(start, end + 1): | |
| 228 n = cl.node(i) | |
| 229 changes = cl.read(n) | |
| 230 hn = hex(n) | |
| 231 p1, p2 = cl.parents(n) | |
| 232 t = float(changes[2].split(' ')[0]) | |
| 131 | 233 |
| 138 | 234 l.insert(0, self.t( |
| 235 'changelogentry', | |
| 142 | 236 parity = parity, |
| 138 | 237 author = obfuscate(changes[1]), |
| 238 shortdesc = cgi.escape(changes[4].splitlines()[0]), | |
| 239 age = age(t), | |
| 142 | 240 parent1 = self.parent("changelogparent", |
| 241 hex(p1), cl.rev(p1)), | |
| 242 parent2 = self.parent("changelogparent", | |
| 243 hex(p2), cl.rev(p2)), | |
| 138 | 244 p1 = hex(p1), p2 = hex(p2), |
| 245 p1rev = cl.rev(p1), p2rev = cl.rev(p2), | |
| 246 manifest = hex(changes[0]), | |
| 247 desc = nl2br(cgi.escape(changes[4])), | |
| 248 date = time.asctime(time.gmtime(t)), | |
| 249 files = self.listfilediffs(changes[3], n), | |
| 250 rev = i, | |
| 251 node = hn)) | |
| 142 | 252 parity = 1 - parity |
| 138 | 253 |
| 254 yield l | |
| 131 | 255 |
| 168 | 256 cl = self.repo.changelog |
| 257 mf = cl.read(cl.tip())[0] | |
| 258 count = cl.count() | |
| 138 | 259 end = min(pos, count - 1) |
| 260 start = max(0, pos - self.maxchanges) | |
| 261 end = min(count - 1, start + self.maxchanges) | |
| 262 | |
| 142 | 263 yield self.t('changelog', |
| 264 header = self.header(), | |
| 265 footer = self.footer(), | |
| 266 repo = self.reponame, | |
| 267 changenav = changenav, | |
| 168 | 268 manifest = hex(mf), |
| 142 | 269 rev = pos, changesets = count, entries = changelist) |
| 131 | 270 |
| 138 | 271 def changeset(self, nodeid): |
| 272 n = bin(nodeid) | |
| 273 cl = self.repo.changelog | |
| 274 changes = cl.read(n) | |
| 275 p1, p2 = cl.parents(n) | |
| 276 p1rev, p2rev = cl.rev(p1), cl.rev(p2) | |
| 277 t = float(changes[2].split(' ')[0]) | |
| 278 | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
279 files = [] |
| 138 | 280 mf = self.repo.manifest.read(changes[0]) |
| 131 | 281 for f in changes[3]: |
| 138 | 282 files.append(self.t("filenodelink", |
| 283 filenode = hex(mf[f]), file = f)) | |
| 284 | |
| 285 def diff(): | |
| 286 yield self.diff(p1, n, changes[3]) | |
| 131 | 287 |
| 138 | 288 yield self.t('changeset', |
| 142 | 289 header = self.header(), |
| 290 footer = self.footer(), | |
| 291 repo = self.reponame, | |
| 138 | 292 diff = diff, |
| 293 rev = cl.rev(n), | |
| 294 node = nodeid, | |
| 295 shortdesc = cgi.escape(changes[4].splitlines()[0]), | |
| 142 | 296 parent1 = self.parent("changesetparent", |
| 297 hex(p1), cl.rev(p1)), | |
| 298 parent2 = self.parent("changesetparent", | |
| 299 hex(p2), cl.rev(p2)), | |
| 138 | 300 p1 = hex(p1), p2 = hex(p2), |
| 301 p1rev = cl.rev(p1), p2rev = cl.rev(p2), | |
| 302 manifest = hex(changes[0]), | |
| 303 author = obfuscate(changes[1]), | |
| 304 desc = nl2br(cgi.escape(changes[4])), | |
| 305 date = time.asctime(time.gmtime(t)), | |
| 306 files = files) | |
| 131 | 307 |
| 138 | 308 def filelog(self, f, filenode): |
| 309 cl = self.repo.changelog | |
| 310 fl = self.repo.file(f) | |
| 311 count = fl.count() | |
| 312 | |
| 313 def entries(): | |
| 314 l = [] | |
| 142 | 315 parity = (count - 1) & 1 |
| 316 | |
| 138 | 317 for i in range(count): |
| 318 | |
| 319 n = fl.node(i) | |
| 320 lr = fl.linkrev(n) | |
| 321 cn = cl.node(lr) | |
| 322 cs = cl.read(cl.node(lr)) | |
| 323 p1, p2 = fl.parents(n) | |
| 324 t = float(cs[2].split(' ')[0]) | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
325 |
| 138 | 326 l.insert(0, self.t("filelogentry", |
| 142 | 327 parity = parity, |
| 138 | 328 filenode = hex(n), |
| 329 filerev = i, | |
| 330 file = f, | |
| 331 node = hex(cn), | |
| 332 author = obfuscate(cs[1]), | |
| 333 age = age(t), | |
| 334 date = time.asctime(time.gmtime(t)), | |
| 335 shortdesc = cgi.escape(cs[4].splitlines()[0]), | |
| 336 p1 = hex(p1), p2 = hex(p2), | |
| 337 p1rev = fl.rev(p1), p2rev = fl.rev(p2))) | |
| 142 | 338 parity = 1 - parity |
| 138 | 339 |
| 340 yield l | |
| 341 | |
| 342 yield self.t("filelog", | |
| 142 | 343 header = self.header(), |
| 344 footer = self.footer(), | |
| 345 repo = self.reponame, | |
| 138 | 346 file = f, |
| 347 filenode = filenode, | |
| 348 entries = entries) | |
| 131 | 349 |
| 138 | 350 def filerevision(self, f, node): |
| 351 fl = self.repo.file(f) | |
| 352 n = bin(node) | |
| 353 text = cgi.escape(fl.read(n)) | |
| 354 changerev = fl.linkrev(n) | |
| 355 cl = self.repo.changelog | |
| 356 cn = cl.node(changerev) | |
| 357 cs = cl.read(cn) | |
| 358 p1, p2 = fl.parents(n) | |
| 359 t = float(cs[2].split(' ')[0]) | |
| 360 mfn = cs[0] | |
| 142 | 361 |
| 362 def lines(): | |
| 363 for l, t in enumerate(text.splitlines(1)): | |
| 364 yield self.t("fileline", | |
| 365 line = t, | |
| 366 linenumber = "% 6d" % (l + 1), | |
| 367 parity = l & 1) | |
| 138 | 368 |
| 369 yield self.t("filerevision", file = f, | |
| 142 | 370 header = self.header(), |
| 371 footer = self.footer(), | |
| 372 repo = self.reponame, | |
| 138 | 373 filenode = node, |
| 374 path = up(f), | |
| 142 | 375 text = lines(), |
| 138 | 376 rev = changerev, |
| 377 node = hex(cn), | |
| 378 manifest = hex(mfn), | |
| 379 author = obfuscate(cs[1]), | |
| 380 age = age(t), | |
| 381 date = time.asctime(time.gmtime(t)), | |
| 382 shortdesc = cgi.escape(cs[4].splitlines()[0]), | |
| 142 | 383 parent1 = self.parent("filerevparent", |
| 156 | 384 hex(p1), fl.rev(p1), file=f), |
| 142 | 385 parent2 = self.parent("filerevparent", |
| 156 | 386 hex(p2), fl.rev(p2), file=f), |
| 138 | 387 p1 = hex(p1), p2 = hex(p2), |
| 388 p1rev = fl.rev(p1), p2rev = fl.rev(p2)) | |
| 389 | |
| 131 | 390 |
| 138 | 391 def fileannotate(self, f, node): |
| 392 bcache = {} | |
| 393 ncache = {} | |
| 394 fl = self.repo.file(f) | |
| 395 n = bin(node) | |
| 396 changerev = fl.linkrev(n) | |
| 397 | |
| 398 cl = self.repo.changelog | |
| 399 cn = cl.node(changerev) | |
| 400 cs = cl.read(cn) | |
| 401 p1, p2 = fl.parents(n) | |
| 402 t = float(cs[2].split(' ')[0]) | |
| 403 mfn = cs[0] | |
| 131 | 404 |
| 138 | 405 def annotate(): |
| 142 | 406 parity = 1 |
| 407 last = None | |
| 138 | 408 for r, l in fl.annotate(n): |
| 409 try: | |
| 410 cnode = ncache[r] | |
| 411 except KeyError: | |
| 412 cnode = ncache[r] = self.repo.changelog.node(r) | |
| 413 | |
| 414 try: | |
| 415 name = bcache[r] | |
| 416 except KeyError: | |
| 417 cl = self.repo.changelog.read(cnode) | |
| 418 name = cl[1] | |
| 419 f = name.find('@') | |
| 420 if f >= 0: | |
| 421 name = name[:f] | |
| 422 bcache[r] = name | |
| 131 | 423 |
| 142 | 424 if last != cnode: |
| 425 parity = 1 - parity | |
| 426 last = cnode | |
| 427 | |
| 138 | 428 yield self.t("annotateline", |
| 142 | 429 parity = parity, |
| 138 | 430 node = hex(cnode), |
| 431 rev = r, | |
| 432 author = name, | |
| 433 file = f, | |
| 434 line = cgi.escape(l)) | |
| 435 | |
| 436 yield self.t("fileannotate", | |
| 142 | 437 header = self.header(), |
| 438 footer = self.footer(), | |
| 439 repo = self.reponame, | |
| 138 | 440 file = f, |
| 441 filenode = node, | |
| 442 annotate = annotate, | |
| 443 path = up(f), | |
| 444 rev = changerev, | |
| 445 node = hex(cn), | |
| 446 manifest = hex(mfn), | |
| 447 author = obfuscate(cs[1]), | |
| 448 age = age(t), | |
| 449 date = time.asctime(time.gmtime(t)), | |
| 450 shortdesc = cgi.escape(cs[4].splitlines()[0]), | |
| 156 | 451 parent1 = self.parent("fileannotateparent", |
| 452 hex(p1), fl.rev(p1), file=f), | |
| 453 parent2 = self.parent("fileannotateparent", | |
| 454 hex(p2), fl.rev(p2), file=f), | |
| 138 | 455 p1 = hex(p1), p2 = hex(p2), |
| 456 p1rev = fl.rev(p1), p2rev = fl.rev(p2)) | |
| 136 | 457 |
| 138 | 458 def manifest(self, mnode, path): |
| 459 mf = self.repo.manifest.read(bin(mnode)) | |
| 460 rev = self.repo.manifest.rev(bin(mnode)) | |
| 461 node = self.repo.changelog.node(rev) | |
| 462 | |
| 463 files = {} | |
| 142 | 464 |
| 138 | 465 p = path[1:] |
| 466 l = len(p) | |
| 131 | 467 |
| 138 | 468 for f,n in mf.items(): |
| 469 if f[:l] != p: | |
| 470 continue | |
| 471 remain = f[l:] | |
| 472 if "/" in remain: | |
| 473 short = remain[:remain.find("/") + 1] # bleah | |
| 142 | 474 files[short] = (f, None) |
| 138 | 475 else: |
| 476 short = os.path.basename(remain) | |
| 477 files[short] = (f, n) | |
| 131 | 478 |
| 138 | 479 def filelist(): |
| 142 | 480 parity = 0 |
| 138 | 481 fl = files.keys() |
| 482 fl.sort() | |
| 483 for f in fl: | |
| 484 full, fnode = files[f] | |
| 142 | 485 if fnode: |
| 486 yield self.t("manifestfileentry", | |
| 487 file = full, | |
| 488 manifest = mnode, | |
| 489 filenode = hex(fnode), | |
| 490 parity = parity, | |
| 491 basename = f) | |
| 492 else: | |
| 493 yield self.t("manifestdirentry", | |
| 494 parity = parity, | |
| 495 path = os.path.join(path, f), | |
| 496 manifest = mnode, basename = f[:-1]) | |
| 497 parity = 1 - parity | |
| 138 | 498 |
| 499 yield self.t("manifest", | |
| 142 | 500 header = self.header(), |
| 501 footer = self.footer(), | |
| 502 repo = self.reponame, | |
| 138 | 503 manifest = mnode, |
| 504 rev = rev, | |
| 505 node = hex(node), | |
| 506 path = path, | |
| 507 up = up(path), | |
| 142 | 508 entries = filelist) |
| 131 | 509 |
| 168 | 510 def tags(self): |
| 511 cl = self.repo.changelog | |
| 512 mf = cl.read(cl.tip())[0] | |
| 513 | |
| 514 self.repo.lookup(0) # prime the cache | |
| 515 i = self.repo.tags.items() | |
| 183 | 516 n = [ (cl.rev(e[1]), e) for e in i ] # sort by revision |
| 517 n.sort() | |
| 518 n.reverse() | |
| 519 i = [ e[1] for e in n ] | |
| 168 | 520 |
| 521 def entries(): | |
| 522 parity = 0 | |
| 523 for k,n in i: | |
| 524 yield self.t("tagentry", | |
| 525 parity = parity, | |
| 526 tag = k, | |
| 527 node = hex(n)) | |
| 528 parity = 1 - parity | |
| 529 | |
| 530 yield self.t("tags", | |
| 531 header = self.header(), | |
| 532 footer = self.footer(), | |
| 533 repo = self.reponame, | |
| 534 manifest = hex(mf), | |
| 535 entries = entries) | |
| 536 | |
| 138 | 537 def filediff(self, file, changeset): |
| 538 n = bin(changeset) | |
| 539 cl = self.repo.changelog | |
| 540 p1 = cl.parents(n)[0] | |
| 541 cs = cl.read(n) | |
| 542 mf = self.repo.manifest.read(cs[0]) | |
| 543 | |
| 544 def diff(): | |
| 545 yield self.diff(p1, n, file) | |
| 131 | 546 |
| 138 | 547 yield self.t("filediff", |
| 142 | 548 header = self.header(), |
| 549 footer = self.footer(), | |
| 550 repo = self.reponame, | |
| 138 | 551 file = file, |
| 552 filenode = hex(mf[file]), | |
| 553 node = changeset, | |
| 554 rev = self.repo.changelog.rev(n), | |
| 555 p1 = hex(p1), | |
| 556 p1rev = self.repo.changelog.rev(p1), | |
| 557 diff = diff) | |
| 558 | |
| 559 # add tags to things | |
| 560 # tags -> list of changesets corresponding to tags | |
| 561 # find tag, changeset, file | |
| 131 | 562 |
| 132 | 563 def run(self): |
| 564 args = cgi.parse() | |
| 565 | |
| 138 | 566 if not args.has_key('cmd') or args['cmd'][0] == 'changelog': |
| 567 hi = self.repo.changelog.count() | |
|
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
568 if args.has_key('rev'): |
| 165 | 569 hi = args['rev'][0] |
|
166
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
570 try: |
|
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
571 hi = self.repo.changelog.rev(self.repo.lookup(hi)) |
|
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
572 except KeyError: |
|
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
573 hi = self.repo.changelog.count() |
| 131 | 574 |
| 138 | 575 write(self.changelog(hi)) |
| 132 | 576 |
| 138 | 577 elif args['cmd'][0] == 'changeset': |
| 578 write(self.changeset(args['node'][0])) | |
| 579 | |
| 580 elif args['cmd'][0] == 'manifest': | |
| 581 write(self.manifest(args['manifest'][0], args['path'][0])) | |
| 582 | |
| 168 | 583 elif args['cmd'][0] == 'tags': |
| 584 write(self.tags()) | |
| 585 | |
| 138 | 586 elif args['cmd'][0] == 'filediff': |
| 587 write(self.filediff(args['file'][0], args['node'][0])) | |
| 131 | 588 |
| 132 | 589 elif args['cmd'][0] == 'file': |
| 138 | 590 write(self.filerevision(args['file'][0], args['filenode'][0])) |
| 131 | 591 |
| 138 | 592 elif args['cmd'][0] == 'annotate': |
| 593 write(self.fileannotate(args['file'][0], args['filenode'][0])) | |
| 131 | 594 |
| 138 | 595 elif args['cmd'][0] == 'filelog': |
| 596 write(self.filelog(args['file'][0], args['filenode'][0])) | |
| 136 | 597 |
| 132 | 598 elif args['cmd'][0] == 'branches': |
| 599 httphdr("text/plain") | |
| 600 nodes = [] | |
| 601 if args.has_key('nodes'): | |
| 138 | 602 nodes = map(bin, args['nodes'][0].split(" ")) |
| 603 for b in self.repo.branches(nodes): | |
| 604 sys.stdout.write(" ".join(map(hex, b)) + "\n") | |
| 131 | 605 |
| 132 | 606 elif args['cmd'][0] == 'between': |
| 607 httphdr("text/plain") | |
| 608 nodes = [] | |
| 609 if args.has_key('pairs'): | |
| 138 | 610 pairs = [ map(bin, p.split("-")) |
| 132 | 611 for p in args['pairs'][0].split(" ") ] |
| 138 | 612 for b in self.repo.between(pairs): |
| 613 sys.stdout.write(" ".join(map(hex, b)) + "\n") | |
| 132 | 614 |
| 615 elif args['cmd'][0] == 'changegroup': | |
| 616 httphdr("application/hg-changegroup") | |
| 617 nodes = [] | |
| 197 | 618 if self.viewonly: |
| 619 return | |
| 620 | |
| 132 | 621 if args.has_key('roots'): |
| 138 | 622 nodes = map(bin, args['roots'][0].split(" ")) |
| 131 | 623 |
| 132 | 624 z = zlib.compressobj() |
| 138 | 625 for chunk in self.repo.changegroup(nodes): |
| 132 | 626 sys.stdout.write(z.compress(chunk)) |
| 627 | |
| 628 sys.stdout.write(z.flush()) | |
| 131 | 629 |
| 132 | 630 else: |
| 138 | 631 write(self.t("error")) |
| 131 | 632 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
633 def server(path, name, templates, address, port): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
634 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
635 import BaseHTTPServer |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
636 import sys, os |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
637 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
638 class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
639 def do_POST(self): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
640 self.do_hgweb() |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
641 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
642 def do_GET(self): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
643 self.do_hgweb() |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
644 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
645 def do_hgweb(self): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
646 query = "" |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
647 p = self.path.find("?") |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
648 if p: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
649 query = self.path[p + 1:] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
650 query = query.replace('+', ' ') |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
651 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
652 env = {} |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
653 env['GATEWAY_INTERFACE'] = 'CGI/1.1' |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
654 env['REQUEST_METHOD'] = self.command |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
655 if query: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
656 env['QUERY_STRING'] = query |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
657 host = self.address_string() |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
658 if host != self.client_address[0]: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
659 env['REMOTE_HOST'] = host |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
660 env['REMOTE_ADDR'] = self.client_address[0] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
661 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
662 if self.headers.typeheader is None: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
663 env['CONTENT_TYPE'] = self.headers.type |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
664 else: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
665 env['CONTENT_TYPE'] = self.headers.typeheader |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
666 length = self.headers.getheader('content-length') |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
667 if length: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
668 env['CONTENT_LENGTH'] = length |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
669 accept = [] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
670 for line in self.headers.getallmatchingheaders('accept'): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
671 if line[:1] in "\t\n\r ": |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
672 accept.append(line.strip()) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
673 else: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
674 accept = accept + line[7:].split(',') |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
675 env['HTTP_ACCEPT'] = ','.join(accept) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
676 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
677 os.environ.update(env) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
678 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
679 save = sys.argv, sys.stdin, sys.stdout, sys.stderr |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
680 try: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
681 sys.stdin = self.rfile |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
682 sys.stdout = self.wfile |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
683 sys.argv = ["hgweb.py"] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
684 if '=' not in query: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
685 sys.argv.append(query) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
686 self.send_response(200, "Script output follows") |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
687 hg.run() |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
688 finally: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
689 sys.argv, sys.stdin, sys.stdout, sys.stderr = save |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
690 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
691 hg = hgweb(path, name, templates) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
692 httpd = BaseHTTPServer.HTTPServer((address, port), hgwebhandler) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
693 httpd.serve_forever() |