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

rejects: use QFile() to handle source file, fix save and no-rejects behaviors

Changeset e4749c1529d6…

Parent e63ab761b543…

by Steve Borho

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

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
25
26
27
 
 
 
28
29
30
 
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
 
154
155
156
157
158
159
160
161
162
 
163
164
165
 
 
 
 
 
 
 
 
 
 
 
166
167
168
 
216
217
218
219
220
221
 
25
26
27
28
29
30
31
32
33
 
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
 
161
162
163
 
 
 
 
 
 
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
 
229
230
231
 
 
232
@@ -25,6 +25,9 @@
 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.path = path     self.setLayout(QVBoxLayout())   editor = qscilib.Scintilla() @@ -80,32 +83,36 @@
  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())   - contents = hglib.tounicode(open(path, 'rb').read()) - self.setWindowTitle(_('Merge rejected patch chunks into %s') % - hglib.tounicode(path)) - editor.setText(contents) + f = QFile(path) + f.open(QIODevice.ReadOnly) + editor.read(f)   editor.setModified(False) - lexer = lexers.get_lexer(path, contents, self) + lexer = lexers.get_lexer(path, f.readData(1024), self)   editor.setLexer(lexer) - if '\r\n' in contents: - editor.setEolMode(qsci.EolWindows) - else: - editor.setEolMode(qsci.EolUnix)   self.editor = editor     buf = cStringIO.StringIO() - buf.write('diff -r aaaaaaaaaaaa -r bbbbbbbbbbb %s\n' % path) - buf.write(open(path + '.rej', 'r').read()) - buf.seek(0) - self.chunks = record.parsepatch(buf)[1:] + 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: + self.chunks = record.parsepatch(buf)[1:] + except patch.PatchError, 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 updateChunkList(self): @@ -154,15 +161,21 @@
  self.resolved.setEnabled(not chunk.resolved)   self.unresolved.setEnabled(chunk.resolved)   - def accept(self): - f = util.atomictempfile(filename, 'wb', createmode=None) - f.write(hglib.fromunicode(self.editor.text())) - f.rename() - - def closeEvent(self, event): + def saveSettings(self):   s = QSettings()   s.setValue('rejects/geometry', self.saveGeometry())   + def accept(self): + 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): @@ -216,6 +229,4 @@
  from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   dlg = RejectsDialog(pats[0], None) - desktopgeom = qApp.desktop().availableGeometry() - dlg.resize(desktopgeom.size() * 0.8)   return dlg