Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- changeset 2405
- d4b5f3bd4720
- parent 2302
- f29e9405c851
- child 2525
- 8b507a9a2d40
- child 3008
- 7848489bcb92
equal
deleted
inserted
replaced
| 2404:cba0ff902c2b | 2405:d4b5f3bd4720 |
|---|---|
| 11 | 11 |
| 12 from PyQt4.QtGui import QDialog | 12 from PyQt4.QtGui import QDialog |
| 13 | 13 |
| 14 from ..HgExtension import HgExtension | 14 from ..HgExtension import HgExtension |
| 15 from ..HgDialog import HgDialog | 15 from ..HgDialog import HgDialog |
| 16 | |
| 17 from .HgRebaseDialog import HgRebaseDialog | |
| 18 | 16 |
| 19 | 17 |
| 20 class Rebase(HgExtension): | 18 class Rebase(HgExtension): |
| 21 """ | 19 """ |
| 22 Class implementing the rebase extension interface. | 20 Class implementing the rebase extension interface. |
| 47 if self.vcs.isExtensionActive("bookmarks"): | 45 if self.vcs.isExtensionActive("bookmarks"): |
| 48 bookmarksList = \ | 46 bookmarksList = \ |
| 49 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 47 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) |
| 50 else: | 48 else: |
| 51 bookmarksList = None | 49 bookmarksList = None |
| 50 from .HgRebaseDialog import HgRebaseDialog | |
| 52 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), | 51 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), |
| 53 self.vcs.hgGetBranchesList(repodir), | 52 self.vcs.hgGetBranchesList(repodir), |
| 54 bookmarksList) | 53 bookmarksList) |
| 55 if dlg.exec_() == QDialog.Accepted: | 54 if dlg.exec_() == QDialog.Accepted: |
| 56 indicator, sourceRev, destRev, collapse, keep, keepBranches, detach = \ | 55 indicator, sourceRev, destRev, collapse, keep, keepBranches, detach = \ |
