Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/node.py @ 1885:c4d577262d00
run merge program in repo root.
before, merge program was run in user current directory. Well defined
location is better for scripts. no more need to pass HG_ROOT to merge
program now.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sat, 11 Mar 2006 21:33:19 -0800 |
parents | bf4e7ef08741 |
children | fe1689273f84 |
line wrap: on
line source
""" node.py - basic nodeid manipulation for mercurial Copyright 2005 Matt Mackall <mpm@selenic.com> This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. """ import binascii nullid = "\0" * 20 def hex(node): return binascii.hexlify(node) def bin(node): return binascii.unhexlify(node) def short(node): return hex(node[:6])