Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

sync: add 'check' checkbox to update button

Closes #462

Changeset a9537c9a118a…

Parent fd21c82a6abf…

by Kyle Altendorf

Changes to one file · Browse files at a9537c9a118a Showing diff from parent fd21c82a6abf Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​synch.py Stacked
 
258
259
260
 
 
 
261
262
 
263
264
265
 
345
346
347
 
348
349
350
 
351
352
353
 
360
361
362
 
 
363
364
365
 
258
259
260
261
262
263
264
265
266
267
268
269
 
349
350
351
352
353
354
355
356
357
358
359
 
366
367
368
369
370
371
372
373
@@ -258,8 +258,12 @@
  self.viewpulled.connect('clicked', self._view_pulled_changes)   self.updatetip = gtk.Button(_('Update to branch tip'))   self.updatetip.connect('clicked', self._update_to_tip) + self.updatetipcheck = gtk.CheckButton(_('Check update')) + self.tips.set_tip(self.updatetipcheck, _('Force update unless there' + ' are uncommitted changes'))   self.buttonhbox.pack_start(self.viewpulled, False, False, 2)   self.buttonhbox.pack_start(self.updatetip, False, False, 2) + self.buttonhbox.pack_start(self.updatetipcheck, False, False, 2)   basevbox.pack_start(self.buttonhbox, False, False, 2)     # statusbar @@ -345,9 +349,11 @@
  parents = repo.parents()   if len(parents) > 1 or parents[0].node() == branchhead or not branchhead:   self.updatetip.hide() + self.updatetipcheck.hide()   else:   self.buttonhbox.show()   self.updatetip.show() + self.updatetipcheck.show()   self.repo = repo     def _view_pulled_changes(self, button): @@ -360,6 +366,8 @@
  gobject.timeout_add(10, self.process_queue)   self.write("", False)   cmdline = ['update', '-v'] + if self.updatetipcheck.get_active(): + cmdline += ['--check']   self.hgthread = hgthread.HgThread(cmdline)   self.hgthread.start()   self.stbar.begin()