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

Merge with stable

Changeset f90a950e1471…

Parents 859fca957625…

Parents 0a707be45e60…

by Steve Borho

Changes to 5 files · Browse files at f90a950e1471 Showing diff from parent 859fca957625 0a707be45e60 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​bugreport.py Stacked
 
95
96
97
98
 
99
100
101
 
95
96
97
 
98
99
100
101
@@ -95,7 +95,7 @@
  os.path.join(os.getcwd(), 'bugreport.txt'),   _('Text files (*.txt)'))   if fname: - open(fname, 'wb').write(self.text) + open(fname, 'wb').write(hglib.fromunicode(self.text))   except (EnvironmentError), e:   QMessageBox.critical(self, _('Error writing file'), str(e))  
Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​rejects.py Stacked
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
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
 # 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.    import cStringIO  import os    from mercurial import hg, util, patch, commands  from hgext import record    from tortoisehg.util import hglib  from tortoisehg.util.patchctx import patchctx  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, qscilib, lexers    from PyQt4.QtCore import *  from PyQt4.QtGui import *  from PyQt4 import Qsci    qsci = Qsci.QsciScintilla    class RejectsDialog(QDialog):   def __init__(self, path, parent):   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.menuRequested)   self.baseLineColor = editor.markerDefine(qsci.Background, -1)   editor.setMarkerBackgroundColor(QColor('lightblue'), self.baseLineColor)   self.layout().addWidget(editor, 3)     searchbar = qscilib.SearchToolBar(self, hidable=True)   searchbar.searchRequested.connect(editor.find)   searchbar.conditionChanged.connect(editor.highlightText)   searchbar.hide()   def showsearchbar():   searchbar.show()   searchbar.setFocus(Qt.OtherFocusReason)   QShortcut(QKeySequence.Find, self, showsearchbar)   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)     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(s.value('rejects/geometry').toByteArray())   self.editor.loadSettings(s, 'rejects/editor')   self.rejectbrowser.loadSettings(s, 'rejects/rejbrowse')     f = QFile(path)   f.open(QIODevice.ReadOnly)   editor.read(f)   editor.setModified(False)   lexer = lexers.get_lexer(path, f.readData(1024), self)   editor.setLexer(lexer)   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', 'r').read())   buf.seek(0)   except IOError, e:   pass   try:   header = record.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))     def menuRequested(self, point):   point = self.editor.mapToGlobal(point)   return self.editor.createStandardContextMenu().exec_(point)     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)   self.rejectbrowser.showChunk(buf.getvalue().splitlines()[1:])   self.editor.setCursorPosition(chunk.fromline-1, 0)   self.editor.ensureLineVisible(chunk.fromline-1)   self.editor.markerDeleteAll(-1)   self.editor.markerAdd(chunk.fromline-1, self.baseLineColor)   self.resolved.setEnabled(not chunk.resolved)   self.unresolved.setEnabled(chunk.resolved)     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): - f = QFile(self.path) - f.open(QIODevice.WriteOnly) - self.editor.write(f) - self.saveSettings() - super(RejectsDialog, self).accept() + # 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: + f = QFile(self.path) + f.open(QIODevice.WriteOnly) + self.editor.write(f) + 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.setContextMenuPolicy(Qt.CustomContextMenu)   self.customContextMenuRequested.connect(self.menuRequested)   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.get_diff_lexer(self)   self.setLexer(lexer)     def menuRequested(self, point):   point = self.mapToGlobal(point)   return self.createStandardContextMenu().exec_(point)     def showChunk(self, lines):   utext = []   added = []   removed = []   for i, line in enumerate(lines):   utext.append(hglib.tounicode(line[1:]))   if line[0] == '+':   added.append(i)   elif line[0] == '-':   removed.append(i)   self.markerDeleteAll(-1)   self.setText(u'\n'.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)    def run(ui, *pats, **opts):   if len(pats) != 1:   qtlib.ErrorMsgBox(_('Filename required'),   _('You must provide the path to a file'))   import sys; sys.exit()   path = pats[0]   if path.endswith('.rej'):   path = path[:-4]   dlg = RejectsDialog(path, None)   return dlg
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revset.py Stacked
 
372
373
374
375
 
376
377
378
 
372
373
374
 
375
376
377
378
@@ -372,7 +372,7 @@
  self.showMessage.emit(_('found revision'))   self.queryIssued.emit(self.query, [ctx.rev()])   return - except (error.RepoLookupError, error.Abort): + except (error.RepoError, error.LookupError, error.Abort):   self.text = 'keyword("%s")' % self.text   cwd = os.getcwd()   try:
Change 1 of 1 Show Entire File win32/​wix/​dist.wxs Stacked
 
54
55
56
 
57
58
59
 
54
55
56
57
58
59
60
@@ -54,6 +54,7 @@
  <?if $(var.Platform) = "x86" ?>   <File Name="intl3_svn.dll" />   <File Name="libdb44.dll" /> + <File Name="libsasl.dll" />   <?endif?>   <File Name="select.pyd" />   <File Name="sip.pyd" />
Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
33
34
35
36
 
37
38
39
 
33
34
35
 
36
37
38
39
@@ -33,7 +33,7 @@
  <?define templates.static.guid = {ECF8D1EF-910D-4586-9508-86A6236B4FD5} ?>     <!-- dist.wxs --> - <?define dist.guid = {9287B4BD-AA5A-43CA-8BB2-BAAAFB1BC283} ?> + <?define dist.guid = {9A429564-6BA8-4F18-ACCF-59C586364FFC} ?>   <?define imageformats.guid = {056DFB00-3EB1-4ACA-A43B-55CD5004DED1} ?>     <!-- cmenu-i18n.wxs -->