Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
- changeset 425
- ca5e65413fc5
- parent 248
- f4561c24989a
- child 464
- a2b1d1770ef0
equal
deleted
inserted
replaced
| 424:d0915392cbd7 | 425:ca5e65413fc5 |
|---|---|
| 121 rev2 = self.__getVersionArg(versions[1]) | 121 rev2 = self.__getVersionArg(versions[1]) |
| 122 | 122 |
| 123 if rev1 is not None or rev2 is not None: | 123 if rev1 is not None or rev2 is not None: |
| 124 args.append('-r') | 124 args.append('-r') |
| 125 if rev1 is not None and rev2 is not None: | 125 if rev1 is not None and rev2 is not None: |
| 126 args.append('%s:%s' % (rev1, rev2)) | 126 args.append('{0}:{1}'.format(rev1, rev2)) |
| 127 elif rev2 is None: | 127 elif rev2 is None: |
| 128 args.append(rev1) | 128 args.append(rev1) |
| 129 elif rev1 is None: | 129 elif rev1 is None: |
| 130 args.append(rev2) | 130 args.append(rev2) |
| 131 | 131 |
| 132 self.summaryPath = None | 132 self.summaryPath = None |
| 133 if urls is not None: | 133 if urls is not None: |
| 134 if summary: | 134 if summary: |
| 135 args.append("--summarize") | 135 args.append("--summarize") |
| 136 self.summaryPath = urls[0] | 136 self.summaryPath = urls[0] |
| 137 args.append("--old=%s" % urls[0]) | 137 args.append("--old={0}".format(urls[0])) |
| 138 args.append("--new=%s" % urls[1]) | 138 args.append("--new={0}".format(urls[1])) |
| 139 if isinstance(fn, list): | 139 if isinstance(fn, list): |
| 140 dname, fnames = self.vcs.splitPathList(fn) | 140 dname, fnames = self.vcs.splitPathList(fn) |
| 141 else: | 141 else: |
| 142 dname, fname = self.vcs.splitPath(fn) | 142 dname, fname = self.vcs.splitPath(fn) |
| 143 fnames = [fname] | 143 fnames = [fname] |
| 267 if len(self.filename) > 1: | 267 if len(self.filename) > 1: |
| 268 fname = self.vcs.splitPathList(self.filename)[0] | 268 fname = self.vcs.splitPathList(self.filename)[0] |
| 269 else: | 269 else: |
| 270 dname, fname = self.vcs.splitPath(self.filename[0]) | 270 dname, fname = self.vcs.splitPath(self.filename[0]) |
| 271 if fname != '.': | 271 if fname != '.': |
| 272 fname = "%s.diff" % self.filename[0] | 272 fname = "{0}.diff".format(self.filename[0]) |
| 273 else: | 273 else: |
| 274 fname = dname | 274 fname = dname |
| 275 else: | 275 else: |
| 276 fname = self.vcs.splitPath(self.filename)[0] | 276 fname = self.vcs.splitPath(self.filename)[0] |
| 277 | 277 |
