# HG changeset patch # User Matt Mackall # Date 1128196256 25200 # Node ID b6d4ebebc35c1d7b473e876126173ae968c52cd5 # Parent d1d605d1e839e59717ae52b7931879ce9d82cb1a Allows abbreviated hashes in hgweb diff -r d1d605d1e839 -r b6d4ebebc35c mercurial/hgweb.py --- a/mercurial/hgweb.py Sat Oct 01 00:02:01 2005 -0700 +++ b/mercurial/hgweb.py Sat Oct 01 12:50:56 2005 -0700 @@ -386,8 +386,9 @@ entries=changelist) def changeset(self, nodeid): - n = bin(nodeid) cl = self.repo.changelog + n = self.repo.lookup(nodeid) + nodeid = hex(n) changes = cl.read(n) p1 = cl.parents(n)[0] @@ -422,6 +423,7 @@ def filelog(self, f, filenode): cl = self.repo.changelog fl = self.repo.file(f) + filenode = hex(fl.lookup(filenode)) count = fl.count() def entries(**map): @@ -454,7 +456,8 @@ def filerevision(self, f, node): fl = self.repo.file(f) - n = bin(node) + n = fl.lookup(node) + node = hex(n) text = fl.read(n) changerev = fl.linkrev(n) cl = self.repo.changelog @@ -486,7 +489,8 @@ bcache = {} ncache = {} fl = self.repo.file(f) - n = bin(node) + n = fl.lookup(node) + node = hex(n) changerev = fl.linkrev(n) cl = self.repo.changelog @@ -535,10 +539,13 @@ 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)) + man = self.repo.manifest + mn = man.lookup(mnode) + mnode = hex(mn) + mf = man.read(mn) + rev = man.rev(mn) node = self.repo.changelog.node(rev) - mff=self.repo.manifest.readflags(bin(mnode)) + mff = man.readflags(mn) files = {} @@ -617,8 +624,9 @@ entries=entries) def filediff(self, file, changeset): - n = bin(changeset) cl = self.repo.changelog + n = self.repo.lookup(changeset) + changeset = hex(n) p1 = cl.parents(n)[0] cs = cl.read(n) mf = self.repo.manifest.read(cs[0]) @@ -805,7 +813,7 @@ req.write(z.flush()) elif req.form['cmd'][0] == 'archive': - changeset = bin(req.form['node'][0]) + changeset = self.repo.lookup(req.form['node'][0]) type = req.form['type'][0] if (type in self.archives and self.repo.ui.configbool("web", "allow" + type, False)):