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

repowidget: drop reverse dependency to workbench

output, makeLogVisible and progress signals can go through RepoWidget's
signals respectively.

The connection of progress signal looks different, but eventually they pass
the same parameters to statusbar:

w.progress(...) -> statusbar.progress(..., self.repo.root) at repowidget
self.progress(...) -> statusbar.progress(..., repo.root) at workbench

Changeset 41cb584bfbe3…

Parent ce7349cd7331…

by Yuya Nishihara

Changes to one file · Browse files at 41cb584bfbe3 Showing diff from parent ce7349cd7331 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
57
58
59
60
61
 
 
62
63
64
65
66
67
68
69
70
 
227
228
229
230
231
232
233
234
 
 
 
235
236
237
 
266
267
268
269
270
271
272
273
274
 
 
 
275
276
277
 
371
372
373
374
375
376
377
 
 
 
378
379
380
 
57
58
59
 
 
60
61
62
63
64
65
66
 
67
68
69
 
226
227
228
 
 
 
 
 
229
230
231
232
233
234
 
263
264
265
 
 
 
 
 
 
266
267
268
269
270
271
 
365
366
367
 
 
 
 
368
369
370
371
372
373
@@ -57,14 +57,13 @@
  paircmenu = None   multicmenu = None   - def __init__(self, repo, workbench): - QWidget.__init__(self, acceptDrops=True) + def __init__(self, repo, parent=None): + QWidget.__init__(self, parent, acceptDrops=True)     self.repo = repo   repo.repositoryChanged.connect(self.repositoryChanged)   repo.repositoryDestroyed.connect(self.repositoryDestroyed)   repo.configChanged.connect(self.configChanged) - self.workbench = workbench   self.revsetfilter = False   self.branch = ''   self.bundle = None @@ -227,11 +226,9 @@
  b.setFont(f)   cw = CommitWidget(pats, opts, self.repo.root, True, self)   - # Shared widgets must be connected directly to workbench - cw.output.connect(self.workbench.log.output) - cw.progress.connect(lambda tp, p, i, u, tl: - self.workbench.statusbar.progress(tp, p, i, u, tl, self.repo.root)) - cw.makeLogVisible.connect(self.workbench.log.setShown) + cw.output.connect(self.output) + cw.progress.connect(self.progress) + cw.makeLogVisible.connect(self.makeLogVisible)     def openlink(link):   if unicode(link).startswith('subrepo:'): @@ -266,12 +263,9 @@
  sw = getattr(self.repo, '_syncwidget', None) # TODO: ugly   if not sw:   sw = SyncWidget(self.repo.root, True, self) - # Shared widgets must be connected directly to workbench - sw.output.connect(self.workbench.log.output) - sw.progress.connect(lambda tp, p, i, u, tl: - self.workbench.statusbar.progress(tp, p, i, u, tl, - self.repo.root)) - sw.makeLogVisible.connect(self.workbench.log.setShown) + sw.output.connect(self.output) + sw.progress.connect(self.progress) + sw.makeLogVisible.connect(self.makeLogVisible)   self.repo._syncwidget = sw   sw.outgoingNodes.connect(self.setOutgoingNodes)   sw.showMessage.connect(self.showMessage) @@ -371,10 +365,9 @@
    def createPatchBranchWidget(self):   pbw = PatchBranchWidget(self.repo, parent=self) - pbw.output.connect(self.workbench.log.output) - pbw.progress.connect(lambda tp, p, i, u, tl: - self.workbench.statusbar.progress(tp, p, i, u, tl, self.repo.root)) - pbw.makeLogVisible.connect(self.workbench.log.setShown) + pbw.output.connect(self.output) + pbw.progress.connect(self.progress) + pbw.makeLogVisible.connect(self.makeLogVisible)   return pbw     def updatePatchBranchTab(self):