Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
- changeset 3008
- 7848489bcb92
- parent 2405
- d4b5f3bd4720
- child 3057
- 10516539f238
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3007:bad2e89047e7 | 3008:7848489bcb92 |
|---|---|
| 64 return | 64 return |
| 65 | 65 |
| 66 if rev is None: | 66 if rev is None: |
| 67 if self.vcs.isExtensionActive("bookmarks"): | 67 if self.vcs.isExtensionActive("bookmarks"): |
| 68 bookmarksList = \ | 68 bookmarksList = \ |
| 69 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 69 self.vcs.getExtensionObject("bookmarks")\ |
| 70 .hgGetBookmarksList(repodir) | |
| 70 else: | 71 else: |
| 71 bookmarksList = None | 72 bookmarksList = None |
| 72 dlg = HgRevisionSelectionDialog(self.vcs.hgGetTagsList(repodir), | 73 dlg = HgRevisionSelectionDialog( |
| 73 self.vcs.hgGetBranchesList(repodir), | 74 self.vcs.hgGetTagsList(repodir), |
| 74 bookmarksList) | 75 self.vcs.hgGetBranchesList(repodir), |
| 76 bookmarksList) | |
| 75 if dlg.exec_() == QDialog.Accepted: | 77 if dlg.exec_() == QDialog.Accepted: |
| 76 rev = dlg.getRevision() | 78 rev = dlg.getRevision() |
| 77 | 79 |
| 78 if rev is not None: | 80 if rev is not None: |
| 79 if rev == "": | 81 if rev == "": |
| 100 if os.path.splitdrive(repodir)[1] == os.sep: | 102 if os.path.splitdrive(repodir)[1] == os.sep: |
| 101 return | 103 return |
| 102 | 104 |
| 103 if self.vcs.isExtensionActive("bookmarks"): | 105 if self.vcs.isExtensionActive("bookmarks"): |
| 104 bookmarksList = \ | 106 bookmarksList = \ |
| 105 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 107 self.vcs.getExtensionObject("bookmarks")\ |
| 108 .hgGetBookmarksList(repodir) | |
| 106 else: | 109 else: |
| 107 bookmarksList = None | 110 bookmarksList = None |
| 108 from .HgGpgSignDialog import HgGpgSignDialog | 111 from .HgGpgSignDialog import HgGpgSignDialog |
| 109 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), | 112 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), |
| 110 self.vcs.hgGetBranchesList(repodir), | 113 self.vcs.hgGetBranchesList(repodir), |
