Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/filelog.tmpl @ 5210:90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 23 Aug 2007 01:48:29 -0300 |
parents | 717b96751431 |
children | 46c5e1ee8aaa |
rev | line source |
---|---|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
1 #header# |
1668
586b50294ea8
[hgweb] Added rename information to gitweb templates & misc cleanups
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1650
diff
changeset
|
2 <title>#repo|escape#: File revisions</title> |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
3 <link rel="alternate" type="application/rss+xml" |
3270
36fa5db79dd5
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents:
3226
diff
changeset
|
4 href="{url}rss-log" title="RSS feed for #repo|escape#"> |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
5 </head> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
6 <body> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
7 |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
8 <div class="page_header"> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
9 <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / file revisions |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
10 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
11 |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
12 <div class="page_nav"> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
13 <a href="{url}summary{sessionvars%urlparameter}">summary</a> | |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
14 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
15 <a href="{url}log{sessionvars%urlparameter}">changelog</a> | |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
16 <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:
3350
diff
changeset
|
17 <a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">file</a> | |
3270
36fa5db79dd5
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents:
3226
diff
changeset
|
18 revisions | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
19 <a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">annotate</a> | |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
20 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | |
4458
2ee0e935f86d
gitweb: file log template: removed excesive whitespace
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3406
diff
changeset
|
21 <a href="{url}rss-log/#node|short#/#file|urlescape#">rss</a> |
3406
03e7e8958a27
hgweb: hoist changenav up, and use it in the filelog
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
22 <br/> |
4458
2ee0e935f86d
gitweb: file log template: removed excesive whitespace
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3406
diff
changeset
|
23 {nav%filenaventry} |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
24 </div> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
25 |
2012
d07c322e0033
add missing filename title to gitweb's filelog page
TK Soh <teekaysoh@yahoo.com>
parents:
1668
diff
changeset
|
26 <div class="title" >#file|urlescape#</div> |
d07c322e0033
add missing filename title to gitweb's filelog page
TK Soh <teekaysoh@yahoo.com>
parents:
1668
diff
changeset
|
27 |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
28 <table> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
29 #entries%filelogentry# |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
30 </table> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
31 |
4459
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
32 <div class="page_nav"> |
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
33 {nav%filenaventry} |
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
34 </div> |
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
35 |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
36 #footer# |