Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/node.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 | bf4e7ef08741 |
children | fe1689273f84 |
rev | line source |
---|---|
1089 | 1 """ |
2 node.py - basic nodeid manipulation for mercurial | |
3 | |
4 Copyright 2005 Matt Mackall <mpm@selenic.com> | |
5 | |
6 This software may be used and distributed according to the terms | |
7 of the GNU General Public License, incorporated herein by reference. | |
8 """ | |
9 | |
1541
bf4e7ef08741
fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX
twaldmann@thinkmo.de
parents:
1091
diff
changeset
|
10 import binascii |
1089 | 11 |
12 nullid = "\0" * 20 | |
13 | |
14 def hex(node): | |
15 return binascii.hexlify(node) | |
16 | |
17 def bin(node): | |
18 return binascii.unhexlify(node) | |
19 | |
20 def short(node): | |
21 return hex(node[:6]) |