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

Merge with stable

Changeset 12a03761db00…

Parents 01c172d76432…

Parents ad66f36fc6bc…

by Steve Borho

Changes to one file · Browse files at 12a03761db00 Showing diff from parent 01c172d76432 ad66f36fc6bc Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
103
104
105
 
 
 
 
 
106
107
 
 
 
 
 
108
109
110
 
154
155
156
 
 
 
157
 
 
 
 
 
 
 
 
 
 
158
159
160
 
179
180
181
 
182
183
184
 
103
104
105
106
107
108
109
110
111
 
112
113
114
115
116
117
118
119
 
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
 
201
202
203
204
205
206
207
@@ -103,8 +103,17 @@
  self.optbox.addWidget(self.showlog_chk)     self.discard_chk.setChecked(bool(opts.get('clean'))) + + #### Persisted Options + self.merge_chk.setChecked( + QSettings().value('update/merge', False).toBool()) +   self.autoresolve_chk.setChecked( - repo.ui.configbool('tortoisehg', 'autoresolve', False)) + repo.ui.configbool('tortoisehg', 'autoresolve', False) or + QSettings().value('update/autoresolve', False).toBool()) + + self.showlog_chk.setChecked( + QSettings().value('update/showlog', False).toBool())     ## command widget   self.cmd = cmdui.Widget(True, True, self) @@ -154,7 +163,20 @@
  if not self.update_btn.isEnabled():   self.rev_combo.lineEdit().selectAll() # need to change rev   + # expand options if a hidden one is checked + self.show_options(self.hiddenSettingIsChecked()) +   ### Private Methods ### + def hiddenSettingIsChecked(self): + if self.merge_chk.isChecked() or self.autoresolve_chk.isChecked() or self.showlog_chk.isChecked(): + return True + else: + return False + + def saveSettings(self): + QSettings().setValue('update/merge', self.merge_chk.isChecked()) + QSettings().setValue('update/autoresolve', self.autoresolve_chk.isChecked()) + QSettings().setValue('update/showlog', self.showlog_chk.isChecked())     def update_info(self):   self.p1_info.update(self.ctxs[0].node()) @@ -179,6 +201,7 @@
  self.update_btn.setDisabled(True)     def update(self): + self.saveSettings()   cmdline = ['update', '--repository', self.repo.root, '--verbose']   cmdline += ['--config', 'ui.merge=internal:' +   (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]