Mercurial > hg > mercurial-crew-with-dirclash
annotate hgext/win32text.py @ 1772:b1a7fd503a29
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:16 -0600 |
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 }) |