Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- branch
- eric7
- changeset 8354
- 12ebd3934fef
- parent 8322
- b422b4e77d19
- child 8356
- 68ec9c3d4de5
equal
deleted
inserted
replaced
| 8353:799196d0b05d | 8354:12ebd3934fef |
|---|---|
| 18 | 18 |
| 19 from E5Gui.E5Application import e5App | 19 from E5Gui.E5Application import e5App |
| 20 from E5Gui import E5MessageBox, E5FileDialog | 20 from E5Gui import E5MessageBox, E5FileDialog |
| 21 from E5Gui.E5OverrideCursor import E5OverrideCursor | 21 from E5Gui.E5OverrideCursor import E5OverrideCursor |
| 22 | 22 |
| 23 from E5Utilities.E5MutexLocker import E5MutexLocker | 23 from EricUtilities.EricMutexLocker import EricMutexLocker |
| 24 | 24 |
| 25 from .SvnDialogMixin import SvnDialogMixin | 25 from .SvnDialogMixin import SvnDialogMixin |
| 26 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog | 26 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog |
| 27 from .SvnDiffHighlighter import SvnDiffHighlighter | 27 from .SvnDiffHighlighter import SvnDiffHighlighter |
| 28 | 28 |
| 208 os.chdir(dname) | 208 os.chdir(dname) |
| 209 try: | 209 try: |
| 210 dname = e5App().getObject('Project').getRelativePath(dname) | 210 dname = e5App().getObject('Project').getRelativePath(dname) |
| 211 if dname: | 211 if dname: |
| 212 dname += "/" | 212 dname += "/" |
| 213 with E5MutexLocker(self.vcs.vcsExecutionMutex): | 213 with EricMutexLocker(self.vcs.vcsExecutionMutex): |
| 214 for name in fnames: | 214 for name in fnames: |
| 215 self.__showError( | 215 self.__showError( |
| 216 self.tr("Processing file '{0}'...\n").format(name)) | 216 self.tr("Processing file '{0}'...\n").format(name)) |
| 217 if urls is not None: | 217 if urls is not None: |
| 218 url1 = "{0}/{1}{2}".format(urls[0], dname, name) | 218 url1 = "{0}/{1}{2}".format(urls[0], dname, name) |
