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

sync: fix post-pull save methods, remove extra config loads

Changeset 30b5e85be646…

Parent 7410ae2af49a…

by Steve Borho

Changes to one file · Browse files at 30b5e85be646 Showing diff from parent 7410ae2af49a Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
408
409
410
411
 
412
413
414
 
427
428
429
430
 
431
432
433
 
438
439
440
441
442
443
444
445
 
600
601
602
603
604
605
606
607
 
408
409
410
 
411
412
413
414
 
427
428
429
 
430
431
432
433
 
438
439
440
 
 
441
442
443
 
598
599
600
 
 
601
602
603
@@ -408,7 +408,7 @@
  layout.addWidget(bb)     def saveInRepo(self): - fn = os.path.join(self.root, '.hg', 'hgrc') + fn = os.path.join(self.repo.root, '.hg', 'hgrc')   self.saveToPath([fn])     def saveGlobal(self): @@ -427,7 +427,7 @@
  def saveToPath(self, path):   fn, cfg = loadIniFile(path, self)   if not hasattr(cfg, 'write'): - qtlib.WarningMsgBox(_('Unable to save authentication'), + qtlib.WarningMsgBox(_('Unable to save post pull operation'),   _('Iniparse must be installed.'), parent=self)   return   if fn is None: @@ -438,8 +438,6 @@
  except IOError, e:   qtlib.WarningMsgBox(_('Unable to write configuration file'),   hglib.tounicode(e), parent=self) - fn = os.path.join(self.root, '.hg', 'hgrc') - fn, cfg = loadIniFile([fn], self)   super(PostPullDialog, self).accept()     def reject(self): @@ -600,8 +598,6 @@
  except IOError, e:   qtlib.WarningMsgBox(_('Unable to write configuration file'),   hglib.tounicode(e), parent=self) - fn = os.path.join(self.root, '.hg', 'hgrc') - fn, cfg = loadIniFile([fn], self)   super(AuthDialog, self).accept()     def reject(self):