Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 7900
- 72b88fb20261
- parent 7836
- 2f0d208b8137
- child 7923
- 91e843545d9a
equal
deleted
inserted
replaced
| 7899:ecf67e07b6e0 | 7900:72b88fb20261 |
|---|---|
| 397 | 397 |
| 398 @param name file/directory name to be committed (string or list of | 398 @param name file/directory name to be committed (string or list of |
| 399 strings) | 399 strings) |
| 400 @param message message for this operation (string) | 400 @param message message for this operation (string) |
| 401 @param noDialog flag indicating quiet operations | 401 @param noDialog flag indicating quiet operations |
| 402 @keyparam closeBranch flag indicating a close branch commit (boolean) | 402 @param closeBranch flag indicating a close branch commit (boolean) |
| 403 @keyparam mq flag indicating a queue commit (boolean) | 403 @param mq flag indicating a queue commit (boolean) |
| 404 @keyparam merge flag indicating a merge commit (boolean) | 404 @param merge flag indicating a merge commit (boolean) |
| 405 """ | 405 """ |
| 406 msg = message | 406 msg = message |
| 407 | 407 |
| 408 if mq or merge: | 408 if mq or merge: |
| 409 # ensure dialog is shown for a queue commit | 409 # ensure dialog is shown for a queue commit |
| 582 repository. | 582 repository. |
| 583 | 583 |
| 584 @param name file/directory name to be updated (string or list of | 584 @param name file/directory name to be updated (string or list of |
| 585 strings) | 585 strings) |
| 586 @param noDialog flag indicating quiet operations (boolean) | 586 @param noDialog flag indicating quiet operations (boolean) |
| 587 @keyparam revision revision to update to (string) | 587 @param revision revision to update to (string) |
| 588 @return flag indicating, that the update contained an add | 588 @return flag indicating, that the update contained an add |
| 589 or delete (boolean) | 589 or delete (boolean) |
| 590 """ | 590 """ |
| 591 args = self.initCommand("update") | 591 args = self.initCommand("update") |
| 592 if "-v" not in args and "--verbose" not in args: | 592 if "-v" not in args and "--verbose" not in args: |
| 985 """ | 985 """ |
| 986 Public method used to merge a URL/revision into the local project. | 986 Public method used to merge a URL/revision into the local project. |
| 987 | 987 |
| 988 @param name file/directory name to be merged | 988 @param name file/directory name to be merged |
| 989 @type str | 989 @type str |
| 990 @keyparam rev revision to merge with | 990 @param rev revision to merge with |
| 991 @type str | 991 @type str |
| 992 """ | 992 """ |
| 993 dname, fname = self.splitPath(name) | 993 dname, fname = self.splitPath(name) |
| 994 | 994 |
| 995 # find the root of the repo | 995 # find the root of the repo |
| 1640 """ | 1640 """ |
| 1641 Private method to get a file for a specific revision from the | 1641 Private method to get a file for a specific revision from the |
| 1642 repository. | 1642 repository. |
| 1643 | 1643 |
| 1644 @param name file name to get from the repository (string) | 1644 @param name file name to get from the repository (string) |
| 1645 @keyparam rev revision to retrieve (string) | 1645 @param rev revision to retrieve (string) |
| 1646 @return contents of the file (string) and an error message (string) | 1646 @return contents of the file (string) and an error message (string) |
| 1647 """ | 1647 """ |
| 1648 args = self.initCommand("cat") | 1648 args = self.initCommand("cat") |
| 1649 if rev: | 1649 if rev: |
| 1650 args.append("--rev") | 1650 args.append("--rev") |
| 1660 """ | 1660 """ |
| 1661 Public method used to view the difference of a file to the Mercurial | 1661 Public method used to view the difference of a file to the Mercurial |
| 1662 repository side-by-side. | 1662 repository side-by-side. |
| 1663 | 1663 |
| 1664 @param name file name to be diffed (string) | 1664 @param name file name to be diffed (string) |
| 1665 @keyparam extended flag indicating the extended variant (boolean) | 1665 @param extended flag indicating the extended variant (boolean) |
| 1666 @keyparam revisions tuple of two revisions (tuple of strings) | 1666 @param revisions tuple of two revisions (tuple of strings) |
| 1667 @exception ValueError raised to indicate an invalid name parameter | 1667 @exception ValueError raised to indicate an invalid name parameter |
| 1668 """ | 1668 """ |
| 1669 if isinstance(name, list): | 1669 if isinstance(name, list): |
| 1670 raise ValueError("Wrong parameter type") | 1670 raise ValueError("Wrong parameter type") |
| 1671 | 1671 |
| 1733 """ | 1733 """ |
| 1734 Public method used to browse the log of a file/directory from the | 1734 Public method used to browse the log of a file/directory from the |
| 1735 Mercurial repository. | 1735 Mercurial repository. |
| 1736 | 1736 |
| 1737 @param name file/directory name to show the log of (string) | 1737 @param name file/directory name to show the log of (string) |
| 1738 @keyparam isFile flag indicating log for a file is to be shown | 1738 @param isFile flag indicating log for a file is to be shown |
| 1739 (boolean) | 1739 (boolean) |
| 1740 """ | 1740 """ |
| 1741 if self.logBrowser is None: | 1741 if self.logBrowser is None: |
| 1742 from .HgLogBrowserDialog import HgLogBrowserDialog | 1742 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1743 self.logBrowser = HgLogBrowserDialog(self) | 1743 self.logBrowser = HgLogBrowserDialog(self) |
| 1834 def hgPush(self, name, force=False, newBranch=False, rev=None): | 1834 def hgPush(self, name, force=False, newBranch=False, rev=None): |
| 1835 """ | 1835 """ |
| 1836 Public method used to push changes to a remote Mercurial repository. | 1836 Public method used to push changes to a remote Mercurial repository. |
| 1837 | 1837 |
| 1838 @param name directory name of the project to be pushed from (string) | 1838 @param name directory name of the project to be pushed from (string) |
| 1839 @keyparam force flag indicating a forced push (boolean) | 1839 @param force flag indicating a forced push (boolean) |
| 1840 @keyparam newBranch flag indicating to push a new branch (boolean) | 1840 @param newBranch flag indicating to push a new branch (boolean) |
| 1841 @keyparam rev revision to be pushed (including all ancestors) (string) | 1841 @param rev revision to be pushed (including all ancestors) (string) |
| 1842 """ | 1842 """ |
| 1843 args = self.initCommand("push") | 1843 args = self.initCommand("push") |
| 1844 args.append('-v') | 1844 args.append('-v') |
| 1845 if force: | 1845 if force: |
| 1846 args.append('-f') | 1846 args.append('-f') |
| 1867 def hgInfo(self, ppath, mode="heads"): | 1867 def hgInfo(self, ppath, mode="heads"): |
| 1868 """ | 1868 """ |
| 1869 Public method to show information about the heads of the repository. | 1869 Public method to show information about the heads of the repository. |
| 1870 | 1870 |
| 1871 @param ppath local path to get the repository infos (string) | 1871 @param ppath local path to get the repository infos (string) |
| 1872 @keyparam mode mode of the operation (string, one of heads, parents, | 1872 @param mode mode of the operation (string, one of heads, parents, |
| 1873 tip) | 1873 tip) |
| 1874 """ | 1874 """ |
| 1875 if mode not in ("heads", "parents", "tip"): | 1875 if mode not in ("heads", "parents", "tip"): |
| 1876 mode = "heads" | 1876 mode = "heads" |
| 1877 | 1877 |
