Mercurial > hg > mercurial-crew-with-dirclash
annotate hgext/win32text.py @ 5440:f9b0e4f023c4
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Oct 2007 18:47:22 -0500 |
parents | e58b1c9a0dec |
children | 30762680fcd2 |
rev | line source |
---|---|
1297
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 import mercurial.util |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 def dumbdecode(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 return s.replace('\n', '\r\n') |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 def dumbencode(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 return s.replace('\r\n', '\n') |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 def clevertest(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 if '\0' in s: return False |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 return True |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 def cleverdecode(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 if clevertest(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 return dumbdecode(s, cmd) |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 return s |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 def cleverencode(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 if clevertest(s, cmd): |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 return dumbencode(s, cmd) |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 return s |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
22 |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 mercurial.util.filtertable.update({ |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 'dumbdecode:': dumbdecode, |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 'dumbencode:': dumbencode, |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 'cleverdecode:': cleverdecode, |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 'cleverencode:': cleverencode, |
496074e0a38b
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
28 }) |