Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc2, 0.4rc3, and 0.4rc4

hggtk/commit: disable filelist checkboxes if repo is merging

Changeset 73fbe9116e7b…

Parent 48135894ad8b…

by TK Soh

Changes to one file · Browse files at 73fbe9116e7b Showing diff from parent 48135894ad8b Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
181
182
183
 
 
 
 
 
 
 
184
185
 
 
 
 
 
 
 
 
 
 
 
 
186
187
188
 
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
@@ -181,8 +181,27 @@
  live = True   return live   + + def reload_status(self): + success = GStatus.reload_status(self) + self._check_merge() + return success + +   ### End of overridable methods ###   + def _check_merge(self): + # disable the checkboxes on the filelist if repo in merging state + merged = len(self.repo.workingctx().parents()) > 1 + cbcell = self.tree.get_column(0).get_cell_renderers()[0] + cbcell.set_property("activatable", not merged) + + # select all changes if repo is merged + if merged: + for entry in self.model: + if entry[1] in 'MARD': + entry[0] = True +     def _commit_clicked(self, toolbutton, data=None):   if not self._ready_message():