# # # patch "TODO" # from [399f28ec8945b71e5922e2e5755a39ca76186185] # to [e0ea26c666b37c5f98ccf80cb933d021ee55c593] # # patch "branch.psp" # from [d31efaaf929acc45cccc088e8642179febabd73a] # to [0fd5280a8d954d769ac708db08743ce391fb934c] # # patch "index.psp" # from [78768b24dfae89ac533721230887e9c53dc5168a] # to [25435ec2cde9290caf895bbf929eda38db801c3d] # # patch "viewmtn.css" # from [13d04f2c9036d4728e4984348b663ee3b1420f37] # to [8d04b3fc352a860b0e3240dcb539c1193705398f] # ============================================================ --- TODO 399f28ec8945b71e5922e2e5755a39ca76186185 +++ TODO e0ea26c666b37c5f98ccf80cb933d021ee55c593 @@ -9,14 +9,11 @@ TODO: - * monotone automate stdio client - * Use monotone automate graph to do the ancestry graphing, and show some future information. Perhaps cache based on the mtime of the db viewmtn is looking at? Might be good enough. - * branch view - make sure to include RSS feeds of branches + * RSS feed for branch view * headofbranch; show certs in list of heads. ============================================================ --- branch.psp d31efaaf929acc45cccc088e8642179febabd73a +++ branch.psp 0fd5280a8d954d769ac708db08743ce391fb934c @@ -1,7 +1,8 @@ <% import datetime import config +import urllib import time from common import link @@ -30,7 +31,7 @@ offset = page * display branch = form['branch'] -info = {'title' : "Recent changes to branch %s" % (hq(branch))} +info = {'title' : "Changes to branch %s" % (hq(branch))} req.write(template.header(info)) heads = mt.heads(branch) @@ -38,7 +39,11 @@ recent = mt.toposort(mt.ancestors(heads) + heads) if display > len(recent): display = len(recent) -if offset > len(recent): offset = len(recent) - display +if offset > len(recent): + offset = len(recent) - display + no_next = True +else: + no_next = False start = -1*offset stop = start + display @@ -46,6 +51,14 @@ recent = recent[start:stop] recent.reverse() +%> + +

+This page lists changes <%= -1*(stop or 0) %> through <%= -1 * start %> to <%=link("branch", branch)%>. +It may also be useful to view the <%=link("headofbranch", branch, "current head revision")%> of this branch. +

+ +<% req.write('') for idx, id in enumerate(recent): certs = mt.certs(id) @@ -88,7 +101,17 @@ %> <% +c = [] +if page != 1: + c.append('Newer changes' % (urllib.quote(branch), page-1)) +if not no_next: + c.append('Older changes' % (urllib.quote(branch), page+1)) +req.write('

' + ' | '.join(c) + '

') +%> + +<% + req.write(template.footer(info)) %> ============================================================ --- index.psp 78768b24dfae89ac533721230887e9c53dc5168a +++ index.psp 25435ec2cde9290caf895bbf929eda38db801c3d @@ -22,18 +22,29 @@ else: %>

-There are <%=len(branches)%> branches in this Monotone database. -Select a branch to view its current head revision. If there are multiple -head revisions, you will be presented with a choice. The list of tagged revisions could be helpful if you are looking -for a particular revision.

+There are <%=len(branches)%> branches in this Monotone database. Each branch +might represent an individual project. If you are new to Monotone, the +Monotone tutorial +may help you understand these pages better. +

+

+Select a branch from the list below to view recent changes that have occured +within it. The list of tagged revisions could be +helpful if you are looking for a particular revision. If you wish to examine +information about the latest version of a branch (including the manifest +of files contained within) click on the revision link next to the branch. +A branch can have multiple heads, in which case you will be presented with +multiple links to choose from. +

+
- + <% branches.sort() for branch in branches: - req.write('' % (link("branch", branch, branch))) + heads = ' '.join(map(lambda x: link("revision", x), mt.heads(branch))) + req.write('' % (link("branch", branch, branch), heads)) %>
Branch
BranchHead revision(s)
%s
%s%s
============================================================ --- viewmtn.css 13d04f2c9036d4728e4984348b663ee3b1420f37 +++ viewmtn.css 8d04b3fc352a860b0e3240dcb539c1193705398f @@ -35,7 +35,6 @@ border-width: 1px; border-style: solid; border-color: black; - font-size: 80%; } TABLE.pretty TH {