Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/node.py @ 1959:d53a18f592be
add -f/--force to pull, incoming, outgoing, to work on unrelated repo.
before this, push would not push from e.g. "hg" repo to "kernel" repo
but other commands worked. this was bad idea, could merge unrelated
projects by accident. i did this tonight.
now, all commands still work with unrelated repo but need
--force/-f. abort is default. this is safer.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 14 Mar 2006 22:58:14 -0800 |
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]) |