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

rejects: add resolved/unresolved buttons

Changeset c03622503d79…

Parent 7f17cd53d1ce…

by Steve Borho

Changes to one file · Browse files at c03622503d79 Showing diff from parent 7f17cd53d1ce Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
23
24
25
 
26
27
28
 
51
52
53
54
 
 
55
 
56
57
58
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
60
61
 
64
65
66
 
 
67
68
69
 
87
88
89
90
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
91
92
93
94
 
95
96
97
 
100
101
102
 
 
103
104
105
 
23
24
25
26
27
28
29
 
52
53
54
 
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
 
83
84
85
86
87
88
89
90
 
108
109
110
 
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
 
148
149
150
151
 
154
155
156
157
158
159
160
161
@@ -23,6 +23,7 @@
 qsci = Qsci.QsciScintilla    # TODO +# improve scrolling of qsci, often cursor is not visible  # pass ui to patchctx.longsummary() so patchctx does not need a repository    class RejectsDialog(QDialog): @@ -51,11 +52,29 @@
  self.layout().addWidget(searchbar)     hbox = QHBoxLayout() - self.layout().addLayout(hbox) + hbox.setContentsMargins(2, 2, 2, 2) + self.layout().addLayout(hbox, 1)   self.chunklist = QListWidget(self) + self.updating = True   self.chunklist.currentRowChanged.connect(self.showChunk)   hbox.addWidget(self.chunklist, 1)   + bvbox = QVBoxLayout() + bvbox.setContentsMargins(2, 2, 2, 2) + self.resolved = tb = QToolButton() + tb.setIcon(qtlib.geticon('success')) + tb.setToolTip(_('Mark this chunk as resolved, goto next unresolved')) + tb.pressed.connect(self.resolveCurrentChunk) + self.unresolved = tb = QToolButton() + tb.setIcon(qtlib.geticon('warning')) + tb.setToolTip(_('Mark this chunk as unresolved')) + tb.pressed.connect(self.unresolveCurrentChunk) + bvbox.addStretch(1) + bvbox.addWidget(self.resolved, 0) + bvbox.addWidget(self.unresolved, 0) + bvbox.addStretch(1) + hbox.addLayout(bvbox, 0) +   self.rejectbrowser = RejectBrowser(self)   hbox.addWidget(self.rejectbrowser, 5)   @@ -64,6 +83,8 @@
  bb.accepted.connect(self.accept)   bb.rejected.connect(self.reject)   self.layout().addWidget(bb) + self.saveButton = bb.button(BB.Save) + self.saveButton.setEnabled(False)     s = QSettings()   self.restoreGeometry(s.value('rejects/geometry').toByteArray()) @@ -87,11 +108,44 @@
  buf.seek(0)   self.chunks = record.parsepatch(buf)[1:]   for chunk in self.chunks: - self.chunklist.addItem('@@ %d' % chunk.fromline) + chunk.resolved = False + self.updateChunkList() + self.chunklist.setCurrentRow(0) + + def updateChunkList(self): + self.updating = True + self.chunklist.clear() + for chunk in self.chunks: + self.chunklist.addItem('@@ %d %s' % (chunk.fromline, + chunk.resolved and '(resolved)' or '(unresolved)')) + self.updating = False + + @pyqtSlot() + def resolveCurrentChunk(self): + row = self.chunklist.currentRow() + chunk = self.chunks[row] + chunk.resolved = True + self.updateChunkList() + for i, chunk in enumerate(self.chunks): + if not chunk.resolved: + self.chunklist.setCurrentRow(i) + return + else: + self.chunklist.setCurrentRow(row) + self.saveButton.setEnabled(True) + + @pyqtSlot() + def unresolveCurrentChunk(self): + row = self.chunklist.currentRow() + chunk = self.chunks[row] + chunk.resolved = False + self.updateChunkList() + self.chunklist.setCurrentRow(row) + self.saveButton.setEnabled(False)     @pyqtSlot(int)   def showChunk(self, row): - if row == -1: + if row == -1 or self.updating:   return   buf = cStringIO.StringIO()   chunk = self.chunks[row] @@ -100,6 +154,8 @@
  self.editor.setCursorPosition(chunk.fromline-1, 0)   self.editor.markerDeleteAll(-1)   self.editor.markerAdd(chunk.fromline-1, self.baseLineColor) + self.resolved.setEnabled(not chunk.resolved) + self.unresolved.setEnabled(chunk.resolved)     def accept(self):   f = util.atomictempfile(filename, 'wb', createmode=None)