Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 1083
- dc680a0ce221
- parent 1078
- aeee8401e2ce
- child 1085
- ef6102d5fefe
equal
deleted
inserted
replaced
| 1082:8387830c1089 | 1083:dc680a0ce221 |
|---|---|
| 825 def vcsSwitch(self, name): | 825 def vcsSwitch(self, name): |
| 826 """ | 826 """ |
| 827 Public method used to switch a working directory to a different revision. | 827 Public method used to switch a working directory to a different revision. |
| 828 | 828 |
| 829 @param name directory name to be switched (string) | 829 @param name directory name to be switched (string) |
| 830 @return flag indicating, that the switch contained an add | |
| 831 or delete (boolean) | |
| 830 """ | 832 """ |
| 831 dname, fname = self.splitPath(name) | 833 dname, fname = self.splitPath(name) |
| 832 | 834 |
| 833 # find the root of the repo | 835 # find the root of the repo |
| 834 repodir = dname | 836 repodir = dname |
| 835 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 837 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 836 repodir = os.path.dirname(repodir) | 838 repodir = os.path.dirname(repodir) |
| 837 if repodir == os.sep: | 839 if repodir == os.sep: |
| 838 return | 840 return False |
| 839 | 841 |
| 840 if self.isExtensionActive("bookmarks"): | 842 if self.isExtensionActive("bookmarks"): |
| 841 bookmarksList = \ | 843 bookmarksList = \ |
| 842 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 844 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) |
| 843 else: | 845 else: |
| 845 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), | 847 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), |
| 846 self.hgGetBranchesList(repodir), | 848 self.hgGetBranchesList(repodir), |
| 847 bookmarksList) | 849 bookmarksList) |
| 848 if dlg.exec_() == QDialog.Accepted: | 850 if dlg.exec_() == QDialog.Accepted: |
| 849 rev = dlg.getRevision() | 851 rev = dlg.getRevision() |
| 850 self.vcsUpdate(name, revision=rev) | 852 return self.vcsUpdate(name, revision=rev) |
| 853 | |
| 854 return False | |
| 851 | 855 |
| 852 def vcsRegisteredState(self, name): | 856 def vcsRegisteredState(self, name): |
| 853 """ | 857 """ |
| 854 Public method used to get the registered state of a file in the vcs. | 858 Public method used to get the registered state of a file in the vcs. |
| 855 | 859 |
