Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/node.py @ 2795:135823f37304
new extension: fetch -> combine pull and merge/update
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 07 Aug 2006 17:27:38 -0700 |
parents | fe1689273f84 |
children | 345bac2bc4ec |
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. """ from demandload import demandload demandload(globals(), "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])