Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/node.py @ 2424:092039246d73
Report on push/pull if heads are merged, too, like for new heads.
Use case: If a remote repo has two heads and I _want_ to merge them, I merge
and push. Meanwhile someone else pushed on top of one of the heads. He won't
get a warning, because he doesn't create a new head, I won't notice that I
don't close a head, because I don't get a message telling me.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 10 Jun 2006 17:39:29 +0200 |
| 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]) |