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

Add a method Block.get_original_indices().

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-03 16:28:20 +02:00
parent 5fb5ebf1cb
commit f28638f71c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-imerge
View File

@ -799,6 +799,13 @@ class Block(object):
self._check_indexes(i1, i2)
return (i1, i2)
def get_original_indexes(self, i1, i2):
"""Return the original indexes corresponding to (i1,i2) in this block.
This function supports negative indexes."""
return self._normalize_indexes((i1, i2))
def set_value(self, i1, i2, value):
"""Set the MergeRecord for integer indexes (i1, i2).
@ -983,6 +990,10 @@ class SubBlock(Block):
self._start1 = start1
self._start2 = start2
def get_original_indexes(self, i1, i2):
i1, i2 = self._normalize_indexes((i1, i2))
return self._block.get_original_indexes(i1 + self._start1, i2 + self._start2)
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)