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

manifestdialog: mark private methods and variables by _ prefix

Also changes some names to be more pythonic.

Changeset b8c79fc42cf3…

Parent d8b2fd559c06…

by Yuya Nishihara

Changes to one file · Browse files at b8c79fc42cf3 Showing diff from parent d8b2fd559c06 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
55
56
57
58
 
59
60
61
 
63
64
65
66
 
67
68
69
 
72
73
74
75
76
 
 
77
78
79
80
 
 
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
 
 
 
 
 
 
 
 
 
 
 
 
 
 
98
99
100
101
102
 
 
 
 
103
104
105
 
106
107
108
 
109
110
 
111
112
113
114
 
 
115
116
117
 
125
126
127
128
 
129
130
131
 
 
132
133
134
 
55
56
57
 
58
59
60
61
 
63
64
65
 
66
67
68
69
 
72
73
74
 
 
75
76
77
78
 
 
79
80
81
82
83
 
 
 
 
 
 
 
 
 
 
 
 
 
 
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
 
 
 
 
99
100
101
102
103
104
 
105
106
107
 
108
109
 
110
111
112
 
 
113
114
115
116
117
 
125
126
127
 
128
129
 
 
130
131
132
133
134
@@ -55,7 +55,7 @@
  s = QSettings()   self.restoreGeometry(s.value('manifest/geom').toByteArray())   # TODO: don't call deeply - self._manifest_widget.splitter.restoreState( + self._manifest_widget._splitter.restoreState(   s.value('manifest/splitter').toByteArray())     def _writesettings(self): @@ -63,7 +63,7 @@
  s.setValue('manifest/geom', self.saveGeometry())   # TODO: don't call deeply   s.setValue('manifest/splitter', - self._manifest_widget.splitter.saveState()) + self._manifest_widget._splitter.saveState())    class ManifestWidget(QWidget):   """Display file tree and contents at the specified revision""" @@ -72,46 +72,46 @@
  def __init__(self, ui, repo, rev=None, parent=None):   super(ManifestWidget, self).__init__(parent)   self._ui = ui - self.repo = repo - self.rev = rev + self._repo = repo + self._rev = rev     self._initwidget() - self.setupModels() - self.treeView.setCurrentIndex(self.treemodel.index(0, 0)) + self._initmodel() + self._treeview.setCurrentIndex(self._treemodel.index(0, 0))     def _initwidget(self):   self.setLayout(QVBoxLayout()) - self.splitter = QSplitter() - self.layout().addWidget(self.splitter) - self.treeView = QTreeView() - self.textView = QsciScintilla() - self.textView.setMarginLineNumbers(1, True) - self.textView.setMarginWidth(1, '000') - self.textView.setReadOnly(True) - self.textView.setFont(qtlib.getfont(self._ui, 'fontlog').font()) - self.textView.setUtf8(True) - self.textView.SendScintilla(QsciScintilla.SCI_SETSELEOLFILLED, True) - self.splitter.addWidget(self.treeView) - self.splitter.addWidget(self.textView) - self.splitter.setStretchFactor(0, 1) - self.splitter.setStretchFactor(1, 3) + self._splitter = QSplitter() + self.layout().addWidget(self._splitter) + self._treeview = QTreeView() + self._textview = QsciScintilla() + self._textview.setMarginLineNumbers(1, True) + self._textview.setMarginWidth(1, '000') + self._textview.setReadOnly(True) + self._textview.setFont(qtlib.getfont(self._ui, 'fontlog').font()) + self._textview.setUtf8(True) + self._textview.SendScintilla(QsciScintilla.SCI_SETSELEOLFILLED, True) + self._splitter.addWidget(self._treeview) + self._splitter.addWidget(self._textview) + self._splitter.setStretchFactor(0, 1) + self._splitter.setStretchFactor(1, 3)   - def setupModels(self): - self.treemodel = ManifestModel(self.repo, self.rev) - self.treeView.setModel(self.treemodel) - self.treeView.selectionModel().currentChanged.connect(self.fileSelected) + def _initmodel(self): + self._treemodel = ManifestModel(self._repo, self._rev) + self._treeview.setModel(self._treemodel) + self._treeview.selectionModel().currentChanged.connect(self._fileselected)     @pyqtSlot(QModelIndex) - def fileSelected(self, index): + def _fileselected(self, index):   if not index.isValid():   return - path = self.treemodel.pathFromIndex(index) + path = self._treemodel.pathFromIndex(index)   try: - fc = self.repo.changectx(self.rev).filectx(path) + fc = self._repo.changectx(self._rev).filectx(path)   except LookupError:   # may occur when a directory is selected - self.textView.setMarginWidth(1, '00') - self.textView.setText('') + self._textview.setMarginWidth(1, '00') + self._textview.setText('')   return     if fc.size() > self.max_file_size: @@ -125,10 +125,10 @@
  data = tounicode(data)   lexer = get_lexer(path, data, ui=self._ui)   if lexer: - self.textView.setLexer(lexer) + self._textview.setLexer(lexer)   nlines = data.count('\n') - self.textView.setMarginWidth(1, str(nlines)+'00') - self.textView.setText(data) + self._textview.setMarginWidth(1, str(nlines)+'00') + self._textview.setText(data)      def run(ui, *pats, **opts):