Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3853
- f0408b5c84e9
- parent 3675
- aa48d3e9b008
- child 3873
- 52e44def50d0
equal
deleted
inserted
replaced
| 3851:ec16b423f62d | 3853:f0408b5c84e9 |
|---|---|
| 2113 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) | 2113 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) |
| 2114 dlg.exec_() | 2114 dlg.exec_() |
| 2115 | 2115 |
| 2116 def hgConflicts(self, name): | 2116 def hgConflicts(self, name): |
| 2117 """ | 2117 """ |
| 2118 Public method used to show a list of files containing. | 2118 Public method used to show a list of files containing conflicts. |
| 2119 | 2119 |
| 2120 @param name file/directory name to be resolved (string) | 2120 @param name file/directory name to be resolved (string) |
| 2121 """ | 2121 """ |
| 2122 if self.conflictsDlg is None: | 2122 if self.conflictsDlg is None: |
| 2123 from .HgConflictsListDialog import HgConflictsListDialog | 2123 from .HgConflictsListDialog import HgConflictsListDialog |
| 2228 self.tr("Created new branch <{0}>.").format( | 2228 self.tr("Created new branch <{0}>.").format( |
| 2229 name)) | 2229 name)) |
| 2230 | 2230 |
| 2231 def hgShowBranch(self, name): | 2231 def hgShowBranch(self, name): |
| 2232 """ | 2232 """ |
| 2233 Public method used to show the current branch the working directory. | 2233 Public method used to show the current branch of the working directory. |
| 2234 | 2234 |
| 2235 @param name file/directory name (string) | 2235 @param name file/directory name (string) |
| 2236 """ | 2236 """ |
| 2237 dname, fname = self.splitPath(name) | 2237 dname, fname = self.splitPath(name) |
| 2238 | 2238 |
