Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
- branch
- eric7
- changeset 10922
- 36a90a94765c
- parent 10690
- fab36645aa7d
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10921:495f084a737e | 10922:36a90a94765c |
|---|---|
| 119 self.intercept = False | 119 self.intercept = False |
| 120 self.filename = fn | 120 self.filename = fn |
| 121 | 121 |
| 122 self.process.kill() | 122 self.process.kill() |
| 123 | 123 |
| 124 self.highlighter.regenerateRules( | |
| 125 { | |
| 126 "text": Preferences.getDiffColour("TextColor"), | |
| 127 "added": Preferences.getDiffColour("AddedColor"), | |
| 128 "removed": Preferences.getDiffColour("RemovedColor"), | |
| 129 "replaced": Preferences.getDiffColour("ReplacedColor"), | |
| 130 "context": Preferences.getDiffColour("ContextColor"), | |
| 131 "header": Preferences.getDiffColour("HeaderColor"), | |
| 132 "whitespace": Preferences.getDiffColour("BadWhitespaceColor"), | |
| 133 }, | |
| 134 Preferences.getEditorOtherFonts("MonospacedFont"), | |
| 135 ) | |
| 136 | |
| 124 self.contents.clear() | 137 self.contents.clear() |
| 125 self.highlighter.regenerateRules() | |
| 126 self.paras = 0 | 138 self.paras = 0 |
| 127 | 139 |
| 128 self.filesCombo.clear() | 140 self.filesCombo.clear() |
| 129 | 141 |
| 130 self.__oldFile = "" | 142 self.__oldFile = "" |
