Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/git.py
eric6/Plugins/VcsPlugins/vcsGit/git.py
- branch
- maintenance
- changeset 8043
- 0acf98cd089a
- parent 7924
- 8a96736d465e
- parent 7923
- 91e843545d9a
- child 8176
- 31965986ecd1
equal
deleted
inserted
replaced
| 7991:866adc8c315b | 8043:0acf98cd089a |
|---|---|
| 496 repository. | 496 repository. |
| 497 | 497 |
| 498 @param name file/directory name to be updated (string or list of | 498 @param name file/directory name to be updated (string or list of |
| 499 strings) | 499 strings) |
| 500 @param noDialog flag indicating quiet operations (boolean) | 500 @param noDialog flag indicating quiet operations (boolean) |
| 501 @keyparam revision revision to update to (string) | 501 @param revision revision to update to (string) |
| 502 @return flag indicating, that the update contained an add | 502 @return flag indicating, that the update contained an add |
| 503 or delete (boolean) | 503 or delete (boolean) |
| 504 """ | 504 """ |
| 505 args = self.initCommand("checkout") | 505 args = self.initCommand("checkout") |
| 506 if revision: | 506 if revision: |
| 735 """ | 735 """ |
| 736 Public method used to browse the log of a file/directory from the | 736 Public method used to browse the log of a file/directory from the |
| 737 Git repository. | 737 Git repository. |
| 738 | 738 |
| 739 @param name file/directory name to show the log of (string) | 739 @param name file/directory name to show the log of (string) |
| 740 @keyparam isFile flag indicating log for a file is to be shown | 740 @param isFile flag indicating log for a file is to be shown |
| 741 (boolean) | 741 (boolean) |
| 742 """ | 742 """ |
| 743 if self.logBrowser is None: | 743 if self.logBrowser is None: |
| 744 from .GitLogBrowserDialog import GitLogBrowserDialog | 744 from .GitLogBrowserDialog import GitLogBrowserDialog |
| 745 self.logBrowser = GitLogBrowserDialog(self) | 745 self.logBrowser = GitLogBrowserDialog(self) |
| 1526 """ | 1526 """ |
| 1527 Private method to get a file for a specific revision from the | 1527 Private method to get a file for a specific revision from the |
| 1528 repository. | 1528 repository. |
| 1529 | 1529 |
| 1530 @param name file name to get from the repository (string) | 1530 @param name file name to get from the repository (string) |
| 1531 @keyparam rev revision to retrieve (string) | 1531 @param rev revision to retrieve (string) |
| 1532 @return contents of the file (string) and an error message (string) | 1532 @return contents of the file (string) and an error message (string) |
| 1533 """ | 1533 """ |
| 1534 # find the root of the repo | 1534 # find the root of the repo |
| 1535 repodir = self.splitPath(name)[0] | 1535 repodir = self.splitPath(name)[0] |
| 1536 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1536 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1575 """ | 1575 """ |
| 1576 Public method used to view the difference of a file to the Git | 1576 Public method used to view the difference of a file to the Git |
| 1577 repository side-by-side. | 1577 repository side-by-side. |
| 1578 | 1578 |
| 1579 @param name file name to be diffed (string) | 1579 @param name file name to be diffed (string) |
| 1580 @keyparam extended flag indicating the extended variant (boolean) | 1580 @param extended flag indicating the extended variant (boolean) |
| 1581 @keyparam revisions tuple of two revisions (tuple of strings) | 1581 @param revisions tuple of two revisions (tuple of strings) |
| 1582 @exception ValueError raised to indicate an invalid name parameter | 1582 @exception ValueError raised to indicate an invalid name parameter |
| 1583 """ | 1583 """ |
| 1584 if isinstance(name, list): | 1584 if isinstance(name, list): |
| 1585 raise ValueError("Wrong parameter type") | 1585 raise ValueError("Wrong parameter type") |
| 1586 | 1586 |
