1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
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
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
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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
|
# rejects.py - TortoiseHg patch reject editor
#
# Copyright 2011 Steve Borho <steve@borho.org>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
from __future__ import absolute_import
import cStringIO
from . import qsci as Qsci
from .qtcore import (
QPoint,
QSettings,
QTimer,
Qt,
pyqtSlot,
)
from .qtgui import (
QColor,
QDialog,
QDialogButtonBox,
QFontMetrics,
QHBoxLayout,
QKeySequence,
QListWidget,
QMessageBox,
QToolButton,
QVBoxLayout,
)
from mercurial import patch
from ..util import hglib
from ..util.i18n import _
from . import (
fileencoding,
lexers,
qscilib,
qtlib,
)
qsci = Qsci.QsciScintilla
class RejectsDialog(QDialog):
def __init__(self, ui, path, parent=None):
super(RejectsDialog, self).__init__(parent)
self.setWindowTitle(_('Merge rejected patch chunks into %s') %
hglib.tounicode(path))
self.setWindowFlags(Qt.Window)
self.path = path
self.setLayout(QVBoxLayout())
editor = qscilib.Scintilla()
editor.setBraceMatching(qsci.SloppyBraceMatch)
editor.setFolding(qsci.BoxedTreeFoldStyle)
editor.installEventFilter(qscilib.KeyPressInterceptor(self))
editor.setContextMenuPolicy(Qt.CustomContextMenu)
editor.customContextMenuRequested.connect(self._onMenuRequested)
self.baseLineColor = editor.markerDefine(qsci.Background, -1)
editor.setMarkerBackgroundColor(QColor('lightblue'), self.baseLineColor)
self.layout().addWidget(editor, 3)
searchbar = qscilib.SearchToolBar(self)
searchbar.searchRequested.connect(editor.find)
searchbar.conditionChanged.connect(editor.highlightText)
searchbar.hide()
def showsearchbar():
searchbar.show()
searchbar.setFocus(Qt.OtherFocusReason)
qtlib.newshortcutsforstdkey(QKeySequence.Find, self, showsearchbar)
self.addActions(searchbar.editorActions())
self.layout().addWidget(searchbar)
hbox = QHBoxLayout()
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('thg-success'))
tb.setToolTip(_('Mark this chunk as resolved, goto next unresolved'))
tb.pressed.connect(self.resolveCurrentChunk)
self.unresolved = tb = QToolButton()
tb.setIcon(qtlib.geticon('thg-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.editor = editor
self.rejectbrowser = RejectBrowser(self)
hbox.addWidget(self.rejectbrowser, 5)
self.textencgroup = fileencoding.createActionGroup(self)
self.textencgroup.triggered.connect(self._reloadFile)
fileencoding.checkActionByName(self.textencgroup,
fileencoding.contentencoding(ui))
BB = QDialogButtonBox
bb = QDialogButtonBox(BB.Save|BB.Cancel)
bb.accepted.connect(self.accept)
bb.rejected.connect(self.reject)
self.layout().addWidget(bb)
self.saveButton = bb.button(BB.Save)
s = QSettings()
self.restoreGeometry(qtlib.readByteArray(s, 'rejects/geometry'))
self.editor.loadSettings(s, 'rejects/editor')
self.rejectbrowser.loadSettings(s, 'rejects/rejbrowse')
if not qscilib.readFile(editor, hglib.tounicode(path),
self._textEncoding()):
self.hide()
QTimer.singleShot(0, self.reject)
return
earlybytes = hglib.fromunicode(editor.text(), 'replace')[:4096]
lexer = lexers.getlexer(ui, path, earlybytes, self)
editor.setLexer(lexer)
if lexer is None:
editor.setFont(qtlib.getfont('fontlog').font())
editor.setMarginLineNumbers(1, True)
editor.setMarginWidth(1, str(editor.lines())+'X')
buf = cStringIO.StringIO()
try:
buf.write('diff -r aaaaaaaaaaaa -r bbbbbbbbbbb %s\n' % path)
buf.write(open(path + '.rej', 'rb').read())
buf.seek(0)
except IOError, e:
pass
try:
header = patch.parsepatch(buf)[0]
self.chunks = header.hunks
except (patch.PatchError, IndexError), e:
self.chunks = []
for chunk in self.chunks:
chunk.resolved = False
self.updateChunkList()
self.saveButton.setDisabled(len(self.chunks))
self.resolved.setDisabled(True)
self.unresolved.setDisabled(True)
QTimer.singleShot(0, lambda: self.chunklist.setCurrentRow(0))
@pyqtSlot(QPoint)
def _onMenuRequested(self, point):
menu = self.editor.createStandardContextMenu()
menu.addSeparator()
m = menu.addMenu(_('E&ncoding'))
fileencoding.addActionsToMenu(m, self.textencgroup)
menu.exec_(self.editor.viewport().mapToGlobal(point))
menu.setParent(None)
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 or self.updating:
return
buf = cStringIO.StringIO()
chunk = self.chunks[row]
chunk.write(buf)
chunkstr = buf.getvalue().decode(self._textEncoding(), 'replace')
startline = max(chunk.fromline-1, 0)
self.rejectbrowser.showChunk(chunkstr.splitlines(True)[1:])
self.editor.setCursorPosition(startline, 0)
self.editor.ensureLineVisible(startline)
self.editor.markerDeleteAll(-1)
self.editor.markerAdd(startline, self.baseLineColor)
self.resolved.setEnabled(not chunk.resolved)
self.unresolved.setEnabled(chunk.resolved)
def _textEncoding(self):
return fileencoding.checkedActionName(self.textencgroup)
@pyqtSlot()
def _reloadFile(self):
if self.editor.isModified():
r = qtlib.QuestionMsgBox(_('Reload File'),
_('Are you sure you want to reload this '
'file?'),
_('All unsaved changes will be lost.'),
parent=self)
if not r:
return
qscilib.readFile(self.editor, hglib.tounicode(self.path),
self._textEncoding())
self.showChunk(self.chunklist.currentRow())
def saveSettings(self):
s = QSettings()
s.setValue('rejects/geometry', self.saveGeometry())
self.editor.saveSettings(s, 'rejects/editor')
self.rejectbrowser.saveSettings(s, 'rejects/rejbrowse')
def accept(self):
# If the editor has been modified, we implicitly accept the changes
acceptresolution = self.editor.isModified()
if not acceptresolution:
action = QMessageBox.warning(self,
_("Warning"),
_("You have marked all rejected patch chunks as resolved yet "
"you have not modified the file on the edit panel.\n\n"
"This probably means that no code from any of the rejected "
"patch chunks made it into the file.\n\n"
"Are you sure that you want to leave the file as is and "
"consider all the rejected patch chunks as resolved?\n\n"
"Doing so may delete them from a shelve, for example, which "
"would mean that you would lose them forever!\n\n"
"Click Yes to accept the file as is or No to continue "
"resolving the rejected patch chunks."),
QMessageBox.Yes, QMessageBox.No)
if action == QMessageBox.Yes:
acceptresolution = True
if acceptresolution:
if not qscilib.writeFile(self.editor, hglib.tounicode(self.path),
self._textEncoding()):
return
self.saveSettings()
super(RejectsDialog, self).accept()
def reject(self):
self.saveSettings()
super(RejectsDialog, self).reject()
class RejectBrowser(qscilib.Scintilla):
'Display a rejected diff hunk in an easily copy/pasted format'
def __init__(self, parent):
super(RejectBrowser, self).__init__(parent)
self.setFrameStyle(0)
self.setReadOnly(True)
self.setUtf8(True)
self.installEventFilter(qscilib.KeyPressInterceptor(self))
self.setCaretLineVisible(False)
self.setMarginType(1, qsci.SymbolMargin)
self.setMarginLineNumbers(1, False)
self.setMarginWidth(1, QFontMetrics(self.font()).width('XX'))
self.setMarginSensitivity(1, True)
self.addedMark = self.markerDefine(qsci.Plus, -1)
self.removedMark = self.markerDefine(qsci.Minus, -1)
self.addedColor = self.markerDefine(qsci.Background, -1)
self.removedColor = self.markerDefine(qsci.Background, -1)
self.setMarkerBackgroundColor(QColor('lightgreen'), self.addedColor)
self.setMarkerBackgroundColor(QColor('cyan'), self.removedColor)
mask = (1 << self.addedMark) | (1 << self.removedMark) | \
(1 << self.addedColor) | (1 << self.removedColor)
self.setMarginMarkerMask(1, mask)
lexer = lexers.difflexer(self)
self.setLexer(lexer)
def showChunk(self, lines):
utext = []
added = []
removed = []
for i, line in enumerate(lines):
utext.append(line[1:])
if line[0] == '+':
added.append(i)
elif line[0] == '-':
removed.append(i)
self.markerDeleteAll(-1)
self.setText(u''.join(utext))
for i in added:
self.markerAdd(i, self.addedMark)
self.markerAdd(i, self.addedColor)
for i in removed:
self.markerAdd(i, self.removedMark)
self.markerAdd(i, self.removedColor)
|
