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 method MergeFrontier.is_complete().

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-04 10:26:31 +02:00
parent 3fb6ac9d20
commit b1cb0377d6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-imerge
View File

@ -652,6 +652,15 @@ class MergeFrontier(object):
return bool(self.blocks)
def is_complete(self):
"""Return True iff the frontier covers the whole block."""
return (
len(self.blocks) == 1
and self.blocks[0].len1 == self.block.len1
and self.blocks[0].len2 == self.block.len2
)
ADD_VERTICAL = {
'?' : '|',
'-' : '+',