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

stable backout: use a commit.MessageEntry widget

Changeset 0ed2c3b7651a…

Parent 60336259bc67…

by Steve Borho

Changes to one file · Browse files at 0ed2c3b7651a Showing diff from parent 60336259bc67 Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
13
14
15
 
16
17
18
 
47
48
49
50
 
 
 
 
51
52
53
 
127
128
129
130
131
132
 
133
134
135
 
137
138
139
140
 
141
142
143
 
156
157
158
159
 
160
161
162
163
 
164
165
166
 
170
171
172
173
 
174
175
176
 
241
242
243
 
 
 
 
244
245
246
 
13
14
15
16
17
18
19
 
48
49
50
 
51
52
53
54
55
56
57
 
131
132
133
 
 
 
134
135
136
137
 
139
140
141
 
142
143
144
145
 
158
159
160
 
161
162
163
164
 
165
166
167
168
 
172
173
174
 
175
176
177
178
 
243
244
245
246
247
248
249
250
251
252
@@ -13,6 +13,7 @@
 from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, resolve +from tortoisehg.hgqt import commit, qscilib    keep = i18n.keepgettext()   @@ -47,7 +48,10 @@
  self.msgset['id'] += revhex   self.msgset['str'] += revhex   - self.msgTextEdit = QTextEdit() + self.msgTextEdit = commit.MessageEntry(self) + self.msgTextEdit.installEventFilter(qscilib.KeyPressInterceptor(self)) + self.msgTextEdit.refresh(repo) + self.msgTextEdit.loadSettings(QSettings(), 'backout/message')   self.msgTextEdit.setText(self.msgset['str'])   box.addWidget(self.msgTextEdit, 1)   @@ -127,9 +131,7 @@
  self.cancelBtn.setHidden(True)   self.detailBtn.setHidden(True)   self.msgTextEdit.setFocus() - cursor = self.msgTextEdit.textCursor() - cursor.movePosition(QTextCursor.EndOfBlock) - self.msgTextEdit.setTextCursor(cursor) + self.msgTextEdit.moveCursorToEnd()     ### Private Methods ###   @@ -137,7 +139,7 @@
  self.msgTextEdit.setEnabled(checked)     def eng_toggled(self, checked): - msg = self.msgTextEdit.toPlainText() + msg = self.msgTextEdit.text()   origmsg = (checked and self.msgset['str'] or self.msgset['id'])   if msg != origmsg:   if not qtlib.QuestionMsgBox(_('Confirm Discard Message'), @@ -156,11 +158,11 @@
  cmdline += ['--tool=internal:' +   (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]   if self.backoutParent: - msg = self.msgTextEdit.toPlainText() + msg = self.msgTextEdit.text()   cmdline += ['--message', hglib.fromunicode(msg)]   elif self.mergeChk.isChecked():   cmdline += ['--merge'] - msg = self.msgTextEdit.toPlainText() + msg = self.msgTextEdit.text()   cmdline += ['--message', hglib.fromunicode(msg)]     # start backing out @@ -170,7 +172,7 @@
    def commit(self):   cmdline = ['commit', '--repository', self.repo.root] - msg = self.msgTextEdit.toPlainText() + msg = self.msgTextEdit.text()   cmdline += ['--message', hglib.fromunicode(msg)]   self.cmdline = cmdline   self.repo.incrementBusyCount() @@ -241,6 +243,10 @@
  dlg.exec_()   self.checkResolve()   + def accept(self): + self.msgTextEdit.saveSettings(QSettings(), 'backout/message') + super(BackoutDialog, self).accept() +  def run(ui, *pats, **opts):   from tortoisehg.util import paths   from tortoisehg.hgqt import thgrepo