annotate templates/changelogentry.tmpl @ 190:3dd5ce2fddb6

merge: short-circuit search for merge into empty repo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: short-circuit search for merge into empty repo We should have 3 cases for merge: - - we have no changesets - - we have less than half the changesets - - we have more than half the changesets For no changesets, we can immediately tell that we need everything. This happens when we initially branch from a remote repo, so we simply shortcircuit the search and grab everything from the root When we're actually tracking a project, we should generally have most of the changesets, so the current search algorithm should minimize searching. It should rarely occur that upstreams gets far ahead of us, in which case, we suffer a longer search. manifest hash: eabd55841b03225176ea72b985aad36431a438a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmfajywK+sNU5EO8RAuyKAKCf7Nw6XSK5HEzbrZae7Q06e3dk4wCgjbK6 YUTEfkpPP1h3mNHIHRKz+aI= =eGMq -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sun, 29 May 2005 09:06:43 -0800
parents 8da1df932c16
children f918a6fa2572
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
1 <div class="parity#parity#">
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
2 <table width="100%" cellpadding="0" cellspacing="0">
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
3 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
4 <td align="right" width="15%"><b>#age# ago:&nbsp;</b></td>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
5 <td><b>#shortdesc#</b></td</tr>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
6 <tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
7 <td align="right">changeset #rev#:&nbsp;</td>
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
8 <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
9 #parent1#
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
10 #parent2#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
11 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
12 <td align="right">author:&nbsp;</td>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
13 <td>#author#</td></tr>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
14 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
15 <td align="right">date:&nbsp;</td>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
16 <td>#date#</td></tr>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
17 <tr>
173
8da1df932c16 hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents: 167
diff changeset
18 <td align="right" valign="top"><a href="?cmd=manifest;manifest=#manifest#;path=/">files</a>:&nbsp;</td>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
19 <td>#files#</td></tr>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
20 </table>
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
21 </div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
22