Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable update: add checkbox for --verbose

Changeset ddf3dce6c1c8…

Parent 6df5fd91acab…

by Steve Borho

Changes to one file · Browse files at ddf3dce6c1c8 Showing diff from parent 6df5fd91acab Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
91
92
93
 
94
95
96
97
98
99
 
100
101
102
103
104
 
 
105
106
107
 
110
111
112
113
 
114
115
116
 
 
117
118
119
 
174
175
176
 
177
178
179
 
202
203
204
205
 
 
 
206
207
208
 
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
 
114
115
116
 
117
118
 
 
119
120
121
122
123
 
178
179
180
181
182
183
184
 
207
208
209
 
210
211
212
213
214
215
@@ -91,17 +91,21 @@
  self.grid.addWidget(expander, row, 0, Qt.AlignLeft | Qt.AlignTop)   self.grid.addLayout(self.optbox, row, 1)   + self.verbose_chk = QCheckBox(_('List updated files (--verbose)'))   self.discard_chk = QCheckBox(_('Discard local changes, no backup '   '(-C/--clean)'))   self.merge_chk = QCheckBox(_('Always merge (when possible)'))   self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts '   'where possible'))   self.showlog_chk = QCheckBox(_('Always show command log')) + self.optbox.addWidget(self.verbose_chk)   self.optbox.addWidget(self.discard_chk)   self.optbox.addWidget(self.merge_chk)   self.optbox.addWidget(self.autoresolve_chk)   self.optbox.addWidget(self.showlog_chk)   + s = QSettings() +   self.discard_chk.setChecked(bool(opts.get('clean')))     #### Persisted Options @@ -110,10 +114,10 @@
    self.autoresolve_chk.setChecked(   repo.ui.configbool('tortoisehg', 'autoresolve', False) or - QSettings().value('update/autoresolve', False).toBool()) + s.value('update/autoresolve', False).toBool())   - self.showlog_chk.setChecked( - QSettings().value('update/showlog', False).toBool()) + self.showlog_chk.setChecked(s.value('update/showlog', False).toBool()) + self.verbose_chk.setChecked(s.value('update/verbose', False).toBool())     ## command widget   self.cmd = cmdui.Widget(True, True, self) @@ -174,6 +178,7 @@
  return False     def saveSettings(self): + QSettings().setValue('update/verbose', self.verbose_chk.isChecked())   QSettings().setValue('update/merge', self.merge_chk.isChecked())   QSettings().setValue('update/autoresolve', self.autoresolve_chk.isChecked())   QSettings().setValue('update/showlog', self.showlog_chk.isChecked()) @@ -202,7 +207,9 @@
    def update(self):   self.saveSettings() - cmdline = ['update', '--repository', self.repo.root, '--verbose'] + cmdline = ['update', '--repository', self.repo.root] + if self.verbose_chk.isChecked(): + cmdline += ['--verbose']   cmdline += ['--config', 'ui.merge=internal:' +   (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]   rev = hglib.fromunicode(self.rev_combo.currentText())