Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py
- branch
- maintenance
- changeset 8043
- 0acf98cd089a
- parent 7924
- 8a96736d465e
- parent 7971
- ff2971513d6d
- child 8142
- 43248bafe9b2
equal
deleted
inserted
replaced
| 7991:866adc8c315b | 8043:0acf98cd089a |
|---|---|
| 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 |
| 61 @param fn filename to be diffed (string) | 61 @param fn filename to be diffed (string) |
| 62 @keyparam versions list of versions to be diffed (list of up to | 62 @param versions list of versions to be diffed (list of up to |
| 63 2 strings or None) | 63 2 strings or None) |
| 64 @keyparam bundle name of a bundle file (string) | 64 @param bundle name of a bundle file (string) |
| 65 @keyparam qdiff flag indicating qdiff command shall be used (boolean) | 65 @param qdiff flag indicating qdiff command shall be used (boolean) |
| 66 @return flag indicating a successful start of the diff command | 66 @return flag indicating a successful start of the diff command |
| 67 (boolean) | 67 (boolean) |
| 68 """ | 68 """ |
| 69 if qdiff: | 69 if qdiff: |
| 70 args = self.vcs.initCommand("qdiff") | 70 args = self.vcs.initCommand("qdiff") |
| 97 elif rev2 is None: | 97 elif rev2 is None: |
| 98 args.append(rev1) | 98 args.append(rev1) |
| 99 elif rev1 is None: | 99 elif rev1 is None: |
| 100 args.append(':{0}'.format(rev2)) | 100 args.append(':{0}'.format(rev2)) |
| 101 | 101 |
| 102 if isinstance(fn, list): | 102 if fn: |
| 103 dname, fnames = self.vcs.splitPathList(fn) | 103 if isinstance(fn, list): |
| 104 self.vcs.addArguments(args, fn) | 104 self.vcs.addArguments(args, fn) |
| 105 else: | 105 else: |
| 106 dname, fname = self.vcs.splitPath(fn) | 106 args.append(fn) |
| 107 args.append(fn) | |
| 108 | 107 |
| 109 self.__oldFile = "" | 108 self.__oldFile = "" |
| 110 self.__oldFileLine = -1 | 109 self.__oldFileLine = -1 |
| 111 self.__fileSeparators = [] | 110 self.__fileSeparators = [] |
| 112 self.__output = [] | 111 self.__output = [] |
