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

commit: move reflow logic into the MessageEntry class

Changeset 7777c3a4de63…

Parent 25c76c5977e2…

by Steve Borho

Changes to 3 files · Browse files at 7777c3a4de63 Showing diff from parent 25c76c5977e2 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
25
26
27
28
29
30
31
 
58
59
60
 
61
62
63
 
65
66
67
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
68
69
70
 
 
71
72
73
 
142
143
144
145
146
147
148
 
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
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
 
332
333
334
335
 
336
337
338
 
25
26
27
 
28
29
30
 
57
58
59
60
61
62
63
 
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
 
182
183
184
 
185
186
187
 
320
321
322
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
323
324
325
 
328
329
330
 
331
332
333
334
@@ -25,7 +25,6 @@
 # in-memory patching / committing chunk selected files    class MessageEntry(qscilib.Scintilla): - reflowPressed = pyqtSignal()     def __init__(self, parent=None):   super(MessageEntry, self).__init__(parent) @@ -58,6 +57,7 @@
  self.setEdgeColumn(repo.summarylen)   self.setIndentationWidth(repo.tabwidth)   self.setTabWidth(repo.tabwidth) + self.summarylen = repo.summarylen   if repo.wsvisible == 'Visible':   self.setWhitespaceVisibility(QsciScintilla.WsVisible)   elif repo.wsvisible == 'VisibleAfterIndent': @@ -65,9 +65,49 @@
  else:   self.setWhitespaceVisibility(QsciScintilla.WsInvisible)   + def reflowBlock(self, line): + lines = self.text().split('\n', QString.KeepEmptyParts) + if line >= len(lines): + return None + if not len(lines[line]) > 1: + return line+1 + + # find boundaries (empty lines or bounds) + b = line + while b and len(lines[b-1]) > 1: + b = b - 1 + e = line + while e+1 < len(lines) and len(lines[e+1]) > 1: + e = e + 1 + group = QStringList([lines[l].simplified() for l in xrange(b, e+1)]) + sentence = group.join(' ') + parts = sentence.split(' ', QString.SkipEmptyParts) + + outlines = QStringList() + line = QStringList() + partslen = 0 + for part in parts: + if partslen + len(line) + len(part) + 1 > self.summarylen: + if line: + outlines.append(line.join(' ')) + line, partslen = QStringList(), 0 + line.append(part) + partslen += len(part) + if line: + outlines.append(line.join(' ')) + + self.beginUndoAction() + self.setSelection(b, 0, e+1, 0) + self.removeSelectedText() + self.insertAt(outlines.join('\n')+'\n', b, 0) + self.endUndoAction() + self.setCursorPosition(b, 0) + return b + len(outlines) + 1 +   def keyPressEvent(self, event):   if event.modifiers() == Qt.ControlModifier and event.key() == Qt.Key_E: - self.reflowPressed.emit() + line, col = self.getCursorPosition() + self.reflowBlock(line)   super(MessageEntry, self).keyPressEvent(event)    class CommitWidget(QWidget): @@ -142,7 +182,6 @@
  vbox.addWidget(self.pcsinfo, 0)     msgte = MessageEntry(self) - msgte.reflowPressed.connect(self.reflowPressed)   msgte.setContextMenuPolicy(Qt.CustomContextMenu)   msgte.customContextMenuRequested.connect(self.menuRequested)   msgte.installEventFilter(qscilib.KeyPressInterceptor(self)) @@ -281,49 +320,6 @@
  self.opts['date'] = ''   self.qref = False   - def reflowPressed(self): - 'User pressed Control-E, reflow current paragraph' - line, col = self.msgte.getCursorPosition() - self.reflowBlock(line) - - def reflowBlock(self, line): - lines = self.msgte.text().split('\n', QString.KeepEmptyParts) - if line >= len(lines): - return None - if not len(lines[line]) > 1: - return line+1 - - # find boundaries (empty lines or bounds) - b = line - while b and len(lines[b-1]) > 1: - b = b - 1 - e = line - while e+1 < len(lines) and len(lines[e+1]) > 1: - e = e + 1 - group = QStringList([lines[l].simplified() for l in xrange(b, e+1)]) - sentence = group.join(' ') - parts = sentence.split(' ', QString.SkipEmptyParts) - - outlines = QStringList() - line = QStringList() - partslen = 0 - for part in parts: - if partslen + len(line) + len(part) + 1 > self.repo.summarylen: - if line: - outlines.append(line.join(' ')) - line, partslen = QStringList(), 0 - line.append(part) - partslen += len(part) - if line: - outlines.append(line.join(' ')) - - self.msgte.beginUndoAction() - self.msgte.setSelection(b, 0, e+1, 0) - self.msgte.removeSelectedText() - self.msgte.insertAt(outlines.join('\n')+'\n', b, 0) - self.msgte.endUndoAction() - self.msgte.setCursorPosition(b, 0) - return b + len(outlines) + 1     def menuRequested(self, point):   line = self.msgte.lineAt(point) @@ -332,7 +328,7 @@
  def apply():   line = 0   while True: - line = self.reflowBlock(line) + line = self.msgte.reflowBlock(line)   if line is None:   break;   def paste():
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
113
114
115
 
116
117
118
 
146
147
148
 
 
149
150
151
 
170
171
172
 
173
174
175
 
113
114
115
116
117
118
119
 
147
148
149
150
151
152
153
154
 
173
174
175
176
177
178
179
@@ -113,6 +113,7 @@
  mtbarhbox.addWidget(self.patchNameLE, 1)     self.messageEditor = commit.MessageEntry(self) + self.messageEditor.refresh(repo)   layout.addWidget(self.messageEditor, 1)     qrefhbox = QHBoxLayout() @@ -146,6 +147,8 @@
  self.setWindowTitle(_('TortoiseHg Patch Queue'))   self.resize(850, 550)   + QTimer.singleShot(0, self.reload) +   def onConfigChanged(self):   'Repository is reporting its config files have changed'   self.reload() @@ -170,6 +173,7 @@
    def reload(self):   self.refreshing = True + self.messageEditor.refresh(self.repo)   # refresh self.queueCombo   # refresh self.msgHistoryCombo   # set self.patchNameLE to qtip patch name
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​qfold.py Stacked
 
36
37
38
39
40
41
42
 
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
 
202
203
204
205
 
206
207
208
 
36
37
38
 
39
40
41
 
150
151
152
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
153
154
155
 
157
158
159
 
160
161
162
163
@@ -36,7 +36,6 @@
  mlbl = QLabel(_('New patch message:'))   self.layout().addWidget(mlbl)   self.msgte = MessageEntry() - self.msgte.reflowPressed.connect(self.reflowPressed)   self.msgte.setContextMenuPolicy(Qt.CustomContextMenu)   self.msgte.customContextMenuRequested.connect(self.menuRequested)   self.msgte.installEventFilter(qscilib.KeyPressInterceptor(self)) @@ -151,50 +150,6 @@
  self.cmd.commandFinished.connect(finished)   self.cmd.run(cmdline)   - def reflowPressed(self): - 'User pressed Control-E, reflow current paragraph' - line, col = self.msgte.getCursorPosition() - self.reflowBlock(line) - - def reflowBlock(self, line): - lines = self.msgte.text().split('\n', QString.KeepEmptyParts) - if line >= len(lines): - return None - if not len(lines[line]) > 1: - return line+1 - - # find boundaries (empty lines or bounds) - b = line - while b and len(lines[b-1]) > 1: - b = b - 1 - e = line - while e+1 < len(lines) and len(lines[e+1]) > 1: - e = e + 1 - group = QStringList([lines[l].simplified() for l in xrange(b, e+1)]) - sentence = group.join(' ') - parts = sentence.split(' ', QString.SkipEmptyParts) - - outlines = QStringList() - line = QStringList() - partslen = 0 - for part in parts: - if partslen + len(line) + len(part) + 1 > self.repo.summarylen: - if line: - outlines.append(line.join(' ')) - line, partslen = QStringList(), 0 - line.append(part) - partslen += len(part) - if line: - outlines.append(line.join(' ')) - - self.msgte.beginUndoAction() - self.msgte.setSelection(b, 0, e+1, 0) - self.msgte.removeSelectedText() - self.msgte.insertAt(outlines.join('\n')+'\n', b, 0) - self.msgte.endUndoAction() - self.msgte.setCursorPosition(b, 0) - return b + len(outlines) + 1 -   def menuRequested(self, point):   line = self.msgte.lineAt(point)   point = self.msgte.mapToGlobal(point) @@ -202,7 +157,7 @@
  def apply():   line = 0   while True: - line = self.reflowBlock(line) + line = self.mste.reflowBlock(line)   if line is None:   break;   def settings():