Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- changeset 12
- 1d8dd9706f46
- parent 0
- de9c2efb9d02
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 15 from PyQt4.QtCore import * | 15 from PyQt4.QtCore import * |
| 16 from PyQt4.QtGui import * | 16 from PyQt4.QtGui import * |
| 17 | 17 |
| 18 from E4Gui.E4Application import e4App | 18 from E4Gui.E4Application import e4App |
| 19 | 19 |
| 20 from SvnConst import svnStatusMap | 20 from .SvnConst import svnStatusMap |
| 21 from SvnDialogMixin import SvnDialogMixin | 21 from .SvnDialogMixin import SvnDialogMixin |
| 22 from Ui_SvnStatusDialog import Ui_SvnStatusDialog | 22 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog |
| 23 | 23 |
| 24 import Preferences | 24 import Preferences |
| 25 | 25 |
| 26 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog): | 26 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog): |
| 27 """ | 27 """ |
| 219 | 219 |
| 220 self.setWindowTitle(self.trUtf8('Subversion Status')) | 220 self.setWindowTitle(self.trUtf8('Subversion Status')) |
| 221 self.activateWindow() | 221 self.activateWindow() |
| 222 self.raise_() | 222 self.raise_() |
| 223 | 223 |
| 224 if type(fn) is types.ListType: | 224 if isinstance(fn, list): |
| 225 self.dname, fnames = self.vcs.splitPathList(fn) | 225 self.dname, fnames = self.vcs.splitPathList(fn) |
| 226 else: | 226 else: |
| 227 self.dname, fname = self.vcs.splitPath(fn) | 227 self.dname, fname = self.vcs.splitPath(fn) |
| 228 fnames = [fname] | 228 fnames = [fname] |
| 229 | 229 |
| 301 counter = 0 | 301 counter = 0 |
| 302 if self._clientCancelCallback(): | 302 if self._clientCancelCallback(): |
| 303 break | 303 break |
| 304 if self._clientCancelCallback(): | 304 if self._clientCancelCallback(): |
| 305 break | 305 break |
| 306 except pysvn.ClientError, e: | 306 except pysvn.ClientError as e: |
| 307 self.__showError(e.args[0]+'\n') | 307 self.__showError(e.args[0]+'\n') |
| 308 locker.unlock() | 308 locker.unlock() |
| 309 self.__finish() | 309 self.__finish() |
| 310 os.chdir(cwd) | 310 os.chdir(cwd) |
| 311 | 311 |
