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

filelistview: remove actionSecondParent, about to be relocated to HgFileView

Changeset 84a059455d24…

Parent 53ba8802ae68…

by Steve Borho

Changes to 3 files · Browse files at 84a059455d24 Showing diff from parent 53ba8802ae68 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
42
43
44
45
46
47
48
 
50
51
52
53
54
55
56
57
58
59
60
 
92
93
94
95
96
97
 
98
99
100
 
42
43
44
 
45
46
47
 
49
50
51
 
 
 
 
 
52
53
54
 
86
87
88
 
 
 
89
90
91
92
@@ -42,7 +42,6 @@
  self._files = []   self._filesdict = {}   self._fulllist = False - self._secondParent = False     @pyqtSlot(bool)   def toggleFullFileList(self, value): @@ -50,11 +49,6 @@
  self.loadFiles()   self.layoutChanged.emit()   - @pyqtSlot(bool) - def toggleSecondParent(self, value): - self._secondParent = value - self.layoutChanged.emit() -   def __len__(self):   return len(self._files)   @@ -92,9 +86,7 @@
  if len(self._ctx.parents()) < 2:   return None   row = index.row() - data = self._files[row] - if (data['wasmerged'] and self._secondParent) or \ - (data['parent'] == 1 and self._fulllist): + if self._fulllist and self._files[row]['parent'] == 1:   return self._ctx.p2().rev()   else:   return self._ctx.p1().rev()
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
57
58
59
60
61
62
63
64
 
69
70
71
72
73
74
75
76
77
 
78
79
80
 
93
94
95
96
97
98
99
 
105
106
107
108
109
110
111
112
113
114
 
213
214
215
216
217
218
219
220
221
222
223
224
 
57
58
59
 
 
60
61
62
 
67
68
69
 
 
 
 
 
 
70
71
72
73
 
86
87
88
 
89
90
91
 
97
98
99
 
100
101
 
102
103
104
 
203
204
205
 
 
 
 
 
 
206
207
208
@@ -57,8 +57,6 @@
  self.horizontalHeader().setResizeMode(1, QHeaderView.Stretch)   self.actionShowAllMerge.setChecked(False)   self.actionShowAllMerge.toggled.connect(model.toggleFullFileList) - self.actionSecondParent.setChecked(False) - self.actionSecondParent.toggled.connect(model.toggleSecondParent)   if model._ctx is not None:   self.contextChanged(model._ctx)   @@ -69,12 +67,7 @@
  self._actions[act].setEnabled(real)   for act in ['diff', 'revert']:   self._actions[act].setEnabled(real or wd) - if len(ctx.parents()) == 2: - self.actionShowAllMerge.setEnabled(True) - self.actionSecondParent.setEnabled(True) - else: - self.actionShowAllMerge.setEnabled(False) - self.actionSecondParent.setEnabled(False) + self.actionShowAllMerge.setEnabled(len(ctx.parents()) == 2)     def currentFile(self):   index = self.currentIndex() @@ -93,7 +86,6 @@
  self.selectRow(count-1)   else:   self.clearDisplay.emit() - self.actionSecondParent.setEnabled(False)   else:   # redisplay previous row   self.fileSelected() @@ -105,10 +97,8 @@
  if data:   fromRev = self.model().revFromIndex(index)   self.fileRevSelected.emit(data['path'], fromRev, data['status']) - self.actionSecondParent.setEnabled(data['wasmerged'])   else:   self.clearDisplay.emit() - self.actionSecondParent.setEnabled(False)     def selectFile(self, filename):   'Select given file, if found, else the first file' @@ -213,12 +203,6 @@
  _('Toggle display of all files and the direction they were merged'))   self.actionShowAllMerge.setCheckable(True)   self.actionShowAllMerge.setChecked(False) - self.actionSecondParent = QAction(_('Other'), self) - self.actionSecondParent.setToolTip( - _('Toggle display of diffs to second (other) parent')) - self.actionSecondParent.setCheckable(True) - self.actionSecondParent.setChecked(False) - self.actionSecondParent.setEnabled(False)     self._actions = {}   for name, desc, icon, key, tip, cb in [
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
186
187
188
189
190
191
192
 
186
187
188
 
189
190
191
@@ -186,7 +186,6 @@
  a.triggered.connect(lambda: self.updateToRevision.emit(self._last_rev))   self.filelistToolbar.addSeparator()   self.filelistToolbar.addAction(self.filelist.actionShowAllMerge) - self.filelistToolbar.addAction(self.filelist.actionSecondParent)     self.actionNextLine = QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)