Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- changeset 424
- d0915392cbd7
- parent 248
- f4561c24989a
- child 537
- 72b32daeb8d6
equal
deleted
inserted
replaced
| 422:dd7c1558b1df | 424:d0915392cbd7 |
|---|---|
| 188 if dname: | 188 if dname: |
| 189 dname += "/" | 189 dname += "/" |
| 190 for name in fnames: | 190 for name in fnames: |
| 191 self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name)) | 191 self.__showError(self.trUtf8("Processing file '{0}'...\n").format(name)) |
| 192 if urls is not None: | 192 if urls is not None: |
| 193 url1 = "%s/%s%s" % (urls[0], dname, name) | 193 url1 = "{0}/{1}{2}".format(urls[0], dname, name) |
| 194 url2 = "%s/%s%s" % (urls[1], dname, name) | 194 url2 = "{0}/{1}{2}".format(urls[1], dname, name) |
| 195 if summary: | 195 if summary: |
| 196 diff_summary = self.client.diff_summarize(\ | 196 diff_summary = self.client.diff_summarize(\ |
| 197 url1, revision1 = rev1, | 197 url1, revision1 = rev1, |
| 198 url_or_path2 = url2, revision2 = rev2, | 198 url_or_path2 = url2, revision2 = rev2, |
| 199 recurse = recurse) | 199 recurse = recurse) |
| 200 diff_list = [] | 200 diff_list = [] |
| 201 for diff_sum in diff_summary: | 201 for diff_sum in diff_summary: |
| 202 diff_list.append("%s %s" % \ | 202 diff_list.append("{0} {1}".format( |
| 203 (self.__getDiffSummaryKind(diff_sum['summarize_kind']), | 203 self.__getDiffSummaryKind(diff_sum['summarize_kind']), |
| 204 diff_sum['path'])) | 204 diff_sum['path'])) |
| 205 diffText = os.linesep.join(diff_list) | 205 diffText = os.linesep.join(diff_list) |
| 206 else: | 206 else: |
| 207 diffText = self.client.diff(tmpdir, | 207 diffText = self.client.diff(tmpdir, |
| 208 url1, revision1 = rev1, | 208 url1, revision1 = rev1, |
| 209 url_or_path2 = url2, revision2 = rev2, | 209 url_or_path2 = url2, revision2 = rev2, |
| 216 else: | 216 else: |
| 217 diffText = self.client.diff(tmpdir, name, | 217 diffText = self.client.diff(tmpdir, name, |
| 218 revision1 = rev1, revision2 = rev2, recurse = recurse) | 218 revision1 = rev1, revision2 = rev2, recurse = recurse) |
| 219 counter = 0 | 219 counter = 0 |
| 220 for line in diffText.splitlines(): | 220 for line in diffText.splitlines(): |
| 221 self.__appendText("%s%s" % (line, os.linesep)) | 221 self.__appendText("{0}{1}".format(line, os.linesep)) |
| 222 counter += 1 | 222 counter += 1 |
| 223 if counter == 30: | 223 if counter == 30: |
| 224 # check for cancel every 30 lines | 224 # check for cancel every 30 lines |
| 225 counter = 0 | 225 counter = 0 |
| 226 if self._clientCancelCallback(): | 226 if self._clientCancelCallback(): |
| 304 if len(self.filename) > 1: | 304 if len(self.filename) > 1: |
| 305 fname = self.vcs.splitPathList(self.filename)[0] | 305 fname = self.vcs.splitPathList(self.filename)[0] |
| 306 else: | 306 else: |
| 307 dname, fname = self.vcs.splitPath(self.filename[0]) | 307 dname, fname = self.vcs.splitPath(self.filename[0]) |
| 308 if fname != '.': | 308 if fname != '.': |
| 309 fname = "%s.diff" % self.filename[0] | 309 fname = "{0}.diff".format(self.filename[0]) |
| 310 else: | 310 else: |
| 311 fname = dname | 311 fname = dname |
| 312 else: | 312 else: |
| 313 fname = self.vcs.splitPath(self.filename)[0] | 313 fname = self.vcs.splitPath(self.filename)[0] |
| 314 | 314 |
