Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- changeset 564
- b3d966393ba9
- parent 553
- 5af61623ae3c
- child 791
- 9ec2ac20e54e
equal
deleted
inserted
replaced
| 563:e35d2cda9a74 | 564:b3d966393ba9 |
|---|---|
| 192 self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name)) | 192 self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name)) |
| 193 if urls is not None: | 193 if urls is not None: |
| 194 url1 = "{0}/{1}{2}".format(urls[0], dname, name) | 194 url1 = "{0}/{1}{2}".format(urls[0], dname, name) |
| 195 url2 = "{0}/{1}{2}".format(urls[1], dname, name) | 195 url2 = "{0}/{1}{2}".format(urls[1], dname, name) |
| 196 if summary: | 196 if summary: |
| 197 diff_summary = self.client.diff_summarize(\ | 197 diff_summary = self.client.diff_summarize( |
| 198 url1, revision1 = rev1, | 198 url1, revision1 = rev1, |
| 199 url_or_path2 = url2, revision2 = rev2, | 199 url_or_path2 = url2, revision2 = rev2, |
| 200 recurse = recurse) | 200 recurse = recurse) |
| 201 diff_list = [] | 201 diff_list = [] |
| 202 for diff_sum in diff_summary: | 202 for diff_sum in diff_summary: |
| 233 locker.unlock() | 233 locker.unlock() |
| 234 os.chdir(cwd) | 234 os.chdir(cwd) |
| 235 self.__finish() | 235 self.__finish() |
| 236 | 236 |
| 237 if self.paras == 0: | 237 if self.paras == 0: |
| 238 self.contents.insertPlainText(\ | 238 self.contents.insertPlainText( |
| 239 self.trUtf8('There is no difference.')) | 239 self.trUtf8('There is no difference.')) |
| 240 return | 240 return |
| 241 | 241 |
| 242 self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) | 242 self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True) |
| 243 | 243 |
| 311 else: | 311 else: |
| 312 fname = dname | 312 fname = dname |
| 313 else: | 313 else: |
| 314 fname = self.vcs.splitPath(self.filename)[0] | 314 fname = self.vcs.splitPath(self.filename)[0] |
| 315 | 315 |
| 316 fname, selectedFilter = QFileDialog.getSaveFileNameAndFilter(\ | 316 fname, selectedFilter = QFileDialog.getSaveFileNameAndFilter( |
| 317 self, | 317 self, |
| 318 self.trUtf8("Save Diff"), | 318 self.trUtf8("Save Diff"), |
| 319 fname, | 319 fname, |
| 320 self.trUtf8("Patch Files (*.diff)"), | 320 self.trUtf8("Patch Files (*.diff)"), |
| 321 None, | 321 None, |
