view mercurial/node.py @ 16534:11212babc690 stable

merge: check for untracked files more precisely (issue3400)

This fixes the regression, but still leaves the long-standing issue
that merge doesn't cope with trying to merge files and directories.

# node.py - basic nodeid manipulation for mercurial
#
# Copyright 2005, 2006 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

import binascii

nullrev = -1
nullid = "\0" * 20

# This ugly style has a noticeable effect in manifest parsing
hex = binascii.hexlify
bin = binascii.unhexlify

def short(node):
    return hex(node[:6])