annotate templates/changelogentry.tmpl @ 5192:33015dac5df5

convert: fix mercurial_sink.putcommit Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a revision that touches no files, but this can break regular conversions from some repositories: - conceptually, since we're converting a repo, we should try to make the new hg repo as similar as possible to the original repo - we should create a new changeset, even if the original revision didn't touch any files (maybe the commit message had some important bit); - even if a "regular" revision that doesn't touch any file may seem weird (and maybe even broken), it's completely legitimate for a merge revision to not touch any file, and, if we just skip it, the converted repo will end up with wrong history and possibly an extra head. As an example, say the crew and main hg repos are sync'ed. Somebody sends an important patch to the mailing list. Matt quickly applies and pushes it. But at the same time somebody also applies it to crew and pushes it. Suppose the commit message ended up being a bit different (say, there was a typo and somebody didn't fix it) or that the date ended up being different (because of different patch-applying scripts): the changeset hashes will be different, but the manifests will be the same. Since both changesets were pushed to public repos, it's hard to recall them. If both are merged, the manifest from the resulting merge revision will have the exact same contents as its parents - i.e. the merge revision really doesn't touch any file at all. To keep the file filtering stuff "working", the generic code was changed to skip empty revisions if we're filtering the repo, fixing a bug in the process (we want parents[0] instead of tip).
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 20:18:05 -0300
parents ce8f31e0b3b8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2132
4990b62fd0a6 hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1606
diff changeset
1 <table class="logEntry parity#parity#">
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
2 <tr>
2132
4990b62fd0a6 hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1606
diff changeset
3 <th class="age">#date|age# ago:</th>
1445
56281e086f38 hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents: 1416
diff changeset
4 <th class="firstline">#desc|strip|firstline|escape#</th>
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
5 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
6 <tr>
2132
4990b62fd0a6 hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1606
diff changeset
7 <th class="revision">changeset #rev#:</th>
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
8 <td class="node"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
9 </tr>
1416
19d2776f1725 hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1410
diff changeset
10 #parent%changelogparent#
1606
ba625c8083d8 - duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents: 1445
diff changeset
11 #child%changelogchild#
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
12 #changelogtag#
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
13 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
14 <th class="author">author:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
15 <td class="author">#author|obfuscate#</td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
16 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
17 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
18 <th class="date">date:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
19 <td class="date">#date|date#</td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
20 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
21 <tr>
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
22 <th class="files"><a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a>:</th>
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
23 <td class="files">#files#</td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset
24 </tr>
1334
0843e1bf2b97 hgweb: fixed IE display problem on changelog page
TK Soh <teekaysoh@yahoo.com>
parents: 585
diff changeset
25 </table>