737 not self.fname == "." and \ |
737 not self.fname == "." and \ |
738 not self.stopCheckBox.isChecked(): |
738 not self.stopCheckBox.isChecked(): |
739 args.append('--follow') |
739 args.append('--follow') |
740 if self.commandMode == "log": |
740 if self.commandMode == "log": |
741 args.append('--copies') |
741 args.append('--copies') |
742 args.append('--style') |
742 if self.vcs.version >= (3, 0): |
743 if self.vcs.version >= (2, 1): |
743 args.append('--template') |
744 args.append(os.path.join(os.path.dirname(__file__), |
744 args.append(os.path.join(os.path.dirname(__file__), |
745 "styles", |
745 "templates", |
746 "logBrowserBookmarkPhase.style")) |
746 "logBrowserBookmarkPhase.tmpl")) |
747 else: |
747 else: |
748 args.append(os.path.join(os.path.dirname(__file__), |
748 args.append('--style') |
749 "styles", |
749 if self.vcs.version >= (2, 1): |
750 "logBrowserBookmark.style")) |
750 args.append(os.path.join(os.path.dirname(__file__), |
|
751 "styles", |
|
752 "logBrowserBookmarkPhase.style")) |
|
753 else: |
|
754 args.append(os.path.join(os.path.dirname(__file__), |
|
755 "styles", |
|
756 "logBrowserBookmark.style")) |
751 if self.commandMode == "incoming": |
757 if self.commandMode == "incoming": |
752 if self.__bundle: |
758 if self.__bundle: |
753 args.append(self.__bundle) |
759 args.append(self.__bundle) |
754 elif not self.vcs.hasSubrepositories(): |
760 elif not self.vcs.hasSubrepositories(): |
755 project = e5App().getObject("Project") |
761 project = e5App().getObject("Project") |