Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

commit: simplify some functions

Changeset 5f3e32639044…

Parent de6e1529df1f…

by Steve Borho

Changes to 2 files · Browse files at 5f3e32639044 Showing diff from parent de6e1529df1f Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​commit.py Stacked
 
322
323
324
325
326
 
 
 
 
327
328
329
330
331
332
333
 
334
335
336
 
383
384
385
386
 
387
388
389
 
322
323
324
 
 
325
326
327
328
329
 
 
 
 
 
 
330
331
332
333
 
380
381
382
 
383
384
385
386
@@ -322,15 +322,12 @@
      def _check_merge(self): - # disable the checkboxes on the filelist if repo in merging state - merged = len(self.repo.changectx(None).parents()) > 1 + self.get_toolbutton(_('Re_vert')).set_sensitive(not self.merging) + self.get_toolbutton(_('_Add')).set_sensitive(not self.merging) + self.get_toolbutton(_('_Remove')).set_sensitive(not self.merging) + self.get_toolbutton(_('Move')).set_sensitive(not self.merging)   - self.get_toolbutton(_('Re_vert')).set_sensitive(not merged) - self.get_toolbutton(_('_Add')).set_sensitive(not merged) - self.get_toolbutton(_('_Remove')).set_sensitive(not merged) - self.get_toolbutton(_('Move')).set_sensitive(not merged) - - if merged: + if self.merging:   # select all changes if repo is merged   for entry in self.filemodel:   if entry[FM_STATUS] in 'MARD': @@ -383,7 +380,7 @@
  if not self._ready_message():   return True   - if len(self.repo.changectx(None).parents()) > 1: + if self.merging:   # as of Mercurial 1.0, merges must be committed without   # specifying file list.   self._hg_commit([])
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
212
213
214
215
216
 
217
218
219
 
212
213
214
 
 
215
216
217
218
@@ -212,8 +212,7 @@
      def get_body(self): - wctx = self.repo[None] - self.merging = len(wctx.parents()) == 2 + self.merging = len(self.repo.parents()) == 2     self.connect('map-event', self._displayed)