Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
- changeset 3562
- ef3f13a2c599
- parent 3484
- 645c12de6b0c
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3559:8938a2a66dee | 3562:ef3f13a2c599 |
|---|---|
| 64 repodir = os.path.dirname(repodir) | 64 repodir = os.path.dirname(repodir) |
| 65 if os.path.splitdrive(repodir)[1] == os.sep: | 65 if os.path.splitdrive(repodir)[1] == os.sep: |
| 66 return | 66 return |
| 67 | 67 |
| 68 if rev is None: | 68 if rev is None: |
| 69 if self.vcs.isExtensionActive("bookmarks"): | |
| 70 bookmarksList = \ | |
| 71 self.vcs.getExtensionObject("bookmarks")\ | |
| 72 .hgGetBookmarksList(repodir) | |
| 73 else: | |
| 74 bookmarksList = None | |
| 75 dlg = HgRevisionSelectionDialog( | 69 dlg = HgRevisionSelectionDialog( |
| 76 self.vcs.hgGetTagsList(repodir), | 70 self.vcs.hgGetTagsList(repodir), |
| 77 self.vcs.hgGetBranchesList(repodir), | 71 self.vcs.hgGetBranchesList(repodir), |
| 78 bookmarksList) | 72 self.vcs.hgGetBookmarksList(repodir)) |
| 79 if dlg.exec_() == QDialog.Accepted: | 73 if dlg.exec_() == QDialog.Accepted: |
| 80 rev = dlg.getRevision() | 74 rev = dlg.getRevision() |
| 81 | 75 |
| 82 if rev is not None: | 76 if rev is not None: |
| 83 if rev == "": | 77 if rev == "": |
| 101 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 95 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 102 repodir = os.path.dirname(repodir) | 96 repodir = os.path.dirname(repodir) |
| 103 if os.path.splitdrive(repodir)[1] == os.sep: | 97 if os.path.splitdrive(repodir)[1] == os.sep: |
| 104 return | 98 return |
| 105 | 99 |
| 106 if self.vcs.isExtensionActive("bookmarks"): | |
| 107 bookmarksList = \ | |
| 108 self.vcs.getExtensionObject("bookmarks")\ | |
| 109 .hgGetBookmarksList(repodir) | |
| 110 else: | |
| 111 bookmarksList = None | |
| 112 from .HgGpgSignDialog import HgGpgSignDialog | 100 from .HgGpgSignDialog import HgGpgSignDialog |
| 113 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), | 101 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), |
| 114 self.vcs.hgGetBranchesList(repodir), | 102 self.vcs.hgGetBranchesList(repodir), |
| 115 bookmarksList) | 103 self.vcs.hgGetBookmarksList(repodir)) |
| 116 if dlg.exec_() == QDialog.Accepted: | 104 if dlg.exec_() == QDialog.Accepted: |
| 117 revision, noCommit, message, keyId, local, force = dlg.getData() | 105 revision, noCommit, message, keyId, local, force = dlg.getData() |
| 118 | 106 |
| 119 args = self.vcs.initCommand("sign") | 107 args = self.vcs.initCommand("sign") |
| 120 if noCommit: | 108 if noCommit: |
