Fixed an issue in the various VCS diff dialogs causing a traceback. 5_2_x

Tue, 01 May 2012 15:20:39 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 01 May 2012 15:20:39 +0200
branch
5_2_x
changeset 1827
ecf5de426b82
parent 1826
23a58e2b056c
child 1828
9d0b9cab7ca5

Fixed an issue in the various VCS diff dialogs causing a traceback.

Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Tue May 01 11:29:14 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Tue May 01 15:20:39 2012 +0200
@@ -277,8 +277,8 @@
         
         @param line output line to be processed (string)
         """
-        if line.startswith("---") or \
-           line.startswith("+++"):
+        if line.startswith("--- ") or \
+           line.startswith("+++ "):
             self.__processFileLine(line)
         
         if line.startswith('+'):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Tue May 01 11:29:14 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Tue May 01 15:20:39 2012 +0200
@@ -227,8 +227,8 @@
                             revision1=rev1, revision2=rev2, recurse=recurse)
                 counter = 0
                 for line in diffText.splitlines():
-                    if line.startswith("---") or \
-                       line.startswith("+++"):
+                    if line.startswith("--- ") or \
+                       line.startswith("+++ "):
                         self.__processFileLine(line)
                     
                     self.__appendText("{0}{1}".format(line, os.linesep))
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue May 01 11:29:14 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue May 01 15:20:39 2012 +0200
@@ -257,8 +257,8 @@
             if self.summaryPath:
                 line = line.replace(self.summaryPath + '/', '')
                 line = " ".join(line.split())
-            if line.startswith("---") or \
-                line.startswith("+++"):
+            if line.startswith("--- ") or \
+                line.startswith("+++ "):
                     self.__processFileLine(line)
                 
             if line.startswith('+') or line.startswith('>') or line.startswith('A '):

eric ide

mercurial