Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/changelog.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 | 46c5e1ee8aaa |
rev | line source |
---|---|
142 | 1 #header# |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
173
diff
changeset
|
2 <title>#repo|escape#: changelog</title> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
3 <link rel="alternate" type="application/rss+xml" |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
4 href="#url#rss-log" title="RSS feed for #repo|escape#"> |
142 | 5 </head> |
138 | 6 <body> |
168 | 7 |
8 <div class="buttons"> | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
9 <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
10 <a href="#url#tags{sessionvars%urlparameter}">tags</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
11 <a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a> |
2170
29eeb2717915
Add archive download links to tip on main changeset list page
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
1425
diff
changeset
|
12 #archives%archiveentry# |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
13 <a type="application/rss+xml" href="#url#rss-log">rss</a> |
168 | 14 </div> |
15 | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
173
diff
changeset
|
16 <h2>changelog for #repo|escape#</h2> |
138 | 17 |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
18 <form action="#url#log"> |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
19 {sessionvars%hiddenformentry} |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
20 <p> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
21 <label for="search1">search:</label> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
22 <input name="rev" id="search1" type="text" size="30"> |
1425
8fe4116b3253
hgweb: improve look-n-feel of changelog nagivation
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
23 navigate: <small class="navigate">#changenav%naventry#</small> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
24 </p> |
165 | 25 </form> |
138 | 26 |
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
27 #entries%changelogentry# |
138 | 28 |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3205
diff
changeset
|
29 <form action="#url#log"> |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
30 {sessionvars%hiddenformentry} |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
31 <p> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
32 <label for="search2">search:</label> |
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
33 <input name="rev" id="search2" type="text" size="30"> |
1425
8fe4116b3253
hgweb: improve look-n-feel of changelog nagivation
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
34 navigate: <small class="navigate">#changenav%naventry#</small> |
584
9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.
mpm@selenic.com
parents:
201
diff
changeset
|
35 </p> |
165 | 36 </form> |
138 | 37 |
142 | 38 #footer# |