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

remove self.repo from class Workbench

Workbench is no longer for a single repo alone

Changeset 44a6a3139d2b…

Parent f97e3992208c…

by Adrian Buehlmann

Changes to 4 files · Browse files at 44a6a3139d2b Showing diff from parent f97e3992208c Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​dialogmixin.py Stacked
 
38
39
40
41
42
43
44
 
 
45
46
47
 
108
109
110
111
112
 
 
113
114
115
 
130
131
132
133
134
 
 
38
39
40
 
 
 
 
41
42
43
44
45
 
106
107
108
 
 
109
110
111
112
113
 
128
129
130
 
 
131
@@ -38,10 +38,8 @@
  preferences.   The main class must define a '_ui_file' class attribute.   """ - def __init__(self): - # self.repo must be defined in actual class before calling __init__ - assert self.repo is not None - self.load_config() + def __init__(self, ui): + self.load_config(ui)     _path = osp.dirname(__file__)   uifile = osp.join(_path, self._uifile) @@ -108,8 +106,8 @@
  else:   self.close()   - def load_config(self): - cfg = HgConfig(self.repo.ui) + def load_config(self, ui): + cfg = HgConfig(ui)   fontstr = cfg.getFont()   font = QtGui.QFont()   try: @@ -130,5 +128,4 @@
  self.close()   def reject(self):   self.close() - - +
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
50
51
52
53
 
54
55
56
 
50
51
52
 
53
54
55
56
@@ -50,7 +50,7 @@
  def __init__(self, repo, filename, repoviewer=None):   self.repo = repo   QtGui.QMainWindow.__init__(self) - HgDialogMixin.__init__(self) + HgDialogMixin.__init__(self, self.repo.ui)     self.setRepoViewer(repoviewer)   self._show_rev = None
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
48
49
50
51
 
52
53
54
 
59
60
61
62
63
 
 
64
65
66
 
48
49
50
 
51
52
53
54
 
59
60
61
 
 
62
63
64
65
66
@@ -48,7 +48,7 @@
  def __init__(self, repo, noderev):   self.repo = repo   QtGui.QMainWindow.__init__(self) - HgDialogMixin.__init__(self) + HgDialogMixin.__init__(self, self.repo.ui)   self.setWindowTitle('Hg manifest viewer - %s:%s' % (repo.root, noderev))     # hg repo @@ -59,8 +59,8 @@
  self.createActions()   self.setupTextview()   - def load_config(self): - cfg = HgDialogMixin.load_config(self) + def load_config(self, ui): + cfg = HgDialogMixin.load_config(self, ui)   self.max_file_size = cfg.getMaxFileSize()     def setupModels(self):
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
44
45
46
47
48
49
50
 
53
54
55
56
 
57
58
59
 
70
71
72
73
 
74
75
76
 
355
356
357
358
359
 
 
360
361
362
 
44
45
46
 
47
48
49
 
52
53
54
 
55
56
57
58
 
69
70
71
 
72
73
74
75
 
354
355
356
 
 
357
358
359
360
361
@@ -44,7 +44,6 @@
  _uifile = 'workbench.ui'   def __init__(self, ui, repo, fromhead=None):   self.ui = ui - self.repo = repo     # these are used to know where to go after a reload   self._reload_rev = None @@ -53,7 +52,7 @@
  self._scanForRepoChanges = True     QtGui.QMainWindow.__init__(self) - HgDialogMixin.__init__(self) + HgDialogMixin.__init__(self, ui)     self.setWindowTitle('TortoiseHg Workbench')   @@ -70,7 +69,7 @@
    #self.textview_header.commitsignal.connect(self.commit)   - self.addRepoTab(self.repo, fromhead) + self.addRepoTab(repo, fromhead)   tw = self.repoTabsWidget   tw.removeTab(0)   self.repoTabChanged() @@ -355,8 +354,8 @@
  def prevDiff(self):   pass   - def load_config(self): - cfg = HgDialogMixin.load_config(self) + def load_config(self, ui): + cfg = HgDialogMixin.load_config(self, ui)   self.hidefinddelay = cfg.getHideFindDelay()     def file_displayed(self, filename):