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

sync: remove redundant self.root variables

Changeset 9c6ac7db874c…

Parent d83929747b3b…

by Steve Borho

Changes to one file · Browse files at 9c6ac7db874c Showing diff from parent d83929747b3b Diff from another changeset...

Change 1 of 14 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
44
45
46
47
48
49
50
 
271
272
273
274
 
275
276
277
 
605
606
607
608
 
 
609
610
611
 
616
617
618
619
 
620
621
622
 
643
644
645
646
 
647
648
649
 
668
669
670
671
 
672
673
674
675
676
 
677
678
679
 
717
718
719
720
 
721
722
723
 
727
728
729
730
 
731
732
733
 
755
756
757
758
 
759
760
761
762
763
764
765
 
766
767
768
 
860
861
862
863
 
864
865
866
 
887
888
889
890
891
892
893
 
916
917
918
919
 
920
921
922
 
947
948
949
950
951
952
953
 
994
995
996
997
 
998
999
1000
 
44
45
46
 
47
48
49
 
270
271
272
 
273
274
275
276
 
604
605
606
 
607
608
609
610
611
 
616
617
618
 
619
620
621
622
 
643
644
645
 
646
647
648
649
 
668
669
670
 
671
672
673
674
675
 
676
677
678
679
 
717
718
719
 
720
721
722
723
 
727
728
729
 
730
731
732
733
 
755
756
757
 
758
759
760
761
762
763
764
 
765
766
767
768
 
860
861
862
 
863
864
865
866
 
887
888
889
 
890
891
892
 
915
916
917
 
918
919
920
921
 
946
947
948
 
949
950
951
 
992
993
994
 
995
996
997
998
@@ -44,7 +44,6 @@
  self.setLayout(layout)   self.setAcceptDrops(True)   - self.root = repo.root   self.repo = repo   self.finishfunc = None   self.curuser = None @@ -271,7 +270,7 @@
  def reload(self):   # Refresh configured paths   self.paths = {} - fn = os.path.join(self.root, '.hg', 'hgrc') + fn = self.repo.join('hgrc')   fn, cfg = loadIniFile([fn], self)   if 'paths' in cfg:   for alias in cfg['paths']: @@ -605,7 +604,8 @@
  if os.path.exists(bfile):   os.unlink(bfile)   self.finishfunc = finished - cmdline = ['--repository', self.root, 'incoming', '--bundle', bfile] + cmdline = ['--repository', self.repo.root, 'incoming', + '--bundle', bfile]   self.run(cmdline, ('force', 'branch', 'rev'))   else:   def finished(ret, output): @@ -616,7 +616,7 @@
  else:   self.showMessage.emit(_('Incoming aborted, ret %d') % ret)   self.finishfunc = finished - cmdline = ['--repository', self.root, 'incoming'] + cmdline = ['--repository', self.repo.root, 'incoming']   self.run(cmdline, ('force', 'branch', 'rev', 'subrepos'))     def pullclicked(self): @@ -643,7 +643,7 @@
  return   self.finishfunc = finished   self.showMessage.emit(_('Pulling...')) - cmdline = ['--repository', self.root, 'pull', '--verbose'] + cmdline = ['--repository', self.repo.root, 'pull', '--verbose']   uimerge = self.repo.ui.configbool('tortoisehg', 'autoresolve') \   and 'ui.merge=internal:merge' or 'ui.merge=internal:fail'   if self.cachedpp == 'rebase': @@ -668,12 +668,12 @@
  else:   self.showMessage.emit(_('Outgoing aborted, ret %d') % ret)   self.finishfunc = outputnodes - cmdline = ['--repository', self.root, 'outgoing', '--quiet', + cmdline = ['--repository', self.repo.root, 'outgoing', '--quiet',   '--template', '{node}\n']   self.run(cmdline, ('force', 'branch', 'rev'))   else:   self.finishfunc = None - cmdline = ['--repository', self.root, 'outgoing'] + cmdline = ['--repository', self.repo.root, 'outgoing']   self.run(cmdline, ('force', 'branch', 'rev', 'subrepos'))     def p4pending(self): @@ -717,7 +717,7 @@
  dlg.exec_()   self.finishfunc = finished   self.showMessage.emit(_('Perforce pending...')) - self.run(['--repository', self.root, 'p4pending', '--verbose'], ()) + self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())     def pushclicked(self):   self.showMessage.emit(_('Pushing...')) @@ -727,7 +727,7 @@
  else:   self.showMessage.emit(_('Push aborted, ret %d') % ret)   self.finishfunc = finished - cmdline = ['--repository', self.root, 'push'] + cmdline = ['--repository', self.repo.root, 'push']   self.run(cmdline, ('force', 'new-branch', 'branch', 'rev'))     def postpullclicked(self): @@ -755,14 +755,14 @@
  else:   self.showMessage.emit(_('Outgoing aborted, ret %d') % ret)   self.finishfunc = outputnodes - cmdline = ['--repository', self.root, 'outgoing', '--quiet', + cmdline = ['--repository', self.repo.root, 'outgoing', '--quiet',   '--template', '{node}\n']   self.run(cmdline, ('force', 'branch', 'rev'))     @pyqtSlot(QString)   def removeAlias(self, alias):   alias = hglib.fromunicode(alias) - fn = os.path.join(self.root, '.hg', 'hgrc') + fn = self.repo.join('hgrc')   fn, cfg = loadIniFile([fn], self)   if not hasattr(cfg, 'write'):   qtlib.WarningMsgBox(_('Unable to remove URL'), @@ -860,7 +860,7 @@
  return 'rebase'     def accept(self): - path = os.path.join(self.repo.root, '.hg', 'hgrc') + path = self.repo.join('hgrc')   fn, cfg = loadIniFile([path], self)   if not hasattr(cfg, 'write'):   qtlib.WarningMsgBox(_('Unable to save post pull operation'), @@ -887,7 +887,6 @@
  def __init__(self, repo, alias, url, parent):   super(SaveDialog, self).__init__(parent)   self.repo = repo - self.root = repo.root   layout = QVBoxLayout()   self.setLayout(layout)   hbox = QHBoxLayout() @@ -916,7 +915,7 @@
  QTimer.singleShot(0, lambda:self.aliasentry.setFocus())     def accept(self): - fn = os.path.join(self.root, '.hg', 'hgrc') + fn = self.repo.join('hgrc')   fn, cfg = loadIniFile([fn], self)   if not hasattr(cfg, 'write'):   qtlib.WarningMsgBox(_('Unable to save an URL'), @@ -947,7 +946,6 @@
  def __init__(self, repo, host, user, pw, parent):   super(AuthDialog, self).__init__(parent)   self.repo = repo - self.root = repo.root   self.setLayout(QVBoxLayout())     form = QFormLayout() @@ -994,7 +992,7 @@
  if self.globalcb:   path = util.user_rcpath()   else: - path = [os.path.join(self.root, '.hg', 'hgrc')] + path = [self.repo.join('hgrc')]     fn, cfg = loadIniFile(path, self)   if not hasattr(cfg, 'write'):