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 1ac53134b385…

Parents d6363fbfe2c8…

Parents 413a86ef8cfd…

by Steve Borho

Changes to 42 files · Browse files at 1ac53134b385 Showing diff from parent d6363fbfe2c8 413a86ef8cfd Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
 
41
42
43
 
 
 
41
42
43
44
45
@@ -41,3 +41,5 @@
 tortoisehg/hgqt/*_rc.py  tortoisehg/hgqt/*_ui.py  thgw +hgext +mercurial
Change 1 of 1 Show Entire File ReleaseProcedure.txt Stacked
 
23
24
25
26
 
 
23
24
25
 
26
@@ -23,4 +23,4 @@
 Post Major Release:  * Increment minimum Mercurial version in tortoisehg/util/hgversion.py  * Sweep through code and remove hacks for older Mercurial releases -* Update http://bitbucket.org/tortoisehg/stable/wiki/ReleaseNotes#matching-versions +* Update http://bitbucket.org/tortoisehg/thg/wiki/ReleaseNotes#matching-versions
Change 1 of 2 Show Entire File thg Stacked
 
44
45
46
47
48
49
50
51
 
52
53
54
 
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
 
 
 
44
45
46
 
 
 
 
47
48
49
50
51
 
55
56
57
 
 
 
 
 
 
 
 
58
59
60
61
62
63
64
65
 
66
67
68
69
70
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
71
72
@@ -44,11 +44,8 @@
 demandimport.ignore.append('tortoisehg.util.config')  demandimport.ignore.append('icons_rc')  demandimport.enable() -from mercurial import ui as uimod, util -from tortoisehg.util.hgversion import hgversion, checkhgversion -import cStringIO -import traceback   +# Verify we can reach TortoiseHg sources first  try:   import tortoisehg.hgqt.run  except ImportError, e: @@ -58,50 +55,18 @@
  sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1)   -ui = uimod.ui() -capt = ui.configbool('tortoisehg', 'stderrcapt', True) - -errors = ('Traceback', 'TypeError', 'NameError', 'AttributeError', - 'NotImplementedError') - -err = checkhgversion(hgversion) -if err: +# Verify we have an acceptable version of Mercurial +from tortoisehg.util.hgversion import hgversion, checkhgversion +errmsg = checkhgversion(hgversion) +if errmsg:   from tortoisehg.hgqt.bugreport import run   from tortoisehg.hgqt.run import qtrun   opts = {}   opts['cmd'] = ' '.join(sys.argv[1:]) - opts['error'] = '\n' + err + '\n' + opts['error'] = '\n' + errmsg + '\n'   opts['nofork'] = True   qtrun(run, ui, **opts)   sys.exit(1)   -if not capt or 'THGDEBUG' in os.environ or '--profile' in sys.argv: - sys.exit(tortoisehg.hgqt.run.dispatch(sys.argv[1:])) -else: - mystderr = cStringIO.StringIO() - origstderr = sys.stderr - sys.stderr = mystderr - ret = 0 - try: - ret = tortoisehg.hgqt.run.dispatch(sys.argv[1:]) - sys.stderr = origstderr - mystderr.seek(0) - for l in mystderr.readlines(): - if l.startswith(errors): - from tortoisehg.hgqt.bugreport import run - from tortoisehg.hgqt.run import qtrun - error = 'Recoverable runtime error (stderr):\n' - error += mystderr.getvalue() - opts = {} - opts['cmd'] = ' '.join(sys.argv[1:]) - opts['error'] = error - opts['nofork'] = True - qtrun(run, ui, **opts) - break - sys.exit(ret) - except: - if sys.exc_info()[0] not in [SystemExit, KeyboardInterrupt]: - sys.stderr = origstderr - traceback.print_exc() - else: - raise SystemExit(ret) +ret = tortoisehg.hgqt.run.dispatch(sys.argv[1:]) +sys.exit(ret)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​annotate.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
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,445 +0,0 @@
-# annotate.py - File annotation widget -# -# 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 ui, error, util - -from tortoisehg.hgqt import visdiff, qtlib, qscilib, wctxactions, thgrepo, lexers -from tortoisehg.util import paths, hglib, colormap, thread2 -from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt.grep import SearchWidget - -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from PyQt4.Qsci import QsciScintilla, QsciStyle - -# Technical Debt -# Pass search parameters to grep -# forward/backward history buttons -# menu options for viewing appropriate changesets - -class AnnotateView(qscilib.Scintilla): - revisionHint = pyqtSignal(QString) - - searchRequested = pyqtSignal(QString) - """Emitted (pattern) when user request to search content""" - - editSelected = pyqtSignal(unicode, object, int) - """Emitted (path, rev, line) when user requests to open editor""" - - grepRequested = pyqtSignal(QString, dict) - """Emitted (pattern, **opts) when user request to search changelog""" - - sourceChanged = pyqtSignal(unicode, object) - """Emitted (path, rev) when the content source changed""" - - def __init__(self, repo, parent=None, **opts): - super(AnnotateView, self).__init__(parent) - self.setReadOnly(True) - self.setMarginLineNumbers(1, True) - self.setMarginType(2, QsciScintilla.TextMarginRightJustified) - self.setMouseTracking(True) - self.setFont(qtlib.getfont('fontdiff').font()) - self.setContextMenuPolicy(Qt.CustomContextMenu) - self.customContextMenuRequested.connect(self.menuRequest) - - self.repo = repo - self.repo.configChanged.connect(self.configChanged) - self.configChanged() - self._rev = None - self.annfile = None - self._annotation_enabled = bool(opts.get('annotationEnabled', False)) - - self._links = [] # by line - self._revmarkers = {} # by rev - self._lastrev = None - - self._thread = _AnnotateThread(self) - self._thread.finished.connect(self.fillModel) - - def configChanged(self): - self.setIndentationWidth(self.repo.tabwidth) - self.setTabWidth(self.repo.tabwidth) - - def keyPressEvent(self, event): - if event.key() == Qt.Key_Escape: - self._thread.abort() - return - return super(AnnotateView, self).keyPressEvent(event) - - def mouseMoveEvent(self, event): - self._emitRevisionHintAtLine(self.lineAt(event.pos())) - super(AnnotateView, self).mouseMoveEvent(event) - - def _emitRevisionHintAtLine(self, line): - if line < 0: - return - try: - fctx = self._links[line][0] - if fctx.rev() != self._lastrev: - s = hglib.get_revision_desc(fctx, - hglib.fromunicode(self.annfile)) - self.revisionHint.emit(s) - self._lastrev = fctx.rev() - except IndexError: - pass - - @pyqtSlot(QPoint) - def menuRequest(self, point): - menu = self.createStandardContextMenu() - line = self.lineAt(point) - point = self.mapToGlobal(point) - if line < 0 or not self.isAnnotationEnabled(): - return menu.exec_(point) - - fctx, line = self._links[line] - data = [hglib.tounicode(fctx.path()), fctx.rev(), line] - - if self.hasSelectedText(): - selection = self.selectedText() - def sreq(**opts): - return lambda: self.grepRequested.emit(selection, opts) - def sann(): - self.searchRequested.emit(selection) - menu.addSeparator() - for name, func in [(_('Search in original revision'), - sreq(rev=fctx.rev())), - (_('Search in working revision'), - sreq(rev='.')), - (_('Search in current annotation'), sann), - (_('Search in history'), sreq(all=True))]: - def add(name, func): - action = menu.addAction(name) - action.triggered.connect(func) - add(name, func) - - def annorig(): - self.setSource(*data) - def editorig(): - self.editSelected.emit(*data) - menu.addSeparator() - for name, func in [(_('Annotate originating revision'), annorig), - (_('View originating revision'), editorig)]: - def add(name, func): - action = menu.addAction(name) - action.triggered.connect(func) - add(name, func) - for pfctx in fctx.parents(): - pdata = [hglib.tounicode(pfctx.path()), pfctx.changectx().rev(), - line] - def annparent(data): - self.setSource(*data) - def editparent(data): - self.editSelected.emit(*data) - for name, func in [(_('Annotate parent revision %d') % pdata[1], - annparent), - (_('View parent revision %d') % pdata[1], - editparent)]: - def add(name, func): - action = menu.addAction(name) - action.data = pdata - action.run = lambda: func(action.data) - action.triggered.connect(action.run) - add(name, func) - menu.exec_(point) - - @property - def rev(self): - """Returns the current revision number""" - return self._rev - - @pyqtSlot(unicode, object, int) - def setSource(self, wfile, rev, line=None): - """Change the content to the specified file at rev [unicode] - - line is counted from 1. - """ - if self.annfile == wfile and self.rev == rev: - if line: - self.setCursorPosition(int(line) - 1, 0) - return - - try: - ctx = self.repo[rev] - fctx = ctx[hglib.fromunicode(wfile)] - except error.LookupError: - qtlib.ErrorMsgBox(_('Unable to annotate'), - _('%s is not found in revision %d') % (wfile, ctx.rev())) - return - - try: - if rev is None: - size = fctx.size() - else: - size = fctx._filelog.rawsize(fctx.filerev()) - except (EnvironmentError, error.LookupError), e: - self.setText(_('File or diffs not displayed: ') + \ - hglib.tounicode(str(e))) - self.error = p + hglib.tounicode(str(e)) - return - - if size > ctx._repo.maxdiff: - self.setText(_('File or diffs not displayed: ') + \ - _('File is larger than the specified max size.\n')) - else: - self._rev = ctx.rev() - self.clear() - self.annfile = wfile - if util.binary(fctx.data()): - self.setText(_('File is binary.\n')) - else: - self.setText(hglib.tounicode(fctx.data())) - if line: - self.setCursorPosition(int(line) - 1, 0) - self._updatelexer(fctx) - self._updatemarginwidth() - self.sourceChanged.emit(wfile, self._rev) - self._updateannotation() - - def _updateannotation(self): - if not self.isAnnotationEnabled() or not self.annfile: - return - ctx = self.repo[self._rev] - fctx = ctx[hglib.fromunicode(self.annfile)] - if util.binary(fctx.data()): - return - self._thread.abort() - self._thread.start(fctx) - - @pyqtSlot() - def fillModel(self): - self._thread.wait() - if self._thread.data is None: - return - - self._links = list(self._thread.data) - - self._updaterevmargin() - self._updatemarkers() - self._updatemarginwidth() - - def clear(self): - super(AnnotateView, self).clear() - self.clearMarginText() - self.markerDeleteAll() - self.annfile = None - - @pyqtSlot(bool) - def setAnnotationEnabled(self, enabled): - """Enable / disable annotation""" - enabled = bool(enabled) - if enabled == self.isAnnotationEnabled(): - return - self._annotation_enabled = enabled - self._updateannotation() - self._updatemarginwidth() - self.setMouseTracking(enabled) - if not self.isAnnotationEnabled(): - self.annfile = None - self.markerDeleteAll() - - def isAnnotationEnabled(self): - """True if annotation enabled and available""" - if self.rev is None: - return False # annotate working copy is not supported - return self._annotation_enabled - - def _updatelexer(self, fctx): - """Update the lexer according to the given file""" - lex = lexers.get_lexer(fctx.path(), hglib.tounicode(fctx.data()), self) - self.setLexer(lex) - if lex is None: - self.setFont(qtlib.getfont('fontlog').font()) - - def _updaterevmargin(self): - """Update the content of margin area showing revisions""" - s = self._margin_style - # Workaround to set style of the current sci widget. - # QsciStyle sends style data only to the first sci widget. - # See qscintilla2/Qt4/qscistyle.cpp - self.SendScintilla(QsciScintilla.SCI_STYLESETBACK, - s.style(), s.paper()) - self.SendScintilla(QsciScintilla.SCI_STYLESETFONT, - s.style(), s.font().family().toAscii().data()) - self.SendScintilla(QsciScintilla.SCI_STYLESETSIZE, - s.style(), s.font().pointSize()) - for i, (fctx, _origline) in enumerate(self._links): - self.setMarginText(i, str(fctx.rev()), s) - - def _updatemarkers(self): - """Update markers which colorizes each line""" - self._redefinemarkers() - for i, (fctx, _origline) in enumerate(self._links): - m = self._revmarkers.get(fctx.rev()) - if m is not None: - self.markerAdd(i, m) - - def _redefinemarkers(self): - """Redefine line markers according to the current revs""" - curdate = self.repo[self._rev].date()[0] - - # make sure to colorize at least 1 year - mindate = curdate - 365 * 24 * 60 * 60 - - self._revmarkers.clear() - filectxs = iter(fctx for fctx, _origline in self._links) - palette = colormap.makeannotatepalette(filectxs, curdate, - maxcolors=32, maxhues=8, - maxsaturations=16, - mindate=mindate) - for i, (color, fctxs) in enumerate(palette.iteritems()): - self.markerDefine(QsciScintilla.Background, i) - self.setMarkerBackgroundColor(QColor(color), i) - for fctx in fctxs: - self._revmarkers[fctx.rev()] = i - - @util.propertycache - def _margin_style(self): - """Style for margin area""" - s = QsciStyle() - s.setPaper(QApplication.palette().color(QPalette.Window)) - s.setFont(self.font()) - return s - - @pyqtSlot() - def _updatemarginwidth(self): - self.setMarginsFont(self.font()) - def lentext(s): - return 'M' * (len(str(s)) + 2) # 2 for margin - self.setMarginWidth(1, lentext(self.lines())) - if self.isAnnotationEnabled() and self._links: - maxrev = max(fctx.rev() for fctx, _origline in self._links) - self.setMarginWidth(2, lentext(maxrev)) - else: - self.setMarginWidth(2, 0) - -class _AnnotateThread(QThread): - 'Background thread for annotating a file at a revision' - def __init__(self, parent=None): - super(_AnnotateThread, self).__init__(parent) - self._threadid = None - - @pyqtSlot(object) - def start(self, fctx): - self._fctx = fctx - super(_AnnotateThread, self).start() - self.data = None - - @pyqtSlot() - def abort(self): - if self._threadid is None: - return - try: - thread2._async_raise(self._threadid, KeyboardInterrupt) - self.wait() - except ValueError: - pass - - def run(self): - assert self.currentThread() != qApp.thread() - self._threadid = self.currentThreadId() - try: - data = [] - for (fctx, line), _text in self._fctx.annotate(True, True): - data.append((fctx, line)) - self.data = data - except KeyboardInterrupt: - pass - finally: - self._threadid = None - del self._fctx - -class AnnotateDialog(QMainWindow): - def __init__(self, *pats, **opts): - super(AnnotateDialog,self).__init__(opts.get('parent'), Qt.Window) - - root = opts.get('root') or paths.find_root() - repo = thgrepo.repository(ui.ui(), path=root) - # TODO: handle repo not found - - av = AnnotateView(repo, self, annotationEnabled=True) - self.setCentralWidget(av) - self.av = av - - status = QStatusBar() - self.setStatusBar(status) - av.revisionHint.connect(status.showMessage) - av.editSelected.connect(self.editSelected) - av.grepRequested.connect(self._openSearchWidget) - - self._searchbar = qscilib.SearchToolBar() - self.addToolBar(self._searchbar) - self._searchbar.setPattern(hglib.tounicode(opts.get('pattern', ''))) - self._searchbar.searchRequested.connect(self.av.find) - self._searchbar.conditionChanged.connect(self.av.highlightText) - av.searchRequested.connect(self._searchbar.search) - QShortcut(QKeySequence.Find, self, - lambda: self._searchbar.setFocus(Qt.OtherFocusReason)) - - self.av.sourceChanged.connect( - lambda *args: self.setWindowTitle(_('Annotate %s@%d') % args)) - - self.searchwidget = opts.get('searchwidget') - - self.opts = opts - line = opts.get('line') - if line and isinstance(line, str): - line = int(line) - - self.repo = repo - - self.restoreSettings() - - # run heavy operation after the dialog visible - path = hglib.tounicode(pats[0]) - rev = opts.get('rev') or '.' - QTimer.singleShot(0, lambda: av.setSource(path, rev, line)) - - def closeEvent(self, event): - self.storeSettings() - super(AnnotateDialog, self).closeEvent(event) - - def editSelected(self, wfile, rev, line): - pattern = hglib.fromunicode(self._searchbar._le.text()) or None - wfile = hglib.fromunicode(wfile) - repo = self.repo - try: - ctx = repo[rev] - fctx = ctx[wfile] - except Exception, e: - self.statusBar().showMessage(hglib.tounicode(str(e))) - - base, _ = visdiff.snapshot(repo, [wfile], repo[rev]) - files = [os.path.join(base, wfile)] - wctxactions.edit(self, repo.ui, repo, files, line, pattern) - - @pyqtSlot(unicode, dict) - def _openSearchWidget(self, pattern, opts): - opts = dict((str(k), str(v)) for k, v in opts.iteritems()) - if self.searchwidget is None: - self.searchwidget = SearchWidget([pattern], repo=self.repo, - **opts) - self.searchwidget.show() - else: - self.searchwidget.setSearch(pattern, **opts) - self.searchwidget.show() - self.searchwidget.raise_() - - def storeSettings(self): - s = QSettings() - s.setValue('annotate/geom', self.saveGeometry()) - self.av.saveSettings(s, 'annotate/av') - - def restoreSettings(self): - s = QSettings() - self.restoreGeometry(s.value('annotate/geom').toByteArray()) - self.av.loadSettings(s, 'annotate/av') - -def run(ui, *pats, **opts): - pats = hglib.canonpaths(pats) - return AnnotateDialog(*pats, **opts)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
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
 
 
 
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
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
 
 
 
 
431
432
433
434
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
435
436
437
438
439
440
441
442
 
 
 
 
 
 
 
443
444
445
446
447
448
 
 
 
 
 
 
449
450
451
 
452
453
454
455
456
 
 
457
458
459
460
461
462
463
 
 
 
 
 
 
 
 
 
 
 
 
464
465
466
467
468
469
470
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
471
472
473
 
 
 
 
474
475
476
477
478
479
480
481
482
 
 
 
 
 
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
 
507
508
509
510
511
512
 
 
513
 
 
514
515
516
517
518
519
 
 
 
 
 
 
 
520
521
522
523
524
525
526
527
 
 
528
529
530
531
 
 
 
532
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
533
534
535
536
537
538
539
 
 
 
 
 
 
 
540
541
542
543
544
545
546
547
548
549
550
551
552
 
 
 
 
 
 
 
 
 
 
 
 
553
554
555
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
556
557
558
559
 
560
 
561
562
 
 
563
564
@@ -5,275 +5,560 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from PyQt4.QtCore import * -from PyQt4.QtGui import * - -from mercurial import merge as mergemod +from mercurial import hg, merge as mergemod    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, thgrepo   -keep = i18n.keepgettext() +from PyQt4.QtCore import * +from PyQt4.QtGui import *   -class BackoutDialog(QDialog): +class BackoutDialog(QWizard):   - def __init__(self, repo, rev='tip', parent=None, opts={}): + def __init__(self, rev, repo, parent):   super(BackoutDialog, self).__init__(parent)   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint) + + self.backoutrev = rev + self.parentbackout = False + + self.setWindowTitle(_('Backout - %s') % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-revert')) + self.setOption(QWizard.NoBackButtonOnStartPage, True) + self.setOption(QWizard.NoBackButtonOnLastPage, True) + self.setOption(QWizard.IndependentPages, True) + + self.addPage(SummaryPage(repo, self)) + self.addPage(BackoutPage(repo, self)) + self.addPage(CommitPage(repo, self)) + self.addPage(ResultPage(repo, self)) + self.currentIdChanged.connect(self.pageChanged) + + self.resize(QSize(700, 489).expandedTo(self.minimumSizeHint())) + + repo.repositoryChanged.connect(self.repositoryChanged) + repo.configChanged.connect(self.configChanged) + + def repositoryChanged(self): + self.currentPage().repositoryChanged() + + def configChanged(self): + self.currentPage().configChanged() + + def pageChanged(self, id): + if id != -1: + self.currentPage().currentPage() + + def reject(self): + if self.currentPage().canExit(): + super(BackoutDialog, self).reject() + + +class BasePage(QWizardPage): + def __init__(self, repo, parent): + super(BasePage, self).__init__(parent)   self.repo = repo   - # main layout box - box = QVBoxLayout() - box.setSpacing(8) - box.setContentsMargins(*(6,)*4) + def validatePage(self): + 'user pressed NEXT button, can we proceed?' + return True   - ## target revision - target_sep = qtlib.LabeledSeparator(_('Target changeset')) - box.addWidget(target_sep) + def isComplete(self): + 'should NEXT button be sensitive?' + return True   - style = csinfo.panelstyle(selectable=True) - self.targetinfo = csinfo.create(self.repo, rev, style, withupdate=True) - box.addWidget(self.targetinfo) + def repositoryChanged(self): + 'repository has detected a change to changelog or parents' + pass   - ## backout message - msg_sep = qtlib.LabeledSeparator(_('Backout commit message')) - box.addWidget(msg_sep) + def configChanged(self): + 'repository has detected a change to config files' + pass   - revhex = self.targetinfo.get_data('revid') - self.msgset = keep._('Backed out changeset: ') - self.msgset['id'] += revhex - self.msgset['str'] += revhex + def currentPage(self): + pass   - 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, 2) + def canExit(self): + return True   - ## options - opt_sep = qtlib.LabeledSeparator(_('Options')) - box.addWidget(opt_sep)   - obox = QVBoxLayout() - obox.setSpacing(3) - box.addLayout(obox) +class SummaryPage(BasePage):   - self.engChk = QCheckBox(_('Use English backout message')) - self.engChk.toggled.connect(self.eng_toggled) - engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) - self.engChk.setChecked(engmsg) + def __init__(self, repo, parent): + super(SummaryPage, self).__init__(repo, parent) + self.clean = False + self.th = None   - obox.addWidget(self.engChk) - self.mergeChk = QCheckBox(_('Commit backout before merging with ' - 'current working parent')) - self.mergeChk.toggled.connect(self.merge_toggled) - self.mergeChk.setChecked(bool(opts.get('merge'))) - self.msgTextEdit.setEnabled(False) - obox.addWidget(self.mergeChk) + def initializePage(self): + if self.layout(): + return + self.setTitle(_('Prepare to backout')) + self.setSubTitle(_('Verify backout revision and ensure your working ' + 'directory is clean.')) + self.setLayout(QVBoxLayout())   - self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts ' - 'where possible')) - self.autoresolve_chk.setChecked( + repo = self.repo + try: + bctx = repo[self.wizard().backoutrev] + pctx = repo['.'] + except error.RepoLookupError: + qtlib.InfoMsgBox(_('Unable to backout'), + _('Backout revision not found')) + QTimer.singleShot(0, self.wizard().close) + + if pctx == bctx: + lbl = _('Backing out a parent revision is a single step operation') + self.layout().addWidget(QLabel(u'<b>%s</b>' % lbl)) + self.wizard().parentbackout = True + + op1, op2 = repo.dirstate.parents() + a = repo.changelog.ancestor(op1, bctx.node()) + if a != bctx.node(): + qtlib.InfoMsgBox(_('Unable to backout'), + _('Cannot backout change on a different branch')) + QTimer.singleShot(0, self.wizard().close) + + ## backout revision + style = csinfo.panelstyle(contents=csinfo.PANEL_DEFAULT) + create = csinfo.factory(repo, None, style, withupdate=True) + sep = qtlib.LabeledSeparator(_('Backout revision')) + self.layout().addWidget(sep) + backoutCsInfo = create(bctx.rev()) + self.layout().addWidget(backoutCsInfo) + + ## current revision + contents = ('ishead',) + csinfo.PANEL_DEFAULT + style = csinfo.panelstyle(contents=contents) + def markup_func(widget, item, value): + if item == 'ishead' and value is False: + text = _('Not a head, backout will create a new head!') + return qtlib.markup(text, fg='red', weight='bold') + raise csinfo.UnknownItem(item) + custom = csinfo.custom(markup=markup_func) + create = csinfo.factory(repo, custom, style, withupdate=True) + + sep = qtlib.LabeledSeparator(_('Current local revision')) + self.layout().addWidget(sep) + localCsInfo = create(pctx.rev()) + self.layout().addWidget(localCsInfo) + self.localCsInfo = localCsInfo + + ## working directory status + sep = qtlib.LabeledSeparator(_('Working directory status')) + self.layout().addWidget(sep) + + self.groups = qtlib.WidgetGroups() + + wdbox = QHBoxLayout() + self.layout().addLayout(wdbox) + self.wd_status = qtlib.StatusLabel() + self.wd_status.set_status(_('Checking...')) + wdbox.addWidget(self.wd_status) + wd_prog = QProgressBar() + wd_prog.setMaximum(0) + wd_prog.setTextVisible(False) + self.groups.add(wd_prog, 'prog') + wdbox.addWidget(wd_prog, 1) + + text = _('Before backout, you must <a href="commit"><b>commit</b></a>, ' + '<a href="shelve"><b>shelve</b></a> to patch, ' + 'or <a href="discard"><b>discard</b></a> changes.') + wd_text = QLabel(text) + wd_text.setWordWrap(True) + wd_text.linkActivated.connect(self.onLinkActivated) + self.wd_text = wd_text + self.groups.add(wd_text, 'dirty') + self.layout().addWidget(wd_text) + + ## auto-resolve + autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts ' + 'where possible')) + autoresolve_chk.setChecked(   repo.ui.configbool('tortoisehg', 'autoresolve', False)) - obox.addWidget(self.autoresolve_chk) + self.registerField('autoresolve', autoresolve_chk) + self.layout().addWidget(autoresolve_chk) + self.autoresolve_chk = autoresolve_chk + self.groups.set_visible(False, 'dirty')   - if repo[revhex] == repo.parents()[0]: - # backing out the working parent is a one-step process - self.msgTextEdit.setEnabled(True) - self.mergeChk.setVisible(False) - self.autoresolve_chk.setVisible(False) - self.backoutParent = True + def isComplete(self): + 'should Next button be sensitive?' + return self.clean + + def repositoryChanged(self): + 'repository has detected a change to changelog or parents' + pctx = self.repo['.'] + self.localCsInfo.update(pctx) + self.wizard().localrev = str(pctx.rev()) + + def canExit(self): + 'can backout tool be closed?' + if self.th is not None and self.th.isRunning(): + self.th.cancel() + self.th.wait() + return True + + def currentPage(self): + self.refresh() + + def refresh(self): + if self.th is None: + self.th = CheckThread(self.repo, self) + self.th.finished.connect(self.threadFinished) + if self.th.isRunning(): + return + self.groups.set_visible(True, 'prog') + self.th.start() + + def threadFinished(self): + self.groups.set_visible(False, 'prog') + if self.th.canceled: + return + dirty, parents = self.th.results + self.clean = not dirty + if dirty: + self.groups.set_visible(True, 'dirty') + self.wd_status.set_status(_('<b>Uncommitted local changes ' + 'are detected</b>'), 'thg-warning')   else: - self.backoutParent = False + self.groups.set_visible(False, 'dirty') + self.wd_status.set_status(_('Clean'), True) + self.completeChanged.emit() + + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + cmd = hglib.fromunicode(cmd) + repo = self.repo + if cmd == 'commit': + dlg = commit.CommitDialog([], dict(root=repo.root), self) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + self.refresh() + elif cmd == 'shelve': + from tortoisehg.hgqt import shelve + dlg = shelve.ShelveDialog(repo, self.wizard()) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + self.refresh() + elif cmd.startswith('discard'): + if cmd != 'discard:noconfirm': + labels = [(QMessageBox.Yes, _('&Discard')), + (QMessageBox.No, _('Cancel'))] + if not qtlib.QuestionMsgBox(_('Confirm Discard'), + _('Discard outstanding changes to working directory?'), + labels=labels, parent=self): + return + def finished(ret): + repo.decrementBusyCount() + self.refresh() + cmdline = ['update', '--clean', '--repository', repo.root, + '--rev', '.'] + self.runner = cmdui.Runner(True, self) + self.runner.commandFinished.connect(finished) + repo.incrementBusyCount() + self.runner.run(cmdline) + elif cmd == 'view': + dlg = status.StatusDialog([], {}, repo.root, self) + dlg.exec_() + self.refresh() + else: + raise 'unknown command: %s' % cmd + + +class BackoutPage(BasePage): + def __init__(self, repo, parent): + super(BackoutPage, self).__init__(repo, parent) + self.backoutcomplete = False + + self.setTitle(_('Backing out, then merging...')) + self.setSubTitle(_('All conflicting files will be marked unresolved.')) + self.setLayout(QVBoxLayout()) + + self.cmd = cmdui.Widget(True, False, self) + self.cmd.commandFinished.connect(self.onCommandFinished) + self.cmd.setShowOutput(True) + self.layout().addWidget(self.cmd)     self.reslabel = QLabel() - self.reslabel.linkActivated.connect(self.link_activated) - box.addWidget(self.reslabel) + self.reslabel.linkActivated.connect(self.onLinkActivated) + self.reslabel.setWordWrap(True) + self.layout().addWidget(self.reslabel)   - ## command widget + self.autonext = QCheckBox(_('Automatically advance to next page ' + 'when backout and merge are complete.')) + checked = QSettings().value('backout/autoadvance', False).toBool() + self.autonext.setChecked(checked) + self.autonext.toggled.connect(self.tryAutoAdvance) + self.layout().addWidget(self.autonext) + + def currentPage(self): + if self.wizard().parentbackout: + self.wizard().next() + return + cmdline = ['--repository', self.repo.root, 'backout'] + tool = self.field('autoresolve').toBool() and 'merge' or 'fail' + cmdline += ['--tool=internal:' + tool] + cmdline += ['--rev', str(self.wizard().backoutrev)] + self.repo.incrementBusyCount() + self.cmd.core.clearOutput() + self.cmd.run(cmdline) + + def isComplete(self): + 'should Next button be sensitive?' + if not self.backoutcomplete: + return False + count = 0 + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if status == 'u': + count += 1 + if count: + # if autoresolve is enabled, we know these were real conflicts + self.reslabel.setText(_('%d files have <b>merge conflicts</b> ' + 'that must be <a href="resolve">' + '<b>resolved</b></a>') % count) + return False + else: + self.reslabel.setText(_('No merge conflicts, ready to commit')) + return True + + def tryAutoAdvance(self, checked): + if checked and self.isComplete(): + self.wizard().next() + + def cleanupPage(self): + QSettings().setValue('backout/autoadvance', self.autonext.isChecked()) + + def onCommandFinished(self, ret): + self.repo.decrementBusyCount() + if ret in (0, 1): + self.backoutcomplete = True + if self.autonext.isChecked(): + self.tryAutoAdvance(True) + self.completeChanged.emit() + + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + if cmd == 'resolve': + dlg = resolve.ResolveDialog(self.repo, self) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + if self.autonext.isChecked(): + self.tryAutoAdvance(True) + self.completeChanged.emit() + + +class CommitPage(BasePage): + + def __init__(self, repo, parent): + super(CommitPage, self).__init__(repo, parent) + self.commitComplete = False + + self.setTitle(_('Commit backout and merge results')) + self.setLayout(QVBoxLayout()) + self.setCommitPage(True) + + # csinfo + def label_func(widget, item, ctx): + if item == 'rev': + return _('Revision:') + elif item == 'parents': + return _('Parents') + raise csinfo.UnknownItem() + def data_func(widget, item, ctx): + if item == 'rev': + return _('Working Directory'), str(ctx) + elif item == 'parents': + parents = [] + cbranch = ctx.branch() + for pctx in ctx.parents(): + branch = None + if hasattr(pctx, 'branch') and pctx.branch() != cbranch: + branch = pctx.branch() + parents.append((str(pctx.rev()), str(pctx), branch, pctx)) + return parents + raise csinfo.UnknownItem() + def markup_func(widget, item, value): + if item == 'rev': + text, rev = value + if self.wizard() and self.wizard().parentbackout: + return '%s (%s)' % (text, rev) + else: + return '<a href="view">%s</a> (%s)' % (text, rev) + elif item == 'parents': + def branch_markup(branch): + opts = dict(fg='black', bg='#aaffaa') + return qtlib.markup(' %s ' % branch, **opts) + csets = [] + for rnum, rid, branch, pctx in value: + line = '%s (%s)' % (rnum, rid) + if branch: + line = '%s %s' % (line, branch_markup(branch)) + msg = widget.info.get_data('summary', widget, + pctx, widget.custom) + if msg: + line = '%s %s' % (line, msg) + csets.append(line) + return csets + raise csinfo.UnknownItem() + custom = csinfo.custom(label=label_func, data=data_func, + markup=markup_func) + contents = ('rev', 'user', 'dateage', 'branch', 'parents') + style = csinfo.panelstyle(contents=contents, margin=6) + + # merged files + rev_sep = qtlib.LabeledSeparator(_('Working Directory (merged)')) + self.layout().addWidget(rev_sep) + bkCsInfo = csinfo.create(repo, None, style, custom=custom, + withupdate=True) + bkCsInfo.linkActivated.connect(self.onLinkActivated) + self.layout().addWidget(bkCsInfo) + + # commit message area + msg_sep = qtlib.LabeledSeparator(_('Commit message')) + self.layout().addWidget(msg_sep) + msgEntry = commit.MessageEntry(self) + msgEntry.installEventFilter(qscilib.KeyPressInterceptor(self)) + msgEntry.refresh(repo) + msgEntry.loadSettings(QSettings(), 'backout/message') + + msgEntry.textChanged.connect(self.completeChanged) + self.layout().addWidget(msgEntry) + self.msgEntry = msgEntry +   self.cmd = cmdui.Widget(True, False, self) - self.cmd.commandStarted.connect(self.command_started) - self.cmd.commandFinished.connect(self.command_finished) - self.cmd.commandCanceling.connect(self.command_canceling) - box.addWidget(self.cmd, 1) + self.cmd.commandFinished.connect(self.onCommandFinished) + self.cmd.setShowOutput(False) + self.layout().addWidget(self.cmd)   - ## bottom buttons - buttons = QDialogButtonBox() - self.cancelBtn = buttons.addButton(QDialogButtonBox.Cancel) - self.cancelBtn.clicked.connect(self.cancel_clicked) - self.closeBtn = buttons.addButton(QDialogButtonBox.Close) - self.closeBtn.clicked.connect(self.reject) - self.backoutBtn = buttons.addButton(_('&Backout'), - QDialogButtonBox.ActionRole) - self.backoutBtn.clicked.connect(self.backout) - self.detailBtn = buttons.addButton(_('Detail'), - QDialogButtonBox.ResetRole) - self.detailBtn.setAutoDefault(False) - self.detailBtn.setCheckable(True) - self.detailBtn.toggled.connect(self.detail_toggled) - box.addWidget(buttons) + def tryperform(): + if self.isComplete(): + self.wizard().next() + actionEnter = QAction('alt-enter', self) + actionEnter.setShortcuts([Qt.CTRL+Qt.Key_Return, Qt.CTRL+Qt.Key_Enter]) + actionEnter.triggered.connect(tryperform) + self.addAction(actionEnter)   - # dialog setting - self.setLayout(box) - self.setMinimumWidth(480) - self.setMaximumHeight(800) - self.resize(0, 340) - self.setWindowTitle(_("Backout '%s' - %s") % (revhex, - self.repo.displayname)) + self.skiplast = QCheckBox(_('Skip final confirmation page, ' + 'close after commit.')) + checked = QSettings().value('backout/skiplast', False).toBool() + self.skiplast.setChecked(checked) + self.layout().addWidget(self.skiplast)   - # prepare to show - self.cmd.setHidden(True) - self.cancelBtn.setHidden(True) - self.detailBtn.setHidden(True) - self.msgTextEdit.setFocus() - self.msgTextEdit.moveCursorToEnd() + def refresh(self): + pass   - ### Private Methods ### + def cleanupPage(self): + s = QSettings() + s.setValue('backout/skiplast', self.skiplast.isChecked()) + self.msgEntry.saveSettings(s, 'backout/message')   - def merge_toggled(self, checked): - self.msgTextEdit.setEnabled(checked) + def currentPage(self): + engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) + msgset = i18n.keepgettext()._('Backed out changeset: ') + msg = engmsg and msgset['id'] or msgset['str'] + self.msgEntry.setText(msg + str(self.repo[self.wizard().backoutrev])) + self.msgEntry.moveCursorToEnd()   - def eng_toggled(self, checked): - msg = self.msgTextEdit.text() - origmsg = (checked and self.msgset['str'] or self.msgset['id']) - if msg != origmsg: - if not qtlib.QuestionMsgBox(_('Confirm Discard Message'), - _('Discard current backout message?'), parent=self): - self.engChk.blockSignals(True) - self.engChk.setChecked(not checked) - self.engChk.blockSignals(False) - return - newmsg = (checked and self.msgset['id'] or self.msgset['str']) - self.msgTextEdit.setText(newmsg) + @pyqtSlot(QString) + def onLinkActivated(self, cmd): + if cmd == 'view': + dlg = status.StatusDialog([], {}, self.repo.root, self) + dlg.exec_() + self.refresh()   - def backout(self): - # prepare command line - revhex = self.targetinfo.get_data('revid') - cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root] - cmdline += ['--tool=internal:' + - (self.autoresolve_chk.isChecked() and 'merge' or 'fail')] - if self.backoutParent: - msg = self.msgTextEdit.text() - cmdline += ['--message='+hglib.fromunicode(msg)] - commandlines = [cmdline] - pushafter = self.repo.ui.config('tortoisehg', 'cipushafter') - if pushafter: - cmd = ['push', '--repository', self.repo.root, pushafter] - commandlines.append(cmd) - elif self.mergeChk.isChecked(): - cmdline += ['--merge'] - msg = self.msgTextEdit.text() - cmdline += ['--message', hglib.fromunicode(msg)] - commandlines = [cmdline] + def isComplete(self): + return len(self.msgEntry.text()) > 0   - # start backing out - self.cmdline = cmdline - self.repo.incrementBusyCount() - self.cmd.run(*commandlines) + def validatePage(self): + if self.commitComplete: + # commit succeeded, repositoryChanged() called wizard().next() + if self.skiplast.isChecked(): + self.wizard().close() + return True + if self.cmd.core.running(): + return False   - def commit(self): - cmdline = ['commit', '--repository', self.repo.root] - msg = self.msgTextEdit.text() - cmdline += ['--message='+hglib.fromunicode(msg)] - self.cmdline = cmdline + if self.wizard().parentbackout: + self.setTitle(_('Backing out and committing...')) + self.setSubTitle(_('Please wait while making backout.')) + message = hglib.fromunicode(self.msgEntry.text()) + cmdline = ['backout', '--verbose', '--message', message, '--rev', + str(self.wizard().backoutrev), + '--repository', self.repo.root] + else: + self.setTitle(_('Committing...')) + self.setSubTitle(_('Please wait while committing merged files.')) + message = hglib.fromunicode(self.msgEntry.text()) + cmdline = ['commit', '--verbose', '--message', message, + '--repository', self.repo.root]   commandlines = [cmdline]   pushafter = self.repo.ui.config('tortoisehg', 'cipushafter')   if pushafter:   cmd = ['push', '--repository', self.repo.root, pushafter]   commandlines.append(cmd) +   self.repo.incrementBusyCount() + self.cmd.setShowOutput(True)   self.cmd.run(*commandlines) + return False   - ### Signal Handlers ### + def onCommandFinished(self, ret): + self.repo.decrementBusyCount() + if ret == 0: + self.commitComplete = True + self.wizard().next()   - def cancel_clicked(self): - self.cmd.cancel()   - def detail_toggled(self, checked): - self.cmd.setShowOutput(checked) +class ResultPage(BasePage): + def __init__(self, repo, parent): + super(ResultPage, self).__init__(repo, parent) + self.setTitle(_('Finished')) + self.setFinalPage(True)   - def command_started(self): - self.cmd.setShown(True) - self.mergeChk.setVisible(False) - self.closeBtn.setHidden(True) - self.cancelBtn.setShown(True) - self.detailBtn.setShown(True) - self.backoutBtn.setEnabled(False) + self.setLayout(QVBoxLayout()) + sep = qtlib.LabeledSeparator(_('Backout changeset')) + self.layout().addWidget(sep) + bkCsInfo = csinfo.create(self.repo, 'tip', withupdate=True) + self.layout().addWidget(bkCsInfo) + self.bkCsInfo = bkCsInfo + self.layout().addStretch(1)   - def command_canceling(self): - self.cancelBtn.setDisabled(True) + def currentPage(self): + self.bkCsInfo.update(self.repo['tip']) + self.wizard().setOption(QWizard.NoCancelButton, True)   - def command_finished(self, ret): - self.repo.decrementBusyCount() - self.cancelBtn.setHidden(True)   - # If the action wasn't successful, display the output and we're done - if ret not in (0, 1): - self.detailBtn.setChecked(True) - self.closeBtn.setShown(True) - self.closeBtn.setAutoDefault(True) - self.closeBtn.setFocus() - else: - finished = True - #If we backed out our parent, there is no second commit step - if self.cmdline[0] == 'backout' and not self.backoutParent: - finished = False - self.msgTextEdit.setEnabled(True) - self.backoutBtn.setEnabled(True) - self.backoutBtn.setText(_('Commit')) - self.backoutBtn.clicked.disconnect(self.backout) - self.backoutBtn.clicked.connect(self.commit) - self.checkResolve() +class CheckThread(QThread): + def __init__(self, repo, parent): + QThread.__init__(self, parent) + self.repo = hg.repository(repo.ui, repo.root) + self.results = (False, 1) + self.canceled = False   - if finished: - if not self.cmd.outputShown(): - self.accept() - else: - self.closeBtn.clicked.disconnect(self.reject) - self.closeBtn.clicked.connect(self.accept) - self.closeBtn.setHidden(False) + def run(self): + self.repo.dirstate.invalidate() + unresolved = False + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if self.canceled: + return + if status == 'u': + unresolved = True + break + wctx = self.repo[None] + dirty = bool(wctx.dirty()) or unresolved + self.results = (dirty, len(wctx.parents()))   - def checkResolve(self): - for root, path, status in thgrepo.recursiveMergeStatus(self.repo): - if status == 'u': - txt = _('Backout generated merge <b>conflicts</b> that must ' - 'be <a href="resolve"><b>resolved</b></a>') - self.backoutBtn.setEnabled(False) - break - else: - self.backoutBtn.setEnabled(True) - txt = _('You may commit the backed out changes after ' - '<a href="status"><b>verifying</b></a> them') - self.reslabel.setText(txt) + def cancel(self): + self.canceled = True   - @pyqtSlot(QString) - def link_activated(self, cmd): - if cmd == 'resolve': - dlg = resolve.ResolveDialog(self.repo, self) - dlg.finished.connect(dlg.deleteLater) - dlg.exec_() - self.checkResolve() - elif cmd == 'status': - dlg = status.StatusDialog([], {}, self.repo.root, self) - dlg.finished.connect(dlg.deleteLater) - 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   repo = thgrepo.repository(ui, path=paths.find_root()) - kargs = {'opts': opts}   if opts.get('rev'): - kargs['rev'] = opts.get('rev') + rev = opts.get('rev')   elif len(pats) == 1: - kargs['rev'] = pats[0] - return BackoutDialog(repo, **kargs) + rev = pats[0] + return BackoutDialog(rev, repo, None)
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​bugreport.py Stacked
 
8
9
10
11
 
12
13
14
 
147
148
149
 
150
151
152
 
159
160
161
162
163
164
165
166
 
 
 
 
 
 
 
 
 
 
 
 
 
167
168
169
 
8
9
10
 
11
12
13
14
 
147
148
149
150
151
152
153
 
160
161
162
 
163
 
 
 
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
@@ -8,7 +8,7 @@
 import os  import sys   -from mercurial import extensions, ui +from mercurial import extensions  from tortoisehg.util import hglib, version  from tortoisehg.hgqt.i18n import _   @@ -147,6 +147,7 @@
  self._textlabel = QLabel(text, wordWrap=True,   textInteractionFlags=labelflags)   self._textlabel.linkActivated.connect(self._openlink) + self._textlabel.setWordWrap(False)   self.layout().addWidget(self._textlabel)     bb = QDialogButtonBox(QDialogButtonBox.Close, centerButtons=True) @@ -159,11 +160,20 @@
  if ref == '#bugreport':   return BugReport(self._opts, self).exec_()   if ref.startswith('#edit:'): - from tortoisehg.hgqt import wctxactions   fname, lineno = ref[6:].rsplit(':', 1) - # A chicken-egg problem here, we need a ui to get your - # editor in order to repair your ui config file. - wctxactions.edit(self, ui.ui(), None, [fname], lineno, None) + try: + # A chicken-egg problem here, we need a ui to get your + # editor in order to repair your ui config file. + from mercurial import ui as uimod + from tortoisehg.hgqt import qtlib + class FakeRepo(object): + def __init__(self): + self.root = os.getcwd() + self.ui = uimod.ui() + fake = FakeRepo() + qtlib.editfiles(fake, [fname], lineno, parent=self) + except Exception, e: + QDesktopServices.openUrl(QUrl.fromLocalFile(fname))    def run(ui, *pats, **opts):   return BugReport(opts)
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
15
16
17
18
19
 
 
20
21
22
 
71
72
73
74
 
75
76
77
 
146
147
148
149
150
 
 
151
152
153
 
347
348
349
350
351
 
 
 
 
 
352
353
354
 
582
583
584
585
 
586
587
588
 
15
16
17
 
 
18
19
20
21
22
 
71
72
73
 
74
75
76
77
 
146
147
148
 
 
149
150
151
152
153
 
347
348
349
 
 
350
351
352
353
354
355
356
357
 
585
586
587
 
588
589
590
591
@@ -15,8 +15,8 @@
 from tortoisehg.util import hglib  from tortoisehg.util.patchctx import patchctx  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, thgrepo, qscilib, lexers, wctxactions -from tortoisehg.hgqt import filelistmodel, filelistview, fileview +from tortoisehg.hgqt import qtlib, thgrepo, qscilib, lexers +from tortoisehg.hgqt import filelistmodel, filelistview, filedata    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -71,7 +71,7 @@
  self.diffbrowse.linkActivated.connect(self.linkActivated)   self.diffbrowse.chunksSelected.connect(self.chunksSelected)   - self.filelist.fileRevSelected.connect(self.displayFile) + self.filelist.fileSelected.connect(self.displayFile)   self.filelist.clearDisplay.connect(self.diffbrowse.clearDisplay)     self.splitter.setStretchFactor(0, 0) @@ -146,8 +146,8 @@
  if isinstance(ctx, patchctx):   path = ctx._path   else: - path = self.repo.wjoin(self.currentFile) - wctxactions.edit(self, self.repo.ui, self.repo, [path]) + path = self.currentFile + qtlib.editfiles(self.repo, [path], parent=self)     def getSelectedFileAndChunks(self):   chunks = self.diffbrowse.curchunks @@ -347,8 +347,11 @@
  else:   return []   - @pyqtSlot(object, object, object) - def displayFile(self, file, rev, status): + @pyqtSlot(QString, QString) + def displayFile(self, file, status): + if isinstance(file, (unicode, QString)): + file = hglib.fromunicode(file) + status = hglib.fromunicode(status)   if file:   self.currentFile = file   path = self.repo.wjoin(file) @@ -582,7 +585,7 @@
  self._lastfile = filename   self.clearChunks()   - fd = fileview.FileData(self._ctx, None, filename, status) + fd = filedata.FileData(self._ctx, None, filename, status)     if fd.elabel:   self.extralabel.setText(fd.elabel)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​clone.py Stacked
 
21
22
23
 
24
25
26
 
366
367
368
 
 
 
 
 
369
370
371
 
21
22
23
24
25
26
27
 
367
368
369
370
371
372
373
374
375
376
377
@@ -21,6 +21,7 @@
 class CloneDialog(QDialog):     cmdfinished = pyqtSignal(int) + clonedRepository = pyqtSignal(QString)     def __init__(self, args=None, opts={}, parent=None):   super(CloneDialog, self).__init__(parent) @@ -366,6 +367,11 @@
  else:   self.accept()   + if not ret: + # Let the workbench know that a repository has been successfully + # cloned + self.clonedRepository.emit(self.dest_combo.currentText()) +   def onCloseClicked(self):   if self.ret is 0:   self.accept()
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
14
15
16
17
 
18
19
20
 
188
189
190
 
 
191
192
193
 
219
220
221
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
222
223
224
 
296
297
298
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
299
300
301
 
629
630
631
 
 
632
633
634
 
14
15
16
 
17
18
19
20
 
188
189
190
191
192
193
194
195
 
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
 
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
 
670
671
672
673
674
675
676
677
@@ -14,7 +14,7 @@
 from PyQt4.Qsci import QsciScintilla, QsciAPIs, QsciLexerMakefile    from tortoisehg.hgqt.i18n import _ -from tortoisehg.util import hglib, shlib, wconfig +from tortoisehg.util import hglib, shlib, wconfig, bugtraq  from tortoisehg.hgqt import qtlib, qscilib, status, cmdui, branchop, revpanel    # Technical Debt for CommitWidget @@ -188,6 +188,8 @@
    self.opts['pushafter'] = repo.ui.config('tortoisehg', 'cipushafter', '')   self.opts['autoinc'] = repo.ui.config('tortoisehg', 'autoinc', '') + self.opts['bugtraqplugin'] = repo.ui.config('tortoisehg', 'issue.bugtraqplugin', None) + self.opts['bugtraqparameters'] = repo.ui.config('tortoisehg', 'tortoisehg.issue.bugtraqparameters', None)     layout = QVBoxLayout()   layout.setContentsMargins(2, 2, 2, 2) @@ -219,6 +221,25 @@
    tbar.addAction(_('Options')).triggered.connect(self.details)   tbar.setIconSize(QSize(16,16)) + + if self.opts['bugtraqplugin'] != None: + self.bugtraq = self.createBugTracker() + try: + parameters = self.opts['bugtraqparameters'] + linktext = self.bugtraq.get_link_text(parameters) + except Exception, e: + tracker = self.opts['bugtraqplugin'].split(' ', 1)[1] + qtlib.ErrorMsgBox(_('Issue Tracker'), + _('Failed to load issue tracker \'%s\': %s' + % (tracker, e)), + parent=self) + self.bugtraq = None + else: + # connect UI because we have a valid bug tracker + self.commitComplete.connect(self.bugTrackerPostCommit) + tbar.addAction(linktext).triggered.connect( + self.getBugTrackerCommitMessage) +   self.stopAction = tbar.addAction(_('Stop'))   self.stopAction.triggered.connect(self.stop)   self.stopAction.setIcon(qtlib.geticon('process-stop')) @@ -296,6 +317,26 @@
  'QsciAPIs has finished parsing displayed file'   self.msgte.lexer().setAPIs(self._apis)   + def bugTrackerPostCommit(self): + # commit already happened, get last message in history + message = self.lastmessage + error = self.bugtraq.on_commit_finished(message) + if error != None and len(error) > 0: + qtlib.ErrorMsgBox(_('Issue Tracker'), error, parent=self) + # recreate bug tracker to get new COM object for next commit + self.bugtraq = self.createBugTracker() + + def createBugTracker(self): + bugtraqid = self.opts['bugtraqplugin'].split(' ', 1)[0] + result = bugtraq.BugTraq(bugtraqid) + return result + + def getBugTrackerCommitMessage(self): + parameters = self.opts['bugtraqparameters'] + message = self.getMessage() + newMessage = self.bugtraq.get_commit_message(parameters, message) + self.setMessage(newMessage) +   def details(self):   dlg = DetailsDialog(self.opts, self.userhist, self)   dlg.finished.connect(dlg.deleteLater) @@ -629,6 +670,8 @@
  self.commitButtonEnable.emit(True)   self.repo.decrementBusyCount()   if ret == 0: + # capture last message for BugTraq plugin + self.lastmessage = self.getMessage()   self.branchop = None   umsg = self.msgte.text()   if umsg:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​csinfo.py Stacked
 
223
224
225
226
 
227
228
229
 
223
224
225
 
226
227
228
229
@@ -223,7 +223,7 @@
  raise UnknownItem(item)   if 'label' in custom and not kargs.get('usepreset', False):   try: - return custom['label'](widget, item) + return custom['label'](widget, item, ctx)   except UnknownItem:   pass   try:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​cslist.py Stacked
 
81
82
83
84
 
85
86
 
87
88
89
 
81
82
83
 
84
85
 
86
87
88
89
@@ -81,9 +81,9 @@
  filename = os.path.basename(widget.target)   return filename, revid   raise csinfo.UnknownItem(item) - def labelfunc(widget, item): + def labelfunc(widget, item, ctx):   if item in ('item', 'item_l'): - if not isinstance(widget.ctx, patchctx): + if not isinstance(ctx, patchctx):   return _('Revision:')   return _('Patch:')   raise csinfo.UnknownItem(item)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
copied from tortoisehg/hgqt/fileview.py
 
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
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
 
570
571
572
 
 
573
574
575
 
 
 
1
2
 
 
 
 
3
4
 
 
 
 
 
 
 
 
 
 
5
6
7
8
 
 
9
 
 
10
11
12
13
14
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
15
16
17
 
66
67
68
69
70
71
72
73
@@ -1,521 +1,17 @@
-# Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE). -# http://www.logilab.fr/ -- mailto:contact@logilab.fr +# filedata.py - generate displayable file data  # -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Copyright 2011 Steve Borho <steve@borho.org>  # -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -""" -Qt4 high level widgets for hg repo changelogs and filelogs -""" +# 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 -import difflib -import re   -from mercurial import hg, error, match, patch, util -from mercurial import ui as uimod, mdiff +from mercurial import error, match, patch, util, mdiff +from mercurial import ui as uimod    from tortoisehg.util import hglib, patchctx  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import annotate, qscilib, qtlib, blockmatcher, lexers -from tortoisehg.hgqt import visdiff, wctxactions - -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from PyQt4 import Qsci - -qsci = Qsci.QsciScintilla - -class HgFileView(QFrame): - """file diff and content viewer""" - - linkActivated = pyqtSignal(QString) - fileDisplayed = pyqtSignal(QString, QString) - showMessage = pyqtSignal(QString) - revisionSelected = pyqtSignal(int) - shelveToolExited = pyqtSignal() - - searchRequested = pyqtSignal(unicode) - """Emitted (pattern) when user request to search content""" - - grepRequested = pyqtSignal(unicode, dict) - """Emitted (pattern, opts) when user request to search changelog""" - - def __init__(self, repo, parent): - QFrame.__init__(self, parent) - framelayout = QVBoxLayout(self) - framelayout.setContentsMargins(0,0,0,0) - framelayout.setSpacing(0) - - l = QHBoxLayout() - l.setContentsMargins(0,0,0,0) - l.setSpacing(0) - - self.repo = repo - self.topLayout = QVBoxLayout() - - self.labelhbox = hbox = QHBoxLayout() - hbox.setContentsMargins(0,0,0,0) - hbox.setSpacing(2) - self.topLayout.addLayout(hbox) - - self.diffToolbar = QToolBar(_('Diff Toolbar')) - self.diffToolbar.setIconSize(QSize(16,16)) - hbox.addWidget(self.diffToolbar) - - self.filenamelabel = w = QLabel() - w.setWordWrap(True) - f = w.textInteractionFlags() - w.setTextInteractionFlags(f | Qt.TextSelectableByMouse) - w.linkActivated.connect(self.linkActivated) - hbox.addWidget(w, 1) - - self.extralabel = w = QLabel() - w.setWordWrap(True) - w.linkActivated.connect(self.linkActivated) - self.topLayout.addWidget(w) - w.hide() - - framelayout.addLayout(self.topLayout) - framelayout.addLayout(l, 1) - - hbox = QHBoxLayout() - hbox.setContentsMargins(0, 0, 0, 0) - hbox.setSpacing(0) - l.addLayout(hbox) - - self.blk = blockmatcher.BlockList(self) - self.sci = annotate.AnnotateView(repo, self) - hbox.addWidget(self.blk) - hbox.addWidget(self.sci, 1) - - for name in ('searchRequested', 'editSelected', 'grepRequested'): - getattr(self.sci, name).connect(getattr(self, name)) - self.sci.revisionHint.connect(self.showMessage) - self.sci.sourceChanged.connect(self.sourceChanged) - self.sci.setAnnotationEnabled(False) - - self.blk.linkScrollBar(self.sci.verticalScrollBar()) - self.blk.setVisible(False) - - self.sci.setFrameStyle(0) - self.sci.setReadOnly(True) - self.sci.setUtf8(True) - self.sci.installEventFilter(qscilib.KeyPressInterceptor(self)) - self.sci.setCaretLineVisible(False) - - # define markers for colorize zones of diff - self.markerplus = self.sci.markerDefine(qsci.Background) - self.markerminus = self.sci.markerDefine(qsci.Background) - self.markertriangle = self.sci.markerDefine(qsci.Background) - self.sci.setMarkerBackgroundColor(QColor('#B0FFA0'), self.markerplus) - self.sci.setMarkerBackgroundColor(QColor('#A0A0FF'), self.markerminus) - self.sci.setMarkerBackgroundColor(QColor('#FFA0A0'), self.markertriangle) - - # hide margin 0 (markers) - self.sci.setMarginType(0, qsci.SymbolMargin) - self.sci.setMarginWidth(0, 0) - - self.searchbar = qscilib.SearchToolBar(hidable=True) - self.searchbar.hide() - self.searchbar.searchRequested.connect(self.find) - self.searchbar.conditionChanged.connect(self.highlightText) - self.layout().addWidget(self.searchbar) - - self._ctx = None - self._filename = None - self._status = None - self._mode = None - self._lostMode = None - self._lastSearch = u'', False - self._lastScrollPosition = 0 - - self.actionDiffMode = QAction(qtlib.geticon('view-diff'), - _('View change as unified diff output'), - self) - self.actionDiffMode.setCheckable(True) - self.actionFileMode = QAction(qtlib.geticon('view-file'), - _('View change in context of file'), - self) - self.actionFileMode.setCheckable(True) - self.actionAnnMode = QAction(qtlib.geticon('view-annotate'), - _('View change in context, annotate with ' - 'revision number'), - self) - self.actionAnnMode.setCheckable(True) - - self.modeToggleGroup = QActionGroup(self) - self.modeToggleGroup.addAction(self.actionDiffMode) - self.modeToggleGroup.addAction(self.actionFileMode) - self.modeToggleGroup.addAction(self.actionAnnMode) - self.modeToggleGroup.triggered.connect(self.setMode) - - # Next/Prev diff (in full file mode) - self.actionNextDiff = QAction(qtlib.geticon('go-down'), - 'Next diff (alt+down)', self) - self.actionNextDiff.setShortcut('Alt+Down') - self.actionNextDiff.triggered.connect(self.nextDiff) - self.actionPrevDiff = QAction(qtlib.geticon('go-up'), - 'Previous diff (alt+up)', self) - self.actionPrevDiff.setShortcut('Alt+Up') - self.actionPrevDiff.triggered.connect(self.prevDiff) - - self.forceMode('diff') - - self.actionFind = self.searchbar.toggleViewAction() - self.actionFind.setIcon(qtlib.geticon('edit-find')) - self.actionFind.setToolTip(_('Toggle display of text search bar')) - self.actionFind.setShortcut(QKeySequence.Find) - - self.actionShelf = QAction('Shelve', self) - self.actionShelf.setIcon(qtlib.geticon('shelve')) - self.actionShelf.setToolTip(_('Open shelve tool')) - self.actionShelf.triggered.connect(self.launchShelve) - - tb = self.diffToolbar - tb.addAction(self.actionDiffMode) - tb.addAction(self.actionFileMode) - tb.addAction(self.actionAnnMode) - tb.addSeparator() - tb.addAction(self.actionNextDiff) - tb.addAction(self.actionPrevDiff) - tb.addSeparator() - tb.addAction(self.actionFind) - tb.addAction(self.actionShelf) - - self.timer = QTimer() - self.timer.setSingleShot(False) - self.timer.timeout.connect(self.timerBuildDiffMarkers) - - def launchShelve(self): - from tortoisehg.hgqt import shelve - # TODO: pass self._filename - dlg = shelve.ShelveDialog(self.repo, self) - dlg.finished.connect(dlg.deleteLater) - dlg.exec_() - self.shelveToolExited.emit() - - def setFont(self, font): - self.sci.setFont(font) - - def loadSettings(self, qs, prefix): - self.sci.loadSettings(qs, prefix) - - def saveSettings(self, qs, prefix): - self.sci.saveSettings(qs, prefix) - - def setRepo(self, repo): - self.repo = repo - self.sci.repo = repo - - @pyqtSlot(QAction) - def setMode(self, action): - 'One of the mode toolbar buttons has been toggled' - - mode = {self.actionDiffMode.text():'diff', - self.actionFileMode.text():'file', - self.actionAnnMode.text() :'ann'}[action.text()] - self.actionNextDiff.setEnabled(mode == 'file') - self.actionPrevDiff.setEnabled(False) - self.blk.setVisible(mode == 'file') - self.sci.setAnnotationEnabled(mode == 'ann') - if mode != self._mode: - self._mode = mode - if not self._lostMode: - self.displayFile() - - def forceMode(self, mode): - 'Force into file or diff mode, based on content constaints' - assert mode in ('diff', 'file') - if self._lostMode is None: - self._lostMode = self._mode - self._mode = mode - if mode == 'diff': - self.actionDiffMode.setChecked(True) - else: - self.actionFileMode.setChecked(True) - self.actionDiffMode.setEnabled(False) - self.actionFileMode.setEnabled(False) - self.actionAnnMode.setEnabled(False) - self.actionNextDiff.setEnabled(False) - self.actionPrevDiff.setEnabled(False) - self.blk.setVisible(mode == 'file') - self.sci.setAnnotationEnabled(False) - - def setContext(self, ctx): - self._ctx = ctx - self._p_rev = None - self.sci.setTabWidth(ctx._repo.tabwidth) - self.actionAnnMode.setVisible(ctx.rev() != None) - self.actionShelf.setVisible(ctx.rev() == None) - - def displayDiff(self, rev): - if rev != self._p_rev: - self.displayFile(rev=rev) - - @pyqtSlot() - def clearDisplay(self): - self._filename = None - self._lastScrollPosition = 0 - self.forceMode('diff') - self.clearMarkup() - - def clearMarkup(self): - self.sci.clear() - self.blk.clear() - # Setting the label to ' ' rather than clear() keeps the label - # from disappearing during refresh, and tool layouts bouncing - self.filenamelabel.setText(' ') - self.extralabel.hide() - - def displayFile(self, filename=None, rev=None, status=None): - # Get the last visible line to restore it after reloading the editor - self._lastScrollPosition = self.sci.firstVisibleLine() - - if filename is None: - filename, status = self._filename, self._status - else: - if self._filename != filename: - # Reset the scroll positions when the file is changed - self._lastScrollPosition = 0 - self._filename, self._status = filename, status - if isinstance(filename, (unicode, QString)): - filename = hglib.fromunicode(filename) - if rev is not None: - self._p_rev = rev - - self.clearMarkup() - if filename is None: - self.forceMode('file') - return - - if self._p_rev is not None: - ctx2 = self.repo[self._p_rev] - else: - ctx2 = None - - fd = FileData(self._ctx, ctx2, filename, status) - - if fd.elabel: - self.extralabel.setText(fd.elabel) - self.extralabel.show() - else: - self.extralabel.hide() - self.filenamelabel.setText(fd.flabel) - - if not fd.isValid(): - self.sci.setText(fd.error) - self.forceMode('file') - return - - if fd.diff and not fd.contents: - self.forceMode('diff') - elif fd.contents and not fd.diff: - self.forceMode('file') - elif not fd.contents and not fd.diff: - self.forceMode('file') - else: - self.actionDiffMode.setEnabled(True) - self.actionFileMode.setEnabled(True) - self.actionAnnMode.setEnabled(True) - if self._lostMode: - if self._lostMode == 'diff': - self.actionDiffMode.trigger() - elif self._lostMode == 'file': - self.actionFileMode.trigger() - elif self._lostMode == 'ann': - self.actionAnnMode.trigger() - self._lostMode = None - - if self._mode == 'diff': - self.sci.setMarginWidth(1, 0) - lexer = lexers.get_diff_lexer(self) - self.sci.setLexer(lexer) - if lexer is None: - self.setFont(qtlib.getfont('fontlog').font()) - # trim first three lines, for example: - # diff -r f6bfc41af6d7 -r c1b18806486d tortoisehg/hgqt/thgrepo.py - # --- a/tortoisehg/hgqt/thgrepo.py - # +++ b/tortoisehg/hgqt/thgrepo.py - out = fd.diff.split('\n', 3) - if len(out) == 4: - self.sci.setText(hglib.tounicode(out[3])) - else: - # there was an error or rename without diffs - self.sci.setText(hglib.tounicode(fd.diff)) - elif fd.contents is None: - return - elif self._mode == 'ann': - self.sci.setSource(filename, self._ctx.rev()) - - # Recover the last scroll position - # Make sure that _lastScrollPosition never exceeds the amount of - # lines on the editor - self._lastScrollPosition = min(self._lastScrollPosition, \ - self.sci.lines() - 1) - self.sci.verticalScrollBar().setValue(self._lastScrollPosition) - else: - lexer = lexers.get_lexer(filename, fd.contents, self) - self.sci.setLexer(lexer) - if lexer is None: - self.setFont(qtlib.getfont('fontlog').font()) - self.sci.setText(fd.contents) - self.sci._updatemarginwidth() - - # Recover the last scroll position - # Make sure that _lastScrollPosition never exceeds the amount of - # lines on the editor - self._lastScrollPosition = min(self._lastScrollPosition, \ - self.sci.lines() - 1) - self.sci.verticalScrollBar().setValue(self._lastScrollPosition) - - self.highlightText(*self._lastSearch) - uf = hglib.tounicode(self._filename) - self.fileDisplayed.emit(uf, fd.contents or QString()) - - if self._mode == 'file' and fd.contents and fd.olddata: - # Update blk margin - if self.timer.isActive(): - self.timer.stop() - - self._fd = fd - self.actionNextDiff.setEnabled(False) - self.actionPrevDiff.setEnabled(False) - self.blk.syncPageStep() - self.timer.start() - - # - # These four functions are used by Shift+Cursor actions in revdetails - # - def nextLine(self): - x, y = self.sci.getCursorPosition() - self.sci.setCursorPosition(x+1, y) - - def prevLine(self): - x, y = self.sci.getCursorPosition() - self.sci.setCursorPosition(x-1, y) - - def nextCol(self): - x, y = self.sci.getCursorPosition() - self.sci.setCursorPosition(x, y+1) - - def prevCol(self): - x, y = self.sci.getCursorPosition() - self.sci.setCursorPosition(x, y-1) - - @pyqtSlot(unicode, object) - @pyqtSlot(unicode, object, int) - def sourceChanged(self, path, rev, line=None): - self.revisionSelected.emit(rev) - - @pyqtSlot(unicode, object, int) - def editSelected(self, path, rev, line): - """Open editor to show the specified file""" - path = hglib.fromunicode(path) - base = visdiff.snapshot(self.repo, [path], self.repo[rev])[0] - files = [os.path.join(base, path)] - pattern = hglib.fromunicode(self._lastSearch[0]) - wctxactions.edit(self, self.repo.ui, self.repo, files, line, pattern) - - @pyqtSlot(unicode, bool, bool, bool) - def find(self, exp, icase=True, wrap=False, forward=True): - self.sci.find(exp, icase, wrap, forward) - - @pyqtSlot(unicode, bool) - def highlightText(self, match, icase=False): - self._lastSearch = match, icase - self.sci.highlightText(match, icase) - - def verticalScrollBar(self): - return self.sci.verticalScrollBar() - - # - # file mode diff markers - # - def timerBuildDiffMarkers(self): - 'show modified and added lines in the self.blk margin' - self.sci.setUpdatesEnabled(False) - self.blk.setUpdatesEnabled(False) - - if self._fd: - olddata = self._fd.olddata.splitlines() - newdata = self._fd.contents.splitlines() - diff = difflib.SequenceMatcher(None, olddata, newdata) - self._opcodes = diff.get_opcodes() - self._fd = None - self._diffs = [] - - for tag, alo, ahi, blo, bhi in self._opcodes[:30]: - if tag == 'replace': - self._diffs.append([blo, bhi]) - self.blk.addBlock('x', blo, bhi) - for i in range(blo, bhi): - self.sci.markerAdd(i, self.markertriangle) - elif tag == 'insert': - self._diffs.append([blo, bhi]) - self.blk.addBlock('+', blo, bhi) - for i in range(blo, bhi): - self.sci.markerAdd(i, self.markerplus) - elif tag in ('equal', 'delete'): - pass - else: - raise ValueError, 'unknown tag %r' % (tag,) - - self._opcodes = self._opcodes[30:] - if not self._opcodes: - self.actionNextDiff.setEnabled(bool(self._diffs)) - self.actionPrevDiff.setEnabled(False) - self.timer.stop() - - self.sci.setUpdatesEnabled(True) - self.blk.setUpdatesEnabled(True) - - def nextDiff(self): - if self._mode == 'diff' or not self._diffs: - self.actionNextDiff.setEnabled(False) - self.actionPrevDiff.setEnabled(False) - return - row, column = self.sci.getCursorPosition() - for i, (lo, hi) in enumerate(self._diffs): - if lo > row: - last = (i == (len(self._diffs)-1)) - self.sci.setCursorPosition(lo, 0) - self.sci.verticalScrollBar().setValue(lo) - break - else: - last = True - self.actionNextDiff.setEnabled(not last) - self.actionPrevDiff.setEnabled(True) - - def prevDiff(self): - if self._mode == 'diff' or not self._diffs: - self.actionNextDiff.setEnabled(False) - self.actionPrevDiff.setEnabled(False) - return - row, column = self.sci.getCursorPosition() - for i, (lo, hi) in enumerate(reversed(self._diffs)): - if hi < row: - first = (i == (len(self._diffs)-1)) - self.sci.setCursorPosition(lo, 0) - self.sci.verticalScrollBar().setValue(lo) - break - else: - first = True - self.actionNextDiff.setEnabled(True) - self.actionPrevDiff.setEnabled(not first) - - def nDiffs(self): - return len(self._diffs) -    class FileData(object):   def __init__(self, ctx, ctx2, wfile, status=None): @@ -570,6 +66,8 @@
  return 'A'   if wfile in removed:   return 'R' + if wfile in ctx: + return 'C'   return None     repo = ctx._repo
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
154
155
156
157
158
159
160
 
218
219
220
221
 
222
223
224
 
154
155
156
 
157
158
159
 
217
218
219
 
220
221
222
223
@@ -154,7 +154,6 @@
  vbox.addWidget(self.revpanel, 0)     self.textView = HgFileView(self.repo, self) - self.textView.forceMode('file')   self.textView.revisionSelected.connect(self.goto)   vbox.addWidget(self.textView, 1)   @@ -218,7 +217,7 @@
  pos = self.textView.verticalScrollBar().value()   ctx = self.filerevmodel.repo.changectx(rev)   self.textView.setContext(ctx) - self.textView.displayFile(self.filerevmodel.graph.filename(rev)) + self.textView.displayFile(self.filerevmodel.graph.filename(rev), None)   self.textView.verticalScrollBar().setValue(pos)   self.revpanel.set_revision(rev)   self.revpanel.update(repo = self.repo)
Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​grep.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​merge.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​mq.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​pbranch.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revpanel.py Stacked
 
15
16
17
18
 
19
 
 
20
21
22
 
15
16
17
 
18
19
20
21
22
23
24
@@ -15,8 +15,10 @@
   from PyQt4.QtCore import *   -def label_func(widget, item): +def label_func(widget, item, ctx):   if item == 'cset': + if type(ctx.rev()) is str: + return _('Patch:')   return _('Changeset:')   elif item == 'parents':   return _('Parent:')
Show Entire File tortoisehg/​hgqt/​run.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​rupdate.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​settings.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​status.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​sync.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​update.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgtk/​bugtraq.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgtk/​commit.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​util/​bugtraq.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File tortoisehg/​util/​hglib.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes