mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-21 12:39:56 +03:00
Code Issues Projects Releases Wiki Activity

Make Block.set_value() private and remove Block.__setitem__().

Browse Source 
Callers shouldn't be setting records like this.  They should get the
MergeRecord using __getitem__() and then modify the MergeRecord in
place.
This commit is contained in:
Michael Haggerty 2013-05-06 10:45:23 +02:00
parent 5effd876e7
commit 06f10442e4
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git-imerge
View File

@ -1040,25 +1040,13 @@ class Block(object):
return (i1, i2)
def set_value(self, i1, i2, value):
def _set_value(self, i1, i2, value):
"""Set the MergeRecord for integer indexes (i1, i2).
i1 and i2 must be non-negative."""
raise NotImplementedError()
def __setitem__(self, index, value):
"""Return the MergeRecord for indexes (i1, i2).
i1 and i2 must be integers, but they may be negative."""
(i1, i2) = self._normalize_indexes(index)
if i1 < 0:
i1 += self.len1
if i2 < 0:
i2 += self.len2
self.set_value(i1, i2, value)
def get_value(self, i1, i2):
"""Return the MergeRecord for integer indexes (i1, i2).
@ -1266,9 +1254,9 @@ class SubBlock(Block):
raise IndexError('Indexes are not within block')
return (i1 - self._start1, i2 - self._start2)
def set_value(self, i1, i2, sha1, flags):
def _set_value(self, i1, i2, sha1, flags):
self._check_indexes(i1, i2)
self._block.set_value(i1 + self._start1, i2 + self._start2, sha1, flags)
self._block._set_value(i1 + self._start1, i2 + self._start2, sha1, flags)
def get_value(self, i1, i2):
self._check_indexes(i1, i2)
@ -1620,7 +1608,7 @@ class MergeState(Block):
self.goal = goal
def set_value(self, i1, i2, value):
def _set_value(self, i1, i2, value):
self._data[i1][i2] = value
def get_value(self, i1, i2):