Show More
@@ -21,11 +21,15 b' class mergestate(object):' | |||||
21 | def _read(self): |
|
21 | def _read(self): | |
22 | self._state = {} |
|
22 | self._state = {} | |
23 | try: |
|
23 | try: | |
|
24 | localnode = None | |||
24 | f = self._repo.opener("merge/state") |
|
25 | f = self._repo.opener("merge/state") | |
25 | self._local = bin(f.readline()[:-1]) |
|
26 | for i, l in enumerate(f): | |
26 |
f |
|
27 | if i == 0: | |
27 |
|
|
28 | localnode = l[:-1] | |
28 | self._state[bits[0]] = bits[1:] |
|
29 | else: | |
|
30 | bits = l[:-1].split("\0") | |||
|
31 | self._state[bits[0]] = bits[1:] | |||
|
32 | self._local = bin(localnode) | |||
29 | except IOError, err: |
|
33 | except IOError, err: | |
30 | if err.errno != errno.ENOENT: |
|
34 | if err.errno != errno.ENOENT: | |
31 | raise |
|
35 | raise |
General Comments 0
You need to be logged in to leave comments.
Login now