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

revset: initial integration of revset into workbench

Changeset 238f1f04e489…

Parent 604d5750f643…

by Steve Borho

Changes to 3 files · Browse files at 238f1f04e489 Showing diff from parent 604d5750f643 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repofilter.py Stacked
 
10
11
12
 
13
14
15
16
 
 
 
 
 
 
17
18
19
 
22
23
24
25
26
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
28
29
30
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
31
32
33
 
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
 
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
@@ -10,10 +10,17 @@
 from PyQt4.QtGui import *    from tortoisehg.hgqt.i18n import _ +from tortoisehg.hgqt import revset    class RepoFilterBar(QToolBar):   """Toolbar for RepoWidget to filter changesets"""   + revisionSet = pyqtSignal(object) + clearSet = pyqtSignal() + + showMessage = pyqtSignal(QString) + progress = pyqtSignal(QString, object, QString, QString, object) +   branchChanged = pyqtSignal(unicode, bool)   """Emitted (branch, allparents) when branch selection changed"""   @@ -22,12 +29,73 @@
  self.layout().setContentsMargins(0, 0, 0, 0)   self._repo = repo   - self.addWidget(QLineEdit(text='### placeholder for revsets ###', - enabled=False)) + self.entrydlg = revset.RevisionSetQuery(repo, self) + self.entrydlg.progress.connect(self.progress) + self.entrydlg.showMessage.connect(self.showMessage) + self.entrydlg.queryIssued.connect(self.dialogQuery) + self.entrydlg.hide() + + self.clear = QPushButton(_('clear')) + self.addWidget(self.clear) + + self.editor = QPushButton(_('editor')) + self.editor.clicked.connect(self.openEditor) + self.addWidget(self.editor) + + s = QSettings() + self.entrydlg.restoreGeometry(s.value('revset/geom').toByteArray()) + self.revsethist = list(s.value('revset-queries').toStringList()) + self.revsetle = le = QLineEdit() + le.setCompleter(QCompleter(self.revsethist)) + le.returnPressed.connect(self.returnPressed) + # Requires Qt 4.7 + #self.revsetle.setPlaceholderText('### revision set query ###') + self.addWidget(le) + + self.clear.clicked.connect(le.clear) + self.clear.clicked.connect(self.clearSet) + + self.store = store = QPushButton(_('store')) + store.clicked.connect(self.saveQuery) + le.textChanged.connect(lambda t: store.setEnabled(False)) + store.setEnabled(False) + self.addWidget(store)     self._initbranchfilter()   self.refresh()   + def openEditor(self): + query = self.revsetle.text().simplified() + self.entrydlg.entry.setText(query) + self.entrydlg.entry.setCursorPosition(0, len(query)) + self.entrydlg.entry.setFocus() + self.entrydlg.setShown(True) + + def dialogQuery(self, query, revset): + self.revsetle.setText(query) + self.store.setEnabled(True) + self.revisionSet.emit(revset) + + def returnPressed(self): + 'Return pressed on revset line entry, forward to dialog' + query = self.revsetle.text().simplified() + if query: + self.entrydlg.entry.setText(query) + self.entrydlg.runQuery() + + def saveQuery(self): + query = self.revsetle.text() + if query in self.revsethist: + self.revsethist.remove(query) + self.revsethist.insert(0, query) + self.revsetle.setCompleter(QCompleter(self.revsethist)) + self.store.setEnabled(False) + self.showMessage.emit(_('Revision set query saved')) + + def storeConfigs(self, s): + s.setValue('revset/geom', self.entrydlg.saveGeometry()) + s.setValue('revset-queries', self.revsethist) +   def _initbranchfilter(self):   self._branchLabel = QToolButton(   text=_('Branch'), popupMode=QToolButton.InstantPopup,
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
75
76
77
 
 
 
 
78
79
80
 
202
203
204
205
 
 
 
 
 
206
207
208
 
 
 
 
209
210
211
 
549
550
551
 
552
553
554
 
75
76
77
78
79
80
81
82
83
84
 
206
207
208
 
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
 
561
562
563
564
565
566
567
@@ -75,6 +75,10 @@
    self.filterbar = RepoFilterBar(self.repo)   self.filterbar.branchChanged.connect(self.setBranch) + self.filterbar.progress.connect(self.progress) + self.filterbar.showMessage.connect(self.showMessage) + self.filterbar.revisionSet.connect(self.setRevisionSet) + self.filterbar.clearSet.connect(self.clearSet)   self.layout().addWidget(self.filterbar)     self.layout().addWidget(self.repotabs_splitter) @@ -202,10 +206,18 @@
  sw.showMessage.connect(self.showMessage)   return SharedWidget(sw)   - def setOutgoingNodes(self, nodes): + def clearSet(self): + self.repomodel.revset = set() + self.refresh() + + def setRevisionSet(self, nodes):   self.repomodel.revset = [self.repo[n].node() for n in nodes]   self.refresh()   + def setOutgoingNodes(self, nodes): + self.filterbar.revsetle.setText('outgoing()') + self.setRevisionSet(nodes) +   def createGrepWidget(self):   upats = {}   gw = SearchWidget(upats, self.repo, self) @@ -549,6 +561,7 @@
  self.revDetailsWidget.storeSettings()   s = QSettings()   self.commitDemand.forward('storeConfigs', s) + self.filterbar.storeConfigs(s)   return True     def incoming(self):
Change 1 of 2 Show Changes Only tortoisehg/​hgqt/​revset.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
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
 
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
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
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
 # revset.py - revision set query dialog  #  # Copyright 2010 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os    from mercurial import revset, error    from tortoisehg.hgqt import qtlib, cmdui, thgrepo  from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _    from PyQt4.Qsci import QsciScintilla, QsciAPIs, QsciLexerPython  from PyQt4.QtCore import *  from PyQt4.QtGui import *    # TODO:  # Connect to repoview revisionClicked events  # Shift-Click rev range -> revision range X:Y  # Ctrl-Click two revs -> DAG range X::Y  # QFontMetrics.elidedText for help label    _common = (   ('user(string)',   _('Changesets where username contains string.')),   ('keyword(string)',   _('Search commit message, user name, and names of changed '   'files for string.')),   ('grep(regex)',   _('Like "keyword(string)" but accepts a regex.')),   ('outgoing([path])',   _('Changesets not found in the specified destination repository,'   ' or the default push location.')),   ('tagged()',   _('Changeset is tagged.')),   ('head()',   _('Changeset is a head.')),   ('merge()',   _('Changeset is a merge changeset.')),   ('closed()',   _('Changeset is closed.')),   ('date(interval)',   _('Changesets within the interval, see <a href="http://www.selenic.com/'   'mercurial/hg.1.html#dates">help dates</a>')),   ('ancestor(single, single)',   _('Greatest common ancestor of the two changesets.')),  )    _filepatterns = (   ('file(pattern)',   _('Changesets affecting files matched by pattern. '   'See <a href="http://www.selenic.com/mercurial/hg.1.html#patterns">'   'help patterns</a>')),   ('modifies(pattern)',   _('Changesets which modify files matched by pattern.')),   ('adds(pattern)',   _('Changesets which add files matched by pattern.')),   ('removes(pattern)',   _('Changesets which remove files matched by pattern.')),   ('contains(pattern)',   _('Changesets containing files matched by pattern.')),  )    _ancestry = (   ('branch(set)',   _('All changesets belonging to the branches of changesets in set.')),   ('heads(set)',   _('Members of a set with no children in set.')),   ('descendants(set)',   _('Changesets which are descendants of changesets in set.')),   ('ancestors(set)',   _('Changesets that are ancestors of a changeset in set.')),   ('children(set)',   _('Child changesets of changesets in set.')),   ('parents(set)',   _('The set of all parents for all changesets in set.')),   ('p1(set)',   _('First parent for all changesets in set.')),   ('p2(set)',   _('Second parent for all changesets in set.')),   ('roots(set)',   _('Changesets whith no parent changeset in set.')),   ('present(set)',   _('An empty set, if any revision in set isn\'t found; otherwise, '   'all revisions in set.')),  )    _logical = (   ('min(set)',   _('Changeset with lowest revision number in set.')),   ('max(set)',   _('Changeset with highest revision number in set.')),   ('limit(set, n)',   _('Firt n members of a set.')),   ('sort(set[, [-]key...])',   _('Sort set by keys. The default sort order is ascending, specify a '   'key as "-key" to sort in descending order.')),   ('follow()',   _('An alias for "::." (ancestors of the working copy\'s first parent).')),   ('all()',   _('All changesets, the same as 0:tip.')),  )    class RevisionSetQuery(QDialog):   # Emit query string and resulting revision set   queryIssued = pyqtSignal(QString, object)   showMessage = pyqtSignal(QString)   progress = pyqtSignal(QString, object, QString, QString, object)     def __init__(self, repo, parent=None):   QDialog.__init__(self, parent)     self.repo = repo   self.setWindowTitle(_('Revision Set Query'))   self.setWindowFlags(self.windowFlags() & \   ~Qt.WindowContextHelpButtonHint)     layout = QVBoxLayout()   layout.setMargin(0)   layout.setContentsMargins(*(4,)*4)   self.setLayout(layout)     self.stbar = cmdui.ThgStatusBar(self)   self.stbar.setSizeGripEnabled(False)   self.stbar.lbl.setOpenExternalLinks(True)   self.showMessage.connect(self.stbar.showMessage)   self.progress.connect(self.stbar.progress)     hbox = QHBoxLayout()   hbox.setContentsMargins(*(0,)*4)     cgb = QGroupBox(_('Common sets'))   cgb.setLayout(QVBoxLayout())   cgb.layout().setContentsMargins(*(0,)*4)   def setCommonHelp(item):   self.stbar.showMessage(self.clw._help[self.clw.row(item)])   self.clw = QListWidget(self)   self.clw.addItems([x for x, y in _common])   self.clw._help = [y for x, y in _common]   self.clw.itemClicked.connect(setCommonHelp)   cgb.layout().addWidget(self.clw)   hbox.addWidget(cgb)     fgb = QGroupBox(_('File pattern sets'))   fgb.setLayout(QVBoxLayout())   fgb.layout().setContentsMargins(*(0,)*4)   def setFileHelp(item):   self.stbar.showMessage(self.flw._help[self.flw.row(item)])   self.flw = QListWidget(self)   self.flw.addItems([x for x, y in _filepatterns])   self.flw._help = [y for x, y in _filepatterns]   self.flw.itemClicked.connect(setFileHelp)   fgb.layout().addWidget(self.flw)   hbox.addWidget(fgb)     agb = QGroupBox(_('Set Ancestry'))   agb.setLayout(QVBoxLayout())   agb.layout().setContentsMargins(*(0,)*4)   def setAncHelp(item):   self.stbar.showMessage(self.alw._help[self.alw.row(item)])   self.alw = QListWidget(self)   self.alw.addItems([x for x, y in _ancestry])   self.alw._help = [y for x, y in _ancestry]   self.alw.itemClicked.connect(setAncHelp)   agb.layout().addWidget(self.alw)   hbox.addWidget(agb)     lgb = QGroupBox(_('Set Logic'))   lgb.setLayout(QVBoxLayout())   lgb.layout().setContentsMargins(*(0,)*4)   def setManipHelp(item):   self.stbar.showMessage(self.llw._help[self.llw.row(item)])   self.llw = QListWidget(self)   self.llw.addItems([x for x, y in _logical])   self.llw._help = [y for x, y in _logical]   self.llw.itemClicked.connect(setManipHelp)   lgb.layout().addWidget(self.llw)   hbox.addWidget(lgb)     # Clicking on one listwidget should clear selection of the others   listwidgets = (self.clw, self.flw, self.alw, self.llw)   for w in listwidgets:   w.itemClicked.connect(self.itemClicked)   #w.itemActivated.connect(self.returnPressed)   for w2 in listwidgets:   if w is not w2:   w.itemClicked.connect(w2.clearSelection)     layout.addLayout(hbox, 1)     self.entry = RevsetEntry(self)   self.entry.returnPressed.connect(self.returnPressed)   self.entry.escapePressed.connect(self.reject)   self.entry.addCompletions(_logical, _ancestry, _filepatterns, _common)   layout.addWidget(self.entry, 0)     txt = _('<a href="http://www.selenic.com/mercurial/hg.1.html#revsets">'   'help revsets</a>')   helpLabel = QLabel(txt)   helpLabel.setOpenExternalLinks(True)   self.stbar.addPermanentWidget(helpLabel)   layout.addWidget(self.stbar, 0)   - s = QSettings() - self.restoreGeometry(s.value('revset/geom').toByteArray()) -   def runQuery(self):   text = hglib.fromunicode(self.entry.text())   self.entry.setEnabled(False)   self.showMessage.emit(_('Searching...'))   self.progress.emit(*cmdui.startProgress(_('Running'), _('query')))   try:   func = revset.match(text)   func(self.repo, range(0, 1))   l = []   for c in func(self.repo, range(len(self.repo))):   l.append(c)   if l:   self.showMessage.emit(_('%d matches found') % len(l))   self.queryIssued.emit(self.entry.text(), l)   else:   self.showMessage.emit(_('No matches'))   except error.ParseError, e:   if len(e.args) == 2:   msg, pos = e.args   self.entry.setCursorPosition(0, pos)   else:   msg = e.args[0]   self.showMessage.emit(_('Parse Error: ') + hglib.tounicode(msg))   except Exception, e:   self.showMessage.emit(_('Invalid query: ')+hglib.tounicode(str(e)))   self.entry.setEnabled(True)   self.progress.emit(*cmdui.stopProgress(_('Running')))     def returnPressed(self):   text = self.entry.text()   if self.entry.hasSelectedText():   lineFrom, indexFrom, lineTo, indexTo = self.entry.getSelection()   start = self.entry.positionFromLineIndex(lineFrom, indexFrom)   end = self.entry.positionFromLineIndex(lineTo, indexTo)   sel = self.entry.selectedText()   if sel.count('(') and sel.contains(')'):   bopen = sel.indexOf('(')   bclose = sel.lastIndexOf(')')   if bopen < bclose:   self.entry.setSelection(lineFrom, start+bopen+1,   lineFrom, start+bclose)   self.entry.setFocus()   return   self.entry.setSelection(lineTo, indexTo,   lineTo, indexTo)   else:   self.runQuery()   self.entry.setFocus()       def itemClicked(self, item):   self.entry.beginUndoAction()   text = self.entry.text()   itext, ilen = item.text(), len(item.text())   if self.entry.hasSelectedText():   # replace selection   lineFrom, indexFrom, lineTo, indexTo = self.entry.getSelection()   start = self.entry.positionFromLineIndex(lineFrom, indexFrom)   end = self.entry.positionFromLineIndex(lineTo, indexTo)   newtext = text[:start] + itext + text[end:]   self.entry.setText(newtext)   self.entry.setSelection(lineFrom, indexFrom,   lineFrom, indexFrom+ilen)   else:   line, index = self.entry.getCursorPosition()   pos = self.entry.positionFromLineIndex(line, index)   if len(text) <= pos:   # cursor at end of text, append   if text and text[-1] != u' ':   text = text + u' '   newtext = text + itext   self.entry.setText(newtext)   self.entry.setSelection(line, len(text), line, len(newtext))   elif text[pos] == u' ':   # cursor is at a space, insert item   newtext = text[:pos] + itext + text[pos:]   self.entry.setText(newtext)   self.entry.setSelection(line, pos, line, pos+ilen)   else:   # cursor is on text, wrap current word   start, end = pos, pos   while start and text[start-1] != u' ':   start = start-1   while end < len(text) and text[end] != u' ':   end = end+1   bopen = itext.indexOf('(')   newtext = text[:start] + itext[:bopen+1] + text[start:end] + \   ')' + text[end:]   self.entry.setText(newtext)   self.entry.setSelection(line, start, line, end+bopen+2)   self.entry.endUndoAction()     def keyPressEvent(self, event):   if event.key() in (Qt.Key_Enter, Qt.Key_Return):   self.returnPressed()   return   super(RevisionSetQuery, self).keyPressEvent(event)     def accept(self): - s = QSettings() - s.setValue('revset/geom', self.saveGeometry()) - super(RevisionSetQuery, self).accept() + self.hide()     def reject(self):   self.accept()    class RevsetEntry(QsciScintilla):   returnPressed = pyqtSignal()   escapePressed = pyqtSignal()     def __init__(self, parent=None):   super(RevsetEntry, self).__init__(parent)   self.setMarginWidth(1, 0)   self.setReadOnly(False)   self.setUtf8(True)   self.setCaretWidth(10)   self.setCaretLineBackgroundColor(QColor("#e6fff0"))   self.setCaretLineVisible(True)   self.setAutoIndent(True)   self.setMatchedBraceBackgroundColor(Qt.yellow)   self.setIndentationsUseTabs(False)   self.setBraceMatching(QsciScintilla.SloppyBraceMatch)     self.setWrapMode(QsciScintilla.WrapWord)   self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)   self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)     sp = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)   sp.setHorizontalStretch(1)   sp.setVerticalStretch(0)   self.setSizePolicy(sp)     self.setAutoCompletionThreshold(2)   self.setAutoCompletionSource(QsciScintilla.AcsAPIs)   self.setAutoCompletionFillupsEnabled(True)   self.setLexer(QsciLexerPython(self))   self.lexer().setFont(qtlib.getfont('fontcomment').font())   self.apis = QsciAPIs(self.lexer())     def addCompletions(self, *lists):   for list in lists:   for x, y in list:   self.apis.add(x)   self.apis.prepare()     def keyPressEvent(self, event):   if event.key() == Qt.Key_Escape:   self.escapePressed.emit()   return   if event.key() in (Qt.Key_Enter, Qt.Key_Return):   if not self.isListActive():   self.returnPressed.emit()   return   super(RevsetEntry, self).keyPressEvent(event)     def sizeHint(self):   return QSize(10, self.fontMetrics().height())    def run(ui, *pats, **opts):   repo = thgrepo.repository(ui, path=paths.find_root())   return RevisionSetQuery(repo)