Show More
@@ -222,6 +222,12 b' class hgweb(object):' | |||||
222 | for s in siblings: |
|
222 | for s in siblings: | |
223 | yield dict(node=hex(s), rev=rev(s), **args) |
|
223 | yield dict(node=hex(s), rev=rev(s), **args) | |
224 |
|
224 | |||
|
225 | def renamelink(self, fl, node): | |||
|
226 | r = fl.renamed(node) | |||
|
227 | if r: | |||
|
228 | return [dict(file=r[0], node=hex(r[1]))] | |||
|
229 | return [] | |||
|
230 | ||||
225 | def showtag(self, t1, node=nullid, **args): |
|
231 | def showtag(self, t1, node=nullid, **args): | |
226 | for t in self.repo.nodetags(node): |
|
232 | for t in self.repo.nodetags(node): | |
227 | yield self.t(t1, tag=t, **args) |
|
233 | yield self.t(t1, tag=t, **args) | |
@@ -466,6 +472,7 b' class hgweb(object):' | |||||
466 | "node": hex(cn), |
|
472 | "node": hex(cn), | |
467 | "author": cs[1], |
|
473 | "author": cs[1], | |
468 | "date": cs[2], |
|
474 | "date": cs[2], | |
|
475 | "rename": self.renamelink(fl, n), | |||
469 | "parent": self.siblings(fl.parents(n), |
|
476 | "parent": self.siblings(fl.parents(n), | |
470 | fl.rev, file=f), |
|
477 | fl.rev, file=f), | |
471 | "child": self.siblings(fl.children(n), |
|
478 | "child": self.siblings(fl.children(n), | |
@@ -514,6 +521,7 b' class hgweb(object):' | |||||
514 | date=cs[2], |
|
521 | date=cs[2], | |
515 | parent=self.siblings(fl.parents(n), fl.rev, file=f), |
|
522 | parent=self.siblings(fl.parents(n), fl.rev, file=f), | |
516 | child=self.siblings(fl.children(n), fl.rev, file=f), |
|
523 | child=self.siblings(fl.children(n), fl.rev, file=f), | |
|
524 | rename=self.renamelink(fl, n), | |||
517 | permissions=self.repo.manifest.readflags(mfn)[f]) |
|
525 | permissions=self.repo.manifest.readflags(mfn)[f]) | |
518 |
|
526 | |||
519 | def fileannotate(self, f, node): |
|
527 | def fileannotate(self, f, node): | |
@@ -565,6 +573,7 b' class hgweb(object):' | |||||
565 | manifest=hex(mfn), |
|
573 | manifest=hex(mfn), | |
566 | author=cs[1], |
|
574 | author=cs[1], | |
567 | date=cs[2], |
|
575 | date=cs[2], | |
|
576 | rename=self.renamelink(fl, n), | |||
568 | parent=self.siblings(fl.parents(n), fl.rev, file=f), |
|
577 | parent=self.siblings(fl.parents(n), fl.rev, file=f), | |
569 | child=self.siblings(fl.children(n), fl.rev, file=f), |
|
578 | child=self.siblings(fl.children(n), fl.rev, file=f), | |
570 | permissions=self.repo.manifest.readflags(mfn)[f]) |
|
579 | permissions=self.repo.manifest.readflags(mfn)[f]) |
@@ -18,6 +18,7 b'' | |||||
18 | <tr> |
|
18 | <tr> | |
19 | <td class="metatag">changeset #rev#:</td> |
|
19 | <td class="metatag">changeset #rev#:</td> | |
20 | <td><a href="?cs=#node|short#">#node|short#</a></td></tr> |
|
20 | <td><a href="?cs=#node|short#">#node|short#</a></td></tr> | |
|
21 | #rename%filerename# | |||
21 | #parent%fileannotateparent# |
|
22 | #parent%fileannotateparent# | |
22 | #child%fileannotatechild# |
|
23 | #child%fileannotatechild# | |
23 | <tr> |
|
24 | <tr> |
@@ -8,6 +8,7 b'' | |||||
8 | <a href="?fd=#node|short#;file=#file|urlescape#">(diff)</a> |
|
8 | <a href="?fd=#node|short#;file=#file|urlescape#">(diff)</a> | |
9 | <a href="?fa=#filenode|short#;file=#file|urlescape#">(annotate)</a> |
|
9 | <a href="?fa=#filenode|short#;file=#file|urlescape#">(annotate)</a> | |
10 | </td></tr> |
|
10 | </td></tr> | |
|
11 | #rename%filelogrename# | |||
11 | <tr> |
|
12 | <tr> | |
12 | <td align="right">author: </td> |
|
13 | <td align="right">author: </td> | |
13 | <td>#author|obfuscate#</td></tr> |
|
14 | <td>#author|obfuscate#</td></tr> |
@@ -19,6 +19,7 b'' | |||||
19 | <tr> |
|
19 | <tr> | |
20 | <td class="metatag">changeset #rev#:</td> |
|
20 | <td class="metatag">changeset #rev#:</td> | |
21 | <td><a href="?cs=#node|short#">#node|short#</a></td></tr> |
|
21 | <td><a href="?cs=#node|short#">#node|short#</a></td></tr> | |
|
22 | #rename%filerename# | |||
22 | #parent%filerevparent# |
|
23 | #parent%filerevparent# | |
23 | #child%filerevchild# |
|
24 | #child%filerevchild# | |
24 | <tr> |
|
25 | <tr> |
@@ -27,6 +27,8 b' diffline = "#line|escape#"' | |||||
27 | changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cs=#node|short#">#node|short#</a></td></tr>" |
|
27 | changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cs=#node|short#">#node|short#</a></td></tr>" | |
28 | changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cs=#node|short#">#node|short#</a></td></tr>" |
|
28 | changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cs=#node|short#">#node|short#</a></td></tr>" | |
29 | filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?f=#node|short#;file=#file|urlescape#">#node|short#</a></td></tr>" |
|
29 | filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?f=#node|short#;file=#file|urlescape#">#node|short#</a></td></tr>" | |
|
30 | filerename = "<tr><td class="metatag">parent:</td><td><a href="?f=#node|short#;file=#file|urlescape#">#file|escape#@#node|short#</a></td></tr>" | |||
|
31 | filelogrename = "<tr><td align="right">base: </td><td><a href="?f=#node|short#;file=#file|urlescape#">#file|escape#@#node|short#</a></td></tr>" | |||
30 | fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?fa=#filenode|short#;file=#file|urlescape#">#node|short#</a></td></tr>" |
|
32 | fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?fa=#filenode|short#;file=#file|urlescape#">#node|short#</a></td></tr>" | |
31 | changesetchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cs=#node|short#">#node|short#</a></td></tr>" |
|
33 | changesetchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cs=#node|short#">#node|short#</a></td></tr>" | |
32 | changelogchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cs=#node|short#">#node|short#</a></td></tr>" |
|
34 | changelogchild = "<tr><th class="child">child #rev#:</th><td class="child"><a href="?cs=#node|short#">#node|short#</a></td></tr>" |
General Comments 0
You need to be logged in to leave comments.
Login now