mercurial-scm/hg: mercurial/hgweb/common.py annotate

annotate mercurial/hgweb/common.py @ 5909:f45f7390c1c5

strip: calculate list of extra nodes to save and pass it to changegroupsubset When we remove revision N from the repository, all revisions >= N are affected: either it's a descendant from N and will also be removed, or it's not a descendant of N and will be renumbered. As a consequence, we have to (at least temporarily) remove all filelog and manifest revisions that have a linkrev >= N, readding some of them later. Unfortunately, it's possible to have a revlog with two revisions r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2). If we try to strip revision linkrev(r1) from the repository, we'll also lose revision r2 when we truncate this revlog. We already use changegroupsubset to create a temporary changegroup containing the revisions that have to be restored, but that function is unable to detect that we also wanted to save the r2 in the case above. So we manually calculate these extra nodes and pass it to changegroupsubset. This should fix issue764.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Sat, 19 Jan 2008 18:01:16 -0200
parents	e9f68860d5ed
children	c301f15c965a

rev	line source
2391 d351a3be3371 Fixing up comment headers for split up code. Eric Hopper <hopper@omnifarious.org> parents: 2356 diff changeset	1 # hgweb/common.py - Utility functions needed by hgweb_mod and hgwebdir_mod
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	2 #
238 3b92f8fe47ae hgweb.py: kill #! line, clean up copyright notice mpm@selenic.com parents: 222 diff changeset	3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2514 diff changeset	4 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	5 #
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	6 # This software may be used and distributed according to the terms
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	8
5561 22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	9 import errno, mimetypes, os
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	10
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	11 class ErrorResponse(Exception):
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	12 def __init__(self, code, message=None):
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	13 Exception.__init__(self)
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	14 self.code = code
5563 d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	15 if message:
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	16 self.message = message
5561 22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	17 else:
5563 d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	18 self.message = _statusmessage(code)
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	19
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	20 def _statusmessage(code):
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	21 from BaseHTTPServer import BaseHTTPRequestHandler
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	22 responses = BaseHTTPRequestHandler.responses
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	23 return responses.get(code, ('Error', 'Unknown error'))[0]
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5563 diff changeset	24
5563 d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	25 def statusmessage(code):
d61fea133f2d hgweb: fix breaking tests on Python < 2.5 Bryan O'Sullivan <bos@serpentine.com> parents: 5561 diff changeset	26 return '%d %s' % (code, _statusmessage(code))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	27
1418 68f81ba07b2a Make hgweb work when the repository is empty (no 00changelog.i) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1416 diff changeset	28 def get_mtime(repo_path):
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3276 diff changeset	29 store_path = os.path.join(repo_path, ".hg")
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3276 diff changeset	30 if not os.path.isdir(os.path.join(store_path, "data")):
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3276 diff changeset	31 store_path = os.path.join(store_path, "store")
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3276 diff changeset	32 cl_path = os.path.join(store_path, "00changelog.i")
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3276 diff changeset	33 if os.path.exists(cl_path):
1418 68f81ba07b2a Make hgweb work when the repository is empty (no 00changelog.i) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1416 diff changeset	34 return os.stat(cl_path).st_mtime
68f81ba07b2a Make hgweb work when the repository is empty (no 00changelog.i) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1416 diff changeset	35 else:
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3276 diff changeset	36 return os.stat(store_path).st_mtime
1418 68f81ba07b2a Make hgweb work when the repository is empty (no 00changelog.i) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1416 diff changeset	37
2514 419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2391 diff changeset	38 def staticfile(directory, fname, req):
1825 a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	39 """return a file inside directory with guessed content-type header
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	40
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	41 fname always uses '/' as directory separator and isn't allowed to
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	42 contain unusual path components.
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	43 Content-type is guessed using the mimetypes module.
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	44 Return an empty string if fname is illegal or file not found.
1793 83c6d8355909 Allow serving static files from hgwebdir to fix CSS and favicon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1792 diff changeset	45
1825 a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	46 """
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	47 parts = fname.split('/')
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	48 path = directory
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	49 for part in parts:
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	50 if (part in ('', os.curdir, os.pardir) or
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	51 os.sep in part or os.altsep is not None and os.altsep in part):
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	52 return ""
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	53 path = os.path.join(path, part)
1793 83c6d8355909 Allow serving static files from hgwebdir to fix CSS and favicon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1792 diff changeset	54 try:
1825 a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	55 os.stat(path)
a9343f9d7365 Make hgweb.staticfile() more secure and portable. Thomas Arendsen Hein <thomas@intevation.de> parents: 1796 diff changeset	56 ct = mimetypes.guess_type(path)[0] or "text/plain"
2514 419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2391 diff changeset	57 req.header([('Content-type', ct),
4038 5ae460b1f6f0 Don't use ints in HTTP headers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3877 diff changeset	58 ('Content-length', str(os.path.getsize(path)))])
3244 f045b049a704 Fix static file serving over HTTP on Windows. Wojciech Milkowski <wmilkowski@interia.pl> parents: 2859 diff changeset	59 return file(path, 'rb').read()
5561 22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	60 except TypeError:
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	61 raise ErrorResponse(500, 'illegal file name')
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	62 except OSError, err:
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	63 if err.errno == errno.ENOENT:
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	64 raise ErrorResponse(404)
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	65 else:
22713dce19f6 hgweb: return meaningful HTTP status codes instead of nonsense Bryan O'Sullivan <bos@serpentine.com> parents: 4462 diff changeset	66 raise ErrorResponse(500, err.strerror)
3276 db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	67
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	68 def style_map(templatepath, style):
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	69 """Return path to mapfile for a given style.
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	70
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	71 Searches mapfile in the following locations:
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	72 1. templatepath/style/map
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	73 2. templatepath/map-style
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	74 3. templatepath/map
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	75 """
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	76 locations = style and [os.path.join(style, "map"), "map-"+style] or []
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	77 locations.append("map")
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	78 for location in locations:
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	79 mapfile = os.path.join(templatepath, location)
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	80 if os.path.isfile(mapfile):
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	81 return mapfile
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	82 raise RuntimeError("No hgweb templates found in %r" % templatepath)
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3244 diff changeset	83
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	84 def paritygen(stripecount, offset=0):
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	85 """count parity of horizontal stripes for easier reading"""
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	86 if stripecount and offset:
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	87 # account for offset, e.g. due to building the list in reverse
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	88 count = (stripecount + offset) % stripecount
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	89 parity = (stripecount + offset) / stripecount & 1
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	90 else:
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	91 count = 0
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	92 parity = 0
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	93 while True:
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	94 yield parity
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	95 count += 1
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	96 if stripecount and count >= stripecount:
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	97 parity = 1 - parity
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	98 count = 0
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4038 diff changeset	99
5779 e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	100 def get_contact(config):
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	101 """Return repo contact information or empty string.
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	102
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	103 web.contact is the primary source, but if that is not set, try
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	104 ui.username or $EMAIL as a fallback to display something useful.
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	105 """
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	106 return (config("web", "contact") or
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	107 config("ui", "username") or
e9f68860d5ed Don't let ui.username override web.contact (issue900) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	108 os.environ.get("EMAIL") or "")

Mercurial > public > mercurial-scm > hg

annotate mercurial/hgweb/common.py @ 5909:f45f7390c1c5