mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-09-21 04:28:11 +03:00
Add a method Block.get_original_indices().
This commit is contained in:
parent
5fb5ebf1cb
commit
f28638f71c
11
git-imerge
11
git-imerge
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user