Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2525
- 8b507a9a2d40
- parent 3008
- 7848489bcb92
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 44 return False | 44 return False |
| 45 | 45 |
| 46 res = False | 46 res = False |
| 47 if self.vcs.isExtensionActive("bookmarks"): | 47 if self.vcs.isExtensionActive("bookmarks"): |
| 48 bookmarksList = \ | 48 bookmarksList = \ |
| 49 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 49 self.vcs.getExtensionObject("bookmarks")\ |
| 50 .hgGetBookmarksList(repodir) | |
| 50 else: | 51 else: |
| 51 bookmarksList = None | 52 bookmarksList = None |
| 52 from .HgRebaseDialog import HgRebaseDialog | 53 from .HgRebaseDialog import HgRebaseDialog |
| 53 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), | 54 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), |
| 54 self.vcs.hgGetBranchesList(repodir), | 55 self.vcs.hgGetBranchesList(repodir), |
| 55 bookmarksList) | 56 bookmarksList) |
| 56 if dlg.exec_() == QDialog.Accepted: | 57 if dlg.exec_() == QDialog.Accepted: |
| 57 indicator, sourceRev, destRev, collapse, keep, keepBranches, detach = \ | 58 (indicator, sourceRev, destRev, collapse, keep, keepBranches, |
| 58 dlg.getData() | 59 detach) = dlg.getData() |
| 59 | 60 |
| 60 args = [] | 61 args = [] |
| 61 args.append("rebase") | 62 args.append("rebase") |
| 62 if indicator == "S": | 63 if indicator == "S": |
| 63 args.append("--source") | 64 args.append("--source") |
