Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- changeset 213
- 42bb97ff0bbb
- parent 207
- 3f889378dede
- child 215
- e8978dca44af
equal
deleted
inserted
replaced
| 212:19785b4c1bed | 213:42bb97ff0bbb |
|---|---|
| 82 if version == "WORKING": | 82 if version == "WORKING": |
| 83 return None | 83 return None |
| 84 else: | 84 else: |
| 85 return str(version) | 85 return str(version) |
| 86 | 86 |
| 87 def start(self, fn, versions = None): | 87 def start(self, fn, versions = None, bundle = None): |
| 88 """ | 88 """ |
| 89 Public slot to start the hg diff command. | 89 Public slot to start the hg diff command. |
| 90 | 90 |
| 91 @param fn filename to be diffed (string) | 91 @param fn filename to be diffed (string) |
| 92 @param versions list of versions to be diffed (list of up to 2 strings or None) | 92 @param versions list of versions to be diffed (list of up to 2 strings or None) |
| 93 @param bundle name of a bundle file (string) | |
| 93 """ | 94 """ |
| 94 self.errorGroup.hide() | 95 self.errorGroup.hide() |
| 95 self.inputGroup.show() | 96 self.inputGroup.show() |
| 96 self.intercept = False | 97 self.intercept = False |
| 97 self.filename = fn | 98 self.filename = fn |
| 104 args = [] | 105 args = [] |
| 105 args.append('diff') | 106 args.append('diff') |
| 106 self.vcs.addArguments(args, self.vcs.options['global']) | 107 self.vcs.addArguments(args, self.vcs.options['global']) |
| 107 self.vcs.addArguments(args, self.vcs.options['diff']) | 108 self.vcs.addArguments(args, self.vcs.options['diff']) |
| 108 | 109 |
| 109 if self.vcs.bundleFile: | 110 if bundle: |
| 111 args.append('--repository') | |
| 112 args.append(bundle) | |
| 113 elif self.vcs.bundleFile: | |
| 110 args.append('--repository') | 114 args.append('--repository') |
| 111 args.append(self.vcs.bundleFile) | 115 args.append(self.vcs.bundleFile) |
| 112 | 116 |
| 113 if versions is not None: | 117 if versions is not None: |
| 114 self.raise_() | 118 self.raise_() |
