Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filediff.tmpl @ 1564:34579a67fa71
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
author | Benoit Boissinot <bboissin@gmail.com> |
---|---|
date | Thu, 01 Dec 2005 10:48:29 -0600 |
parents | 19d2776f1725 |
children | ba625c8083d8 |
rev | line source |
---|---|
142 | 1 #header# |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
172
diff
changeset
|
2 <title>#repo|escape#: #file# diff</title> |
142 | 3 </head> |
4 <body> | |
138 | 5 |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
6 <div class="buttons"> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
7 <a href="?cl=#rev#">changelog</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
8 <a href="?tags=">tags</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
9 <a href="?cs=#node|short#">changeset</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
10 <a href="?f=#filenode|short#;file=#file#">file</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
11 <a href="?fl=#filenode|short#;file=#file#">revisions</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
12 <a href="?fa=#filenode|short#;file=#file#">annotate</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
13 <a href="?fd=#node|short#;file=#file#;style=raw">raw</a> |
142 | 14 </div> |
138 | 15 |
16 <h2>#file#</h2> | |
17 | |
602 | 18 <table id="filediffEntry"> |
138 | 19 <tr> |
602 | 20 <th class="revision">revision #rev#:</th> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
21 <td class="revision"><a href="?cs=#node|short#">#node|short#</a></td> |
602 | 22 </tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1410
diff
changeset
|
23 #parent%filediffparent# |
138 | 24 </table> |
25 | |
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
26 <div id="fileDiff"> |
138 | 27 #diff# |
602 | 28 </div> |
138 | 29 |
142 | 30 #footer# |
138 | 31 |
32 |