Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py
src/eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 9421
- 989ee2535d59
- parent 9413
- 80c06d472826
- child 9473
- 3f23dbf37dbe
equal
deleted
inserted
replaced
| 9420:92810aebc909 | 9421:989ee2535d59 |
|---|---|
| 1544 if target.startswith(project.getProjectPath()): | 1544 if target.startswith(project.getProjectPath()): |
| 1545 project.appendFile(target) | 1545 project.appendFile(target) |
| 1546 self.checkVCSStatus() | 1546 self.checkVCSStatus() |
| 1547 return True | 1547 return True |
| 1548 | 1548 |
| 1549 def gitBlame(self, name): | 1549 def gitBlame(self, name, skiplist=""): |
| 1550 """ | 1550 """ |
| 1551 Public method to show the output of the git blame command. | 1551 Public method to show the output of the git blame command. |
| 1552 | 1552 |
| 1553 @param name file name to show the annotations for (string) | 1553 @param name file name to show the annotations for |
| 1554 @type str | |
| 1555 @param skiplist name of a skip list file | |
| 1556 @type str | |
| 1554 """ | 1557 """ |
| 1555 if self.blame is None: | 1558 if self.blame is None: |
| 1556 from .GitBlameDialog import GitBlameDialog | 1559 from .GitBlameDialog import GitBlameDialog |
| 1557 | 1560 |
| 1558 self.blame = GitBlameDialog(self) | 1561 self.blame = GitBlameDialog(self) |
| 1559 self.blame.show() | 1562 self.blame.show() |
| 1560 self.blame.raise_() | 1563 self.blame.raise_() |
| 1561 self.blame.start(name) | 1564 self.blame.start(name, skiplist=skiplist) |
| 1562 | 1565 |
| 1563 def gitExtendedDiff(self, name): | 1566 def gitExtendedDiff(self, name): |
| 1564 """ | 1567 """ |
| 1565 Public method used to view the difference of a file/directory to the | 1568 Public method used to view the difference of a file/directory to the |
| 1566 Git repository. | 1569 Git repository. |
