Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the various VCS diff dialogs causing a traceback.
Tue, 01 May 2012 15:20:39 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 01 May 2012 15:20:39 +0200
- changeset 1824
- d1e20bfe86cd
- parent 1823
- 21d988eaf1bf
- child 1829
- fa72a573967f
Fixed an issue in the various VCS diff dialogs causing a traceback.
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Mon Apr 30 19:19:17 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue May 01 15:20:39 2012 +0200 @@ -278,8 +278,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 Mon Apr 30 19:19:17 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 Mon Apr 30 19:19:17 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue May 01 15:20:39 2012 +0200 @@ -263,8 +263,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 '):
