Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

reporegistry: add "Show Subrepos for remote repositories" toggle to the View menu

I am not particularly pleased with the wording of the menu option. It is perhaps
a little bit too verbose.

Changeset 3be19a77f9f9…

Parent e07940b1be60…

by Angel Ezquerra

Changes to 4 files · Browse files at 3be19a77f9f9 Showing diff from parent e07940b1be60 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
 
180
181
182
183
 
184
185
186
 
 
187
188
189
 
197
198
199
200
 
 
201
202
203
 
215
216
217
 
 
 
 
218
219
220
221
 
222
223
224
 
180
181
182
 
183
184
185
186
187
188
189
190
191
 
199
200
201
 
202
203
204
205
206
 
218
219
220
221
222
223
224
225
226
227
 
228
229
230
231
@@ -180,10 +180,12 @@
  showMessage = pyqtSignal(QString)   openRepo = pyqtSignal(QString, bool)   - def __init__(self, parent, showSubrepos=True): + def __init__(self, parent, showSubrepos=True, showNetworkSubrepos=True):   QDockWidget.__init__(self, parent)     self.showSubrepos = showSubrepos + self.showNetworkSubrepos = showNetworkSubrepos +   self.setFeatures(QDockWidget.DockWidgetClosable |   QDockWidget.DockWidgetMovable |   QDockWidget.DockWidgetFloatable) @@ -197,7 +199,8 @@
  self.contextmenu = QMenu(self)   self.tview = tv = RepoTreeView(self)   tv.setModel(repotreemodel.RepoTreeModel(settingsfilename(), self, - showSubrepos=self.showSubrepos)) + showSubrepos=self.showSubrepos, + showNetworkSubrepos=self.showNetworkSubrepos))   mainframe.layout().addWidget(tv)     tv.setIndentation(10) @@ -215,10 +218,14 @@
  self.showSubrepos = show   self.reloadModel()   + def setShowNetworkSubrepos(self, show): + self.showNetworkSubrepos = show + self.reloadModel() +   def reloadModel(self):   self.tview.setModel(   repotreemodel.RepoTreeModel(settingsfilename(), self, - self.showSubrepos)) + self.showSubrepos, self.showNetworkSubrepos))   self.expand()     def expand(self):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repotreeitem.py Stacked
 
10
11
12
13
 
14
15
16
 
215
216
217
218
 
 
 
 
219
220
221
 
10
11
12
 
13
14
15
16
 
215
216
217
 
218
219
220
221
222
223
224
@@ -10,7 +10,7 @@
 from mercurial import node  from mercurial import ui, hg, util, error   -from tortoisehg.util import hglib +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib  from tortoisehg.hgqt import thgrepo @@ -215,7 +215,10 @@
  self._basenode = node.bin(str(a.value('', 'basenode').toString()))   RepoTreeItem.undump(self, xr)   - if self.model and self.model.showSubrepos: + if self.model \ + and (self.model.showSubrepos \ + or (not self.model.showNetworkSubrepos + and paths.netdrive_status(self._root))):   def addSubrepos(ri, repo):   invalidRepoList = []   try:
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repotreemodel.py Stacked
 
7
8
9
10
 
11
12
13
14
 
15
16
17
 
64
65
66
67
 
 
68
69
70
 
 
71
72
73
 
231
232
233
234
 
 
235
236
237
 
7
8
9
 
10
11
12
13
14
15
16
17
18
 
65
66
67
 
68
69
70
71
 
72
73
74
75
76
 
234
235
236
 
237
238
239
240
241
@@ -7,11 +7,12 @@
   from mercurial import ui, hg, util, error   -from tortoisehg.util import hglib +from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib  from tortoisehg.hgqt import thgrepo   +  from repotreeitem import undumpObject, AllRepoGroupItem, RepoGroupItem  from repotreeitem import RepoItem, SubrepoItem, RepoTreeItem   @@ -64,10 +65,12 @@
   class RepoTreeModel(QAbstractItemModel):   - def __init__(self, filename, parent, showSubrepos=True): + def __init__(self, filename, parent, showSubrepos=True, + showNetworkSubrepos=True):   QAbstractItemModel.__init__(self, parent)   - self.showSubrepos=showSubrepos + self.showSubrepos = showSubrepos + self.showNetworkSubrepos = showNetworkSubrepos     root = None   all = None @@ -231,7 +234,8 @@
  self.beginInsertRows(grp, row, row)   rgi.insertChild(row, RepoItem(self, root))   - if not self.showSubrepos: + if not self.showSubrepos \ + or (not self.showNetworkSubrepos and paths.netdrive_status(root)):   self.endInsertRows()   return  
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
220
221
222
223
 
 
 
 
 
 
 
224
225
226
 
749
750
751
 
 
752
753
754
 
772
773
774
 
 
 
775
776
777
 
220
221
222
 
223
224
225
226
227
228
229
230
231
232
 
755
756
757
758
759
760
761
762
 
780
781
782
783
784
785
786
787
788
@@ -220,7 +220,13 @@
  checkable=True, menu='view')     self.actionShowSubrepos = \ - newaction(_("Show Subrepos on Registry"), self.reporegistry.setShowSubrepos, + newaction(_("Show Subrepos on Registry"), + self.reporegistry.setShowSubrepos, + checkable=True, menu='view') + + self.actionShowNetworkSubrepos = \ + newaction(_("Show Subrepos for remote repositories"), + self.reporegistry.setShowNetworkSubrepos,   checkable=True, menu='view')     a = self.log.toggleViewAction() @@ -749,6 +755,8 @@
  s.setValue(wb + 'windowState', self.saveState())   s.setValue(wb + 'showPaths', self.actionShowPaths.isChecked())   s.setValue(wb + 'showSubrepos', self.actionShowSubrepos.isChecked()) + s.setValue(wb + 'showNetworkSubrepos', + self.actionShowNetworkSubrepos.isChecked())   s.setValue(wb + 'saveRepos', self.actionSaveRepos.isChecked())   repostosave = []   if self.actionSaveRepos.isChecked(): @@ -772,6 +780,9 @@
  QTimer.singleShot(0, lambda: self.actionShowPaths.setChecked(sp))   ssr = s.value(wb + 'showSubrepos', defaultValue=QVariant(True)).toBool()   QTimer.singleShot(0, lambda: self.actionShowSubrepos.setChecked(ssr)) + snsr = s.value(wb + 'showNetworkSubrepos', + defaultValue=QVariant(True)).toBool() + QTimer.singleShot(0, lambda: self.actionShowNetworkSubrepos.setChecked(ssr))     def goto(self, root, rev):   for rw in self._findrepowidget(root):