mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-11-13 07:41:04 +03:00
Code Issues Projects Releases Wiki Activity

Add method MergeRecord.is_manual().

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-07 16:38:11 +02:00
parent 176627375b
commit 4ae814411a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-imerge
View File

@ -557,6 +557,9 @@ class MergeRecord(object):
def is_blocked(self):
return self.flags & self.BLOCKED != 0
def is_manual(self):
return self.flags & self.MANUAL != 0
def save(self, name, i1, i2):
"""If this record has changed, save it."""
@ -1318,10 +1321,7 @@ class Block(object):
for i2 in range(self.len2):
for i1 in range(self.len1):
record = self.get_value(i1, i2)
c = table[
record.is_known(), bool(record.flags & MergeRecord.MANUAL),
record.is_blocked(),
]
c = table[record.is_known(), record.is_manual(), record.is_blocked()]
if c is not None:
diagram[i1][i2] = c