Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Mon, 27 Dec 2010 19:31:47 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 27 Dec 2010 19:31:47 +0100
- changeset 783
- 2c59c7893d30
- parent 782
- 2c567a5ceade (current diff)
- parent 779
- 04c3a6026543 (diff)
- child 784
- 3893c2537fb4
Merged remote changes.
| Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Dec 27 19:30:07 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Dec 27 19:31:47 2010 +0100 @@ -86,6 +86,10 @@ self.limitSpinBox.setValue(self.vcs.getPlugin().getPreferences("LogLimit")) self.stopCheckBox.setChecked(self.vcs.getPlugin().getPreferences("StopLogOnCopy")) + if mode in ("incoming", "outgoing"): + self.nextButton.setEnabled(False) + self.limitSpinBox.setEnabled(False) + self.__messageRole = Qt.UserRole self.__changesRole = Qt.UserRole + 1 self.__edgesRole = Qt.UserRole + 2 @@ -513,8 +517,9 @@ self.vcs.addArguments(args, self.vcs.options['global']) self.vcs.addArguments(args, self.vcs.options['log']) args.append('--verbose') - args.append('--limit') - args.append(str(self.limitSpinBox.value())) + if self.commandMode not in ("incoming", "outgoing"): + args.append('--limit') + args.append(str(self.limitSpinBox.value())) if self.commandMode in ("incoming", "outgoing"): args.append("--newest-first") if startRev is not None:
