mercurial-scm/hg: comparison mercurial/hgweb.py

equal deleted inserted replaced

-:6d5a62a549fa
+:58eefdfb8472
 from mercurial.ui import *
 def templatepath():
 for f in "templates", "../templates":
 p = os.path.join(os.path.dirname(__file__), f)
-if os.path.isdir(p): return p
+if os.path.isdir(p):
+return p
 def age(t):
 def plural(t, c):
-if c == 1: return t
+if c == 1:
+return t
 return t + "s"
 def fmt(t, c):
 return "%d %s" % (c, plural(t, c))
 now = time.time()
 scales.reverse()
 for t, s in scales:
 n = delta / s
-if n >= 2 or s == 1: return fmt(t, n)
+if n >= 2 or s == 1:
+return fmt(t, n)
 def nl2br(text):
 return text.replace('\n', '<br/>\n')
 def obfuscate(text):
-return ''.join([ '&#%d;' % ord(c) for c in text ])
+return ''.join(['&#%d;' % ord(c) for c in text])
 def up(p):
-if p[0] != "/": p = "/" + p
+if p[0] != "/":
-if p[-1] == "/": p = p[:-1]
+p = "/" + p
+if p[-1] == "/":
+p = p[:-1]
 up = os.path.dirname(p)
 if up == "/":
 return "/"
 return up + "/"
 yield self.t("filedifflink", node=hex(changeset), file=f)
 if len(files) > self.maxfiles:
 yield self.t("fileellipses")
 def parents(self, t1, nodes=[], rev=None,**args):
-if not rev: rev = lambda x: ""
+if not rev:
+rev = lambda x: ""
 for node in nodes:
 if node != nullid:
 yield self.t(t1, node=hex(node), rev=rev(node), **args)
 def showtag(self, t1, node=nullid, **args):
 for t in self.repo.nodetags(node):
 yield self.t(t1, tag=t, **args)
 def diff(self, node1, node2, files):
 def filterfiles(list, files):
-l = [ x for x in list if x in files ]
+l = [x for x in list if x in files]
 for f in files:
-if f[-1] != os.sep: f += os.sep
+if f[-1] != os.sep:
-l += [ x for x in list if x.startswith(f) ]
+f += os.sep
+l += [x for x in list if x.startswith(f)]
 return l
 parity = [0]
 def diffblock(diff, f, fn):
 yield self.t("diffblock",
-lines = prettyprintlines(diff),
+lines=prettyprintlines(diff),
-parity = parity[0],
+parity=parity[0],
-file = f,
+file=f,
-filenode = hex(fn or nullid))
+filenode=hex(fn or nullid))
 parity[0] = 1 - parity[0]
 def prettyprintlines(diff):
 for l in diff.splitlines(1):
 if l.startswith('+'):
 for f in seq(factor * 10):
 yield f
 l = []
 for f in seq():
-if f < self.maxchanges / 2: continue
+if f < self.maxchanges / 2:
-if f > count: break
+continue
+if f > count:
+break
 r = "%d" % f
-if pos + f < count: l.append(("+" + r, pos + f))
+if pos + f < count:
-if pos - f >= 0: l.insert(0, ("-" + r, pos - f))
+l.append(("+" + r, pos + f))
+if pos - f >= 0:
+l.insert(0, ("-" + r, pos - f))
 yield {"rev": 0, "label": "(0)"}
 for label, rev in l:
 yield {"label": label, "rev": rev}
 n = cl.node(i)
 changes = cl.read(n)
 hn = hex(n)
 t = float(changes[2].split(' ')[0])
-l.insert(0, {
+l.insert(0, {"parity": parity,
-"parity": parity,
+"author": changes[1],
-"author": changes[1],
+"parent": self.parents("changelogparent",
-"parent": self.parents("changelogparent",
+cl.parents(n), cl.rev),
-cl.parents(n), cl.rev),
+"changelogtag": self.showtag("changelogtag",n),
-"changelogtag": self.showtag("changelogtag",n),
+"manifest": hex(changes[0]),
-"manifest": hex(changes[0]),
+"desc": changes[4],
-"desc": changes[4],
+"date": t,
-"date": t,
+"files": self.listfilediffs(changes[3], n),
-"files": self.listfilediffs(changes[3], n),
+"rev": i,
-"rev": i,
+"node": hn})
-"node": hn})
 parity = 1 - parity
-for e in l: yield e
+for e in l:
+yield e
 cl = self.repo.changelog
 mf = cl.read(cl.tip())[0]
 count = cl.count()
 start = max(0, pos - self.maxchanges + 1)
 if not (q in changes[1].lower() or
 q in changes[4].lower() or
 q in " ".join(changes[3][:20]).lower()):
 miss = 1
 break
-if miss: continue
+if miss:
+continue
 count += 1
 hn = hex(n)
 t = float(changes[2].split(' ')[0])
-yield self.t(
+yield self.t('searchentry',
-'searchentry',
+parity=count & 1,
-parity=count & 1,
+author=changes[1],
-author=changes[1],
+parent=self.parents("changelogparent",
-parent=self.parents("changelogparent",
+cl.parents(n), cl.rev),
-cl.parents(n), cl.rev),
+changelogtag=self.showtag("changelogtag",n),
-changelogtag=self.showtag("changelogtag",n),
+manifest=hex(changes[0]),
-manifest=hex(changes[0]),
+desc=changes[4],
-desc=changes[4],
+date=t,
-date=t,
+files=self.listfilediffs(changes[3], n),
-files=self.listfilediffs(changes[3], n),
+rev=i,
-rev=i,
+node=hn)
-node=hn)
+if count >= self.maxchanges:
-if count >= self.maxchanges: break
+break
 cl = self.repo.changelog
 mf = cl.read(cl.tip())[0]
 yield self.t('search',
 files = []
 mf = self.repo.manifest.read(changes[0])
 for f in changes[3]:
 files.append(self.t("filenodelink",
-filenode = hex(mf.get(f, nullid)), file=f))
+filenode=hex(mf.get(f, nullid)), file=f))
 def diff(**map):
 yield self.diff(p1, n, None)
 yield self.t('changeset',
 diff=diff,
 rev=cl.rev(n),
 node=nodeid,
 parent=self.parents("changesetparent",
 cl.parents(n), cl.rev),
 changesettag=self.showtag("changesettag",n),
 manifest=hex(changes[0]),
 author=changes[1],
 desc=changes[4],
 date=t,
 def entries(**map):
 l = []
 parity = (count - 1) & 1
 for i in range(count):
 n = fl.node(i)
 lr = fl.linkrev(n)
 cn = cl.node(lr)
 cs = cl.read(cl.node(lr))
 t = float(cs[2].split(' ')[0])
 "file": f,
 "node": hex(cn),
 "author": cs[1],
 "date": t,
 "parent": self.parents("filelogparent",
-fl.parents(n), fl.rev, file=f),
+fl.parents(n),
+fl.rev, file=f),
 "desc": cs[4]})
 parity = 1 - parity
-for e in l: yield e
+for e in l:
+yield e
-yield self.t("filelog",
-file=f,
+yield self.t("filelog", file=f, filenode=filenode, entries=entries)
-filenode=filenode,
-entries=entries)
 def filerevision(self, f, node):
 fl = self.repo.file(f)
 n = bin(node)
 text = fl.read(n)
 for l, t in enumerate(text.splitlines(1)):
 yield {"line": t,
 "linenumber": "% 6d" % (l + 1),
 "parity": l & 1}
-yield self.t("filerevision", file=f,
+yield self.t("filerevision",
+file=f,
 filenode=node,
 path=up(f),
 text=lines(),
 rev=changerev,
 node=hex(cn),
 manifest=hex(mfn),
 author=cs[1],
 date=t,
 parent=self.parents("filerevparent",
 fl.parents(n), fl.rev, file=f),
 permissions=self.repo.manifest.readflags(mfn)[f])
 def fileannotate(self, f, node):
 bcache = {}
 ncache = {}
 "author": name,
 "file": f,
 "line": l}
 yield self.t("fileannotate",
-file = f,
+file=f,
-filenode = node,
+filenode=node,
-annotate = annotate,
+annotate=annotate,
-path = up(f),
+path=up(f),
-rev = changerev,
+rev=changerev,
-node = hex(cn),
+node=hex(cn),
-manifest = hex(mfn),
+manifest=hex(mfn),
-author = cs[1],
+author=cs[1],
-date = t,
+date=t,
-parent = self.parents("fileannotateparent",
+parent=self.parents("fileannotateparent",
 fl.parents(n), fl.rev, file=f),
-permissions = self.repo.manifest.readflags(mfn)[f])
+permissions=self.repo.manifest.readflags(mfn)[f])
 def manifest(self, mnode, path):
 mf = self.repo.manifest.read(bin(mnode))
 rev = self.repo.manifest.rev(bin(mnode))
 node = self.repo.changelog.node(rev)
 file=file,
 filenode=hex(mf.get(file, nullid)),
 node=changeset,
 rev=self.repo.changelog.rev(n),
 parent=self.parents("filediffparent",
 cl.parents(n), cl.rev),
 diff=diff)
 # add tags to things
 # tags -> list of changesets corresponding to tags
 # find tag, changeset, file
 if args.has_key('style'):
 style = args['style'][0]
 if style:
 b = os.path.basename("map-" + style)
 p = os.path.join(t, b)
-if os.path.isfile(p): m = p
+if os.path.isfile(p):
+m = p
 port = os.environ["SERVER_PORT"]
 port = port != "80" and (":" + port) or ""
 uri = os.environ["REQUEST_URI"]
-if "?" in uri: uri = uri.split("?")[0]
+if "?" in uri:
+uri = uri.split("?")[0]
 url = "http://%s%s%s" % (os.environ["SERVER_NAME"], port, uri)
 self.t = templater(m, common_filters,
 {"url": url,
 "repo": self.reponame,
 "header": header,
 "footer": footer,
 })
 if not args.has_key('cmd'):
 args['cmd'] = [self.t.cache['default'],]
 if args['cmd'][0] == 'changelog':
 elif args['cmd'][0] == 'between':
 httphdr("application/mercurial-0.1")
 nodes = []
 if args.has_key('pairs'):
-pairs = [ map(bin, p.split("-"))
+pairs = [map(bin, p.split("-"))
-for p in args['pairs'][0].split(" ") ]
+for p in args['pairs'][0].split(" ")]
 for b in self.repo.between(pairs):
 sys.stdout.write(" ".join(map(hex, b)) + "\n")
 elif args['cmd'][0] == 'changegroup':
 httphdr("application/mercurial-0.1")
 z = zlib.compressobj()
 f = self.repo.changegroup(nodes)
 while 1:
 chunk = f.read(4096)
-if not chunk: break
+if not chunk:
+break
 sys.stdout.write(z.compress(chunk))
 sys.stdout.write(z.flush())
 else:
 def do_POST(self):
 try:
 self.do_hgweb()
 except socket.error, inst:
-if inst.args[0] != 32: raise
+if inst.args[0] != 32:
+raise
 def do_GET(self):
 self.do_POST()
 def do_hgweb(self):

changeset 1063	58eefdfb8472
parent 1062	6d5a62a549fa
child 1073	7b35a980b982