Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

sync.py: check for existance of self.fetch

Changeset 981bcd6d840a…

Parent c62d01aeeabe…

by Johan Samyn

Changes to one file · Browse files at 981bcd6d840a Showing diff from parent c62d01aeeabe Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
378
379
380
 
 
381
382
383
 
418
419
420
421
 
422
423
424
 
378
379
380
381
382
383
384
385
 
420
421
422
 
423
424
425
426
@@ -378,6 +378,8 @@
  if 'fetch' in repo.extensions() or repo.postpull == 'fetch':   self.fetch = QRadioButton(_('Fetch - use fetch extension'))   layout.addWidget(self.fetch) + else: + self.fetch = None   if 'rebase' in repo.extensions() or repo.postpull == 'rebase':   self.rebase = QRadioButton(_('Rebase - use rebase extension'))   layout.addWidget(self.rebase) @@ -418,7 +420,7 @@
  return 'none'   elif self.update.isChecked():   return 'update' - elif self.fetch.isChecked(): + elif (self.fetch and self.fetch.isChecked()):   return 'fetch'   else:   return 'rebase'