Comments
Patch
@@ -11,10 +11,12 @@ from mercurial import obsolete
import error, util, filemerge, copies, subrepo, worker, dicthelpers
import errno, os, shutil
class mergestate(object):
'''track 3-way merge state of individual files'''
+ statepath = "merge/state"
+
def __init__(self, repo):
self._repo = repo
self._dirty = False
self._read()
def reset(self, node=None):
@@ -24,11 +26,11 @@ class mergestate(object):
shutil.rmtree(self._repo.join("merge"), True)
self._dirty = False
def _read(self):
self._state = {}
try:
- f = self._repo.opener("merge/state")
+ f = self._repo.opener(self.statepath)
for i, l in enumerate(f):
if i == 0:
self._local = bin(l[:-1])
else:
bits = l[:-1].split("\0")
@@ -38,11 +40,11 @@ class mergestate(object):
if err.errno != errno.ENOENT:
raise
self._dirty = False
def commit(self):
if self._dirty:
- f = self._repo.opener("merge/state", "w")
+ f = self._repo.opener(self.statepath, "w")
f.write(hex(self._local) + "\n")
for d, v in self._state.iteritems():
f.write("\0".join([d] + v) + "\n")
f.close()
self._dirty = False