def diff_text_documents(self, show=False):
OLD, NEW = list(range(2))
for i in (OLD, NEW):
if self._paths[i] is None:
self._texts[i] = ''
elif self._texts[i] is None:
self._texts[i] = self._read_file(self._paths[i])
lexers = [
self._get_lexer(path, text)
for path, text in zip(self._paths, self._texts)
]
raw_text_documents = [RawTextDocument(text) for text in self._texts]
highlight = self._highlight_action.isChecked()
number_of_lines_of_context = self._lines_of_context_combobox.currentData(
)
self._highlighted_documents = []
if not show:
file_diff = TwoWayFileDiffFactory().process(
*raw_text_documents,
number_of_lines_of_context=number_of_lines_of_context,
)
document_models = TextDocumentDiffModelFactory().process(file_diff)
for raw_text_document, document_model, lexer in zip(
raw_text_documents, document_models, lexers):
if lexer is not None and highlight:
highlighted_text = HighlightedText(raw_text_document,
lexer)
highlighted_document = highlight_document(
document_model, highlighted_text)
else:
highlighted_document = document_model
self._highlighted_documents.append(highlighted_document)
else: # Only show the document
# Fixme: broken, chunk_type is ???
# self._diff_view.set_document_models(self._highlighted_documents, complete_mode)
# File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/DiffWidget.py", line 333, in set_document_models
# cursor.begin_block(side, text_block.frame_type)
# File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/DiffWidget.py", line 99, in begin_block
# if ((side == LEFT and frame_type == chunk_type.insert) or
# File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/Tools/EnumFactory.py", line 107, in __eq__
# return self._value == int(other)
# TypeError: int() argument must be a string or a number, not 'NoneType'
for raw_text_document, lexer in zip(raw_text_documents,
self._lexers):
highlighted_document = highlight_text(raw_text_document, lexer)
self._highlighted_documents.append(highlighted_document)
if self._metadatas is not None:
for highlighted_document, metadata in zip(
self._highlighted_documents, self._metadatas):
highlighted_document.metadata = metadata
def diff_text_documents(self, show=False):
OLD, NEW = list(range(2))
for i in (OLD, NEW):
if self._paths[i] is None:
self._texts[i] = ''
elif self._texts[i] is None:
self._texts[i] = self._read_file(self._paths[i])
lexers = [self._get_lexer(path, text) for path, text in zip(self._paths, self._texts)]
raw_text_documents = [RawTextDocument(text) for text in self._texts]
highlight = self._highlight_action.isChecked()
number_of_lines_of_context = self._lines_of_context_combobox.currentData()
self._highlighted_documents = []
if not show:
file_diff = TwoWayFileDiffFactory().process(* raw_text_documents,
number_of_lines_of_context=number_of_lines_of_context)
document_models = TextDocumentDiffModelFactory().process(file_diff)
for raw_text_document, document_model, lexer in zip(raw_text_documents, document_models, lexers):
if lexer is not None and highlight:
highlighted_text = HighlightedText(raw_text_document, lexer)
highlighted_document = highlight_document(document_model, highlighted_text)
else:
highlighted_document = document_model
self._highlighted_documents.append(highlighted_document)
else: # Only show the document
# Fixme: broken, chunk_type is ???
# self._diff_view.set_document_models(self._highlighted_documents, complete_mode)
# File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/DiffWidget.py", line 333, in set_document_models
# cursor.begin_block(side, text_block.frame_type)
# File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/DiffWidget.py", line 99, in begin_block
# if ((side == LEFT and frame_type == chunk_type.insert) or
# File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/Tools/EnumFactory.py", line 107, in __eq__
# return self._value == int(other)
# TypeError: int() argument must be a string or a number, not 'NoneType'
for raw_text_document, lexer in zip(raw_text_documents, self._lexers):
highlighted_document = highlight_text(raw_text_document, lexer)
self._highlighted_documents.append(highlighted_document)
if self._metadatas is not None:
for highlighted_document, metadata in zip(self._highlighted_documents, self._metadatas):
highlighted_document.metadata = metadata