Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- 5_5_x
- changeset 3854
- 219087ed6118
- parent 3671
- e8a37c412d28
- child 3875
- 21d3683ed656
equal
deleted
inserted
replaced
| 3852:3adad7477de5 | 3854:219087ed6118 |
|---|---|
| 2112 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) | 2112 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) |
| 2113 dlg.exec_() | 2113 dlg.exec_() |
| 2114 | 2114 |
| 2115 def hgConflicts(self, name): | 2115 def hgConflicts(self, name): |
| 2116 """ | 2116 """ |
| 2117 Public method used to show a list of files containing. | 2117 Public method used to show a list of files containing conflicts. |
| 2118 | 2118 |
| 2119 @param name file/directory name to be resolved (string) | 2119 @param name file/directory name to be resolved (string) |
| 2120 """ | 2120 """ |
| 2121 if self.conflictsDlg is None: | 2121 if self.conflictsDlg is None: |
| 2122 from .HgConflictsListDialog import HgConflictsListDialog | 2122 from .HgConflictsListDialog import HgConflictsListDialog |
| 2227 self.tr("Created new branch <{0}>.").format( | 2227 self.tr("Created new branch <{0}>.").format( |
| 2228 name)) | 2228 name)) |
| 2229 | 2229 |
| 2230 def hgShowBranch(self, name): | 2230 def hgShowBranch(self, name): |
| 2231 """ | 2231 """ |
| 2232 Public method used to show the current branch the working directory. | 2232 Public method used to show the current branch of the working directory. |
| 2233 | 2233 |
| 2234 @param name file/directory name (string) | 2234 @param name file/directory name (string) |
| 2235 """ | 2235 """ |
| 2236 dname, fname = self.splitPath(name) | 2236 dname, fname = self.splitPath(name) |
| 2237 | 2237 |
