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

Spiff up the MergeFrontier ASCII-art output.

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-03 17:16:52 +02:00
parent b91e4768c5
commit de389689a6
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git-imerge
View File

@ -656,16 +656,30 @@ class MergeFrontier(object):
return bool(self.blocks)
ADD_VERTICAL = {
'?' : '|',
'-' : '+',
'+' : '+',
}
ADD_HORIZONTAL = {
'?' : '-',
'|' : '+',
'+' : '+',
}
def write(self, f):
"""Write this frontier to file-like object f."""
output = [['?'] * self.block.len2 for i1 in range(self.block.len1)]
for block in self:
i2 = block.len2 - 1
for i1 in range(block.len1 - 1):
output[i1][block.len2 - 1] = '+'
output[i1][i2] = self.ADD_HORIZONTAL[output[i1][i2]]
i1 = block.len1 - 1
for i2 in range(block.len2 - 1):
output[block.len1 - 1][i2] = '+'
output[block.len1 - 1][block.len2 - 1] = '#'
output[i1][i2] = self.ADD_VERTICAL[output[i1][i2]]
output[block.len1 - 1][block.len2 - 1] = '*'
for i2 in range(self.block.len2):
for i1 in range(self.block.len1):