comparison mercurial/merge.py @ 6517:fcfb6a0a0a84

python-2.6: use sha wrapper from util for new merge code

6516:7a6243bf209d

# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from node import nullid, nullrev, hex
from i18n import _
import errno, util, os, filemerge, copies, sha, shutil

class mergestate(object):
    '''track 3-way merge state of individual files'''
    def __init__(self, repo):
        self._repo = repo

        self._data = {}
    def reset(self, node):
        self._local = node
        shutil.rmtree(self._repo.join("merge"), True)
    def add(self, fcl, fco, fca, fd, flags):
        hash = sha.sha(fcl.path()).hexdigest()
        self._repo.opener("merge/" + hash, "w").write(fcl.data())
        self._state[fd] = 'u'
        self._data[fd] = (hash, fcl.path(), fca.path(), hex(fca.filenode()),
                          fco.path(), flags)
    def __contains__(self, dfile):

6517:fcfb6a0a0a84

# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from node import nullid, nullrev, hex
from i18n import _
import errno, util, os, filemerge, copies, shutil

class mergestate(object):
    '''track 3-way merge state of individual files'''
    def __init__(self, repo):
        self._repo = repo

        self._data = {}
    def reset(self, node):
        self._local = node
        shutil.rmtree(self._repo.join("merge"), True)
    def add(self, fcl, fco, fca, fd, flags):
        hash = util.sha1(fcl.path()).hexdigest()
        self._repo.opener("merge/" + hash, "w").write(fcl.data())
        self._state[fd] = 'u'
        self._data[fd] = (hash, fcl.path(), fca.path(), hex(fca.filenode()),
                          fco.path(), flags)
    def __contains__(self, dfile):