Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/search.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 | 1196998c62e3 |
children |
rev | line source |
---|---|
538 | 1 #header# |
2 <title>#repo|escape#: searching for #query|escape#</title> | |
3 </head> | |
4 <body> | |
5 | |
6 <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
|
7 <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:
3362
diff
changeset
|
8 <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:
3362
diff
changeset
|
9 <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
|
10 <a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a> |
4470
1196998c62e3
Add archive download links to hgweb search template
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3363
diff
changeset
|
11 #archives%archiveentry# |
538 | 12 </div> |
13 | |
14 <h2>searching for #query|escape#</h2> | |
15 | |
16 <form> | |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
17 {sessionvars%hiddenformentry} |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
18 <p> |
538 | 19 search: |
20 <input name="rev" type="text" width="30" value="#query|escape#"> | |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
21 </p> |
538 | 22 </form> |
23 | |
24 #entries# | |
25 | |
26 <form> | |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
27 {sessionvars%hiddenformentry} |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
28 <p> |
538 | 29 search: |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
30 <input name="rev" type="text" width="30" value="#query|escape#"> |
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
31 </p> |
538 | 32 </form> |
33 | |
34 #footer# |