Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- changeset 3562
- ef3f13a2c599
- parent 3484
- 645c12de6b0c
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3559:8938a2a66dee | 3562:ef3f13a2c599 |
|---|---|
| 42 repodir = os.path.dirname(repodir) | 42 repodir = os.path.dirname(repodir) |
| 43 if os.path.splitdrive(repodir)[1] == os.sep: | 43 if os.path.splitdrive(repodir)[1] == os.sep: |
| 44 return False | 44 return False |
| 45 | 45 |
| 46 res = False | 46 res = False |
| 47 if self.vcs.isExtensionActive("bookmarks"): | |
| 48 bookmarksList = \ | |
| 49 self.vcs.getExtensionObject("bookmarks")\ | |
| 50 .hgGetBookmarksList(repodir) | |
| 51 else: | |
| 52 bookmarksList = None | |
| 53 from .HgRebaseDialog import HgRebaseDialog | 47 from .HgRebaseDialog import HgRebaseDialog |
| 54 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), | 48 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), |
| 55 self.vcs.hgGetBranchesList(repodir), | 49 self.vcs.hgGetBranchesList(repodir), |
| 56 bookmarksList) | 50 self.vcs.hgGetBookmarksList(repodir)) |
| 57 if dlg.exec_() == QDialog.Accepted: | 51 if dlg.exec_() == QDialog.Accepted: |
| 58 (indicator, sourceRev, destRev, collapse, keep, keepBranches, | 52 (indicator, sourceRev, destRev, collapse, keep, keepBranches, |
| 59 detach) = dlg.getData() | 53 detach) = dlg.getData() |
| 60 | 54 |
| 61 args = self.vcs.initCommand("rebase") | 55 args = self.vcs.initCommand("rebase") |
