Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py
- branch
- maintenance
- changeset 8142
- 43248bafe9b2
- parent 8043
- 0acf98cd089a
- parent 8108
- a42ae6be4cc3
- child 8273
- 698ae46f40a4
equal
deleted
inserted
replaced
| 8044:874fdd14d3a2 | 8142:43248bafe9b2 |
|---|---|
| 50 @return version argument (string) | 50 @return version argument (string) |
| 51 """ | 51 """ |
| 52 if version == "WORKING": | 52 if version == "WORKING": |
| 53 return None | 53 return None |
| 54 else: | 54 else: |
| 55 return str(version) | 55 return str(version).strip() |
| 56 | 56 |
| 57 def start(self, fn, versions=None, bundle=None, qdiff=False): | 57 def start(self, fn, versions=None, bundle=None, qdiff=False): |
| 58 """ | 58 """ |
| 59 Public slot to start the hg diff command. | 59 Public slot to start the hg diff command. |
| 60 | 60 |
| 89 rev2 = None | 89 rev2 = None |
| 90 if len(versions) == 2: | 90 if len(versions) == 2: |
| 91 rev2 = self.__getVersionArg(versions[1]) | 91 rev2 = self.__getVersionArg(versions[1]) |
| 92 | 92 |
| 93 if rev1 is not None or rev2 is not None: | 93 if rev1 is not None or rev2 is not None: |
| 94 args.append('-r') | 94 if self.vcs.version >= (5, 7, 0): |
| 95 if rev1 is not None and rev2 is not None: | 95 if rev1 is not None: |
| 96 args.append('{0}:{1}'.format(rev1, rev2)) | 96 args += ["--from", rev1] |
| 97 elif rev2 is None: | 97 if rev2 is not None: |
| 98 args.append(rev1) | 98 args += ["--to", rev2] |
| 99 elif rev1 is None: | 99 else: |
| 100 args.append(':{0}'.format(rev2)) | 100 args.append('-r') |
| 101 if rev1 is not None and rev2 is not None: | |
| 102 args.append('{0}:{1}'.format(rev1, rev2)) | |
| 103 elif rev2 is None: | |
| 104 args.append(rev1) | |
| 105 elif rev1 is None: | |
| 106 args.append(':{0}'.format(rev2)) | |
| 101 | 107 |
| 102 if fn: | 108 if fn: |
| 103 if isinstance(fn, list): | 109 if isinstance(fn, list): |
| 104 self.vcs.addArguments(args, fn) | 110 self.vcs.addArguments(args, fn) |
| 105 else: | 111 else: |
