Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8366
- 2a9f5153c438
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 1721 def __hgResolved(self): | 1721 def __hgResolved(self): |
| 1722 """ | 1722 """ |
| 1723 Private slot used to mark conflicts of the local project as being | 1723 Private slot used to mark conflicts of the local project as being |
| 1724 resolved. | 1724 resolved. |
| 1725 """ | 1725 """ |
| 1726 self.vcs.hgResolved(self.project.ppath) | 1726 self.vcs.vcsResolved(self.project.ppath) |
| 1727 | 1727 |
| 1728 def __hgUnresolved(self): | 1728 def __hgUnresolved(self): |
| 1729 """ | 1729 """ |
| 1730 Private slot used to mark conflicts of the local project as being | 1730 Private slot used to mark conflicts of the local project as being |
| 1731 unresolved. | 1731 unresolved. |
| 1732 """ | 1732 """ |
| 1733 self.vcs.hgResolved(self.project.ppath, unresolve=True) | 1733 self.vcs.vcsResolved(self.project.ppath, unresolve=True) |
| 1734 | 1734 |
| 1735 def __hgCommitMerge(self): | 1735 def __hgCommitMerge(self): |
| 1736 """ | 1736 """ |
| 1737 Private slot used to commit a merge. | 1737 Private slot used to commit a merge. |
| 1738 """ | 1738 """ |
| 1941 | 1941 |
| 1942 def __hgRevert(self): | 1942 def __hgRevert(self): |
| 1943 """ | 1943 """ |
| 1944 Private slot used to revert changes made to the local project. | 1944 Private slot used to revert changes made to the local project. |
| 1945 """ | 1945 """ |
| 1946 shouldReopen = self.vcs.hgRevert(self.project.ppath) | 1946 shouldReopen = self.vcs.vcsRevert(self.project.ppath) |
| 1947 if shouldReopen: | 1947 if shouldReopen: |
| 1948 res = EricMessageBox.yesNo( | 1948 res = EricMessageBox.yesNo( |
| 1949 self.parent(), | 1949 self.parent(), |
| 1950 self.tr("Revert Changes"), | 1950 self.tr("Revert Changes"), |
| 1951 self.tr("""The project should be reread. Do this now?"""), | 1951 self.tr("""The project should be reread. Do this now?"""), |
