Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- changeset 1326
- bf3fcb446da5
- parent 1318
- 6fa303bd65d6
- child 1503
- 4e48604157a4
equal
deleted
inserted
replaced
| 1325:8dd723182a16 | 1326:bf3fcb446da5 |
|---|---|
| 152 self.inputGroup.setEnabled(False) | 152 self.inputGroup.setEnabled(False) |
| 153 self.inputGroup.hide() | 153 self.inputGroup.hide() |
| 154 | 154 |
| 155 out, err = self.__hgClient.runcommand(args) | 155 out, err = self.__hgClient.runcommand(args) |
| 156 | 156 |
| 157 if err: | |
| 158 self.__showError(err) | |
| 157 if out: | 159 if out: |
| 158 for line in out.splitlines(True): | 160 for line in out.splitlines(True): |
| 159 self.__processOutputLine(line) | 161 self.__processOutputLine(line) |
| 160 if self.__hgClient.wasCanceled(): | 162 if self.__hgClient.wasCanceled(): |
| 161 break | 163 break |
| 162 | |
| 163 if err: | |
| 164 self.__showError(err) | |
| 165 | 164 |
| 166 self.__finish() | 165 self.__finish() |
| 167 else: | 166 else: |
| 168 # find the root of the repo | 167 # find the root of the repo |
| 169 repodir = dname | 168 repodir = dname |
