Commit 4e540c5e authored by Christophe Dumez's avatar Christophe Dumez

- fixed a bug in display of html diff (now OK)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6471 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 28c9687c
...@@ -151,8 +151,6 @@ class DiffFile: ...@@ -151,8 +151,6 @@ class DiffFile:
# Adding diff of the modification # Adding diff of the modification
old_code_list = child.getOldCodeList() old_code_list = child.getOldCodeList()
new_code_list = child.getNewCodeList() new_code_list = child.getNewCodeList()
if len(old_code_list)!=len(new_code_list):
raise '%s != %s for file %s'%(len(old_code_list), len(new_code_list), self.path)
i=0 i=0
for old_line_tuple in old_code_list: for old_line_tuple in old_code_list:
new_line_tuple = new_code_list[i] new_line_tuple = new_code_list[i]
...@@ -284,12 +282,12 @@ class SubCodeBlock: ...@@ -284,12 +282,12 @@ class SubCodeBlock:
old_code = [(x, 'white') for x in self.body.split('\n')] old_code = [(x, 'white') for x in self.body.split('\n')]
elif self.modification=='change': elif self.modification=='change':
old_code = [self._getOldCodeList(x) for x in self.body.split('\n') if self._getOldCodeList(x)[0]] old_code = [self._getOldCodeList(x) for x in self.body.split('\n') if self._getOldCodeList(x)[0]]
else: # deletion or addition
old_code = [self._getOldCodeList(x) for x in self.body.split('\n')]
# we want old_code_list and new_code_list to have the same length # we want old_code_list and new_code_list to have the same length
if(self.old_code_length < self.new_code_length): if(self.old_code_length < self.new_code_length):
filling = [(None, self.color)]*(self.new_code_length-self.old_code_length) filling = [(None, self.color)]*(self.new_code_length-self.old_code_length)
old_code.extend(filling) old_code.extend(filling)
else: # deletion or addition
old_code = [self._getOldCodeList(x) for x in self.body.split('\n')]
return old_code return old_code
def _getOldCodeList(self, line): def _getOldCodeList(self, line):
...@@ -305,12 +303,12 @@ class SubCodeBlock: ...@@ -305,12 +303,12 @@ class SubCodeBlock:
new_code = [(x, 'white') for x in self.body.split('\n')] new_code = [(x, 'white') for x in self.body.split('\n')]
elif self.modification=='change': elif self.modification=='change':
new_code = [self._getNewCodeList(x) for x in self.body.split('\n') if self._getNewCodeList(x)[0]] new_code = [self._getNewCodeList(x) for x in self.body.split('\n') if self._getNewCodeList(x)[0]]
else: # deletion or addition
new_code = [self._getNewCodeList(x) for x in self.body.split('\n')]
# we want old_code_list and new_code_list to have the same length # we want old_code_list and new_code_list to have the same length
if(self.new_code_length < self.old_code_length): if(self.new_code_length < self.old_code_length):
filling = [(None, self.color)]*(self.old_code_length-self.new_code_length) filling = [(None, self.color)]*(self.old_code_length-self.new_code_length)
new_code.extend(filling) new_code.extend(filling)
else: # deletion or addition
new_code = [self._getNewCodeList(x) for x in self.body.split('\n')]
return new_code return new_code
def _getNewCodeList(self, line): def _getNewCodeList(self, line):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment