Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- branch
- eric7
- changeset 10214
- de0718b80010
- parent 10069
- 435cc5875135
- child 10215
- d476667171a1
equal
deleted
inserted
replaced
| 10213:0d0683edaf24 | 10214:de0718b80010 |
|---|---|
| 798 """ | 798 """ |
| 799 errMsg = "" | 799 errMsg = "" |
| 800 parents = [-1] | 800 parents = [-1] |
| 801 | 801 |
| 802 if int(rev) > 0: | 802 if int(rev) > 0: |
| 803 args = self.vcs.initCommand("parents") | 803 args = self.vcs.initCommand("log") |
| 804 if self.commandMode == "incoming": | 804 if self.commandMode == "incoming": |
| 805 if self.__bundle: | 805 if self.__bundle: |
| 806 args.append("--repository") | 806 args.extend(["--repository", self.__bundle]) |
| 807 args.append(self.__bundle) | |
| 808 elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): | 807 elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile): |
| 809 args.append("--repository") | 808 args.extend(["--repository", self.vcs.bundleFile]) |
| 810 args.append(self.vcs.bundleFile) | 809 args.extend(["--template", "{rev}\n", "-r", "parents({0})".format(rev)]) |
| 811 args.append("--template") | |
| 812 args.append("{rev}\n") | |
| 813 args.append("-r") | |
| 814 args.append(rev) | |
| 815 if not self.projectMode: | 810 if not self.projectMode: |
| 816 args.append(self.__filename) | 811 args.append(self.__filename) |
| 817 | 812 |
| 818 output, errMsg = self.__hgClient.runcommand(args) | 813 output, errMsg = self.__hgClient.runcommand(args) |
| 819 | 814 |
