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

workbench: remove repo parameter from its constructor

'repo' isn't essential nor unique for Workbench.

Changeset d43fa1365e6d…

Parent 41f3ec5d6284…

by Yuya Nishihara

Changes to 2 files · Browse files at d43fa1365e6d Showing diff from parent 41f3ec5d6284 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
25
26
27
 
28
29
30
 
88
89
90
91
 
92
93
94
 
95
96
97
 
25
26
27
28
29
30
31
 
89
90
91
 
92
93
94
95
96
97
98
99
@@ -25,6 +25,7 @@
 from PyQt4.Qsci import QsciScintilla    from mercurial import hg +from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.qtlib import geticon  from tortoisehg.hgqt.dialogmixin import HgDialogMixin @@ -88,10 +89,11 @@
  if self.repoviewer is None:   # prevent recursive import   from workbench import Workbench - self.repoviewer = Workbench(self.repo.ui, self.repo) + self.repoviewer = Workbench(self.repo.ui)   self.repoviewer.show()   self.repoviewer.activateWindow()   self.repoviewer.raise_() + self.repoviewer.showRepo(hglib.tounicode(self.repo.root))   self.repoviewer.goto(self.repo.root, rev)    class FileLogDialog(_AbstractFileDialog):
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
36
37
38
39
 
40
41
42
 
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
 
101
102
103
 
609
610
611
612
 
613
614
615
616
 
 
 
 
 
36
37
38
 
39
40
41
42
 
81
82
83
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
84
85
86
87
 
593
594
595
 
596
597
598
 
 
599
600
601
602
@@ -36,7 +36,7 @@
  """hg repository viewer/browser application"""   finished = pyqtSignal(int)   - def __init__(self, ui, repo=None): + def __init__(self, ui):   self.ui = ui     self._reload_rev = None @@ -81,23 +81,7 @@
  self.setAcceptDrops(True)     for savedroot in self.savedrepos: - if repo and repo.root == savedroot: - # keep the passed-in repo at the saved position - self.addRepoTab(repo) - ti = self.repoTabsWidget.currentIndex() - else: - self._openRepo(path=savedroot) - if repo: - if repo.root in self.savedrepos: - # explicitly give focus to the passed-in repo - self.repoTabsWidget.setCurrentIndex(ti) - self.repoTabChanged() - else: - # open the passed-in repo last if it's not in the saved repos, - # so it gets focus automatically - self.addRepoTab(repo) - if not repo and not self.savedrepos: - self.reporegistry.setVisible(True) + self._openRepo(path=savedroot)     def load_config(self, ui):   # TODO: connect to font changed signal @@ -609,8 +593,10 @@
     def run(ui, *pats, **opts): - repo = None + w = Workbench(ui)   root = opts.get('root') or paths.find_root()   if root: - repo = thgrepo.repository(ui, path=root) - return Workbench(ui, repo) + w.showRepo(hglib.tounicode(root)) + if w.repoTabsWidget.count() <= 0: + w.reporegistry.setVisible(True) + return w