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 0f97b1641f2a…

Parents 2d753defe42e…

Parents 3b07cb23c6ab…

by Steve Borho

Changes to 36 files · Browse files at 0f97b1641f2a Showing diff from parent 2d753defe42e 3b07cb23c6ab Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
54
55
56
 
 
54
55
56
57
@@ -54,3 +54,4 @@
 ee531052f78b11dafe1d8c7ab9cfb95b4854be38 2.0.1  5333ccf1184864720c1d3690df94fa47df80bf02 2.0.2  d5cd872f61fde0c1d1b279af4f3b90ff6ade3161 2.0.3 +26a8187ef879c83c2055044fa2080a640145d542 2.0.4
Change 1 of 1 Show Entire File doc/​source/​conf.py Stacked
 
51
52
53
54
 
55
56
57
 
51
52
53
 
54
55
56
57
@@ -51,7 +51,7 @@
 # The short X.Y version.  version = '2.0'  # The full version, including alpha/beta/rc tags. -release = '2.0.3' +release = '2.0.4'    # The language for content autogenerated by Sphinx. Refer to documentation  # for a list of supported languages.
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File setup.py Stacked
 
79
80
81
 
 
82
83
84
 
79
80
81
82
83
84
85
86
@@ -79,6 +79,8 @@
  'contrib/win32',   'tortoisehg',   'tortoisehg/hgqt', + 'tortoisehg/hgtk', + 'tortoisehg/hgtk/logview',   'tortoisehg/util',   'tortoisehg/thgutil/iniparse',   ]
Show Entire File tortoisehg/​hgqt/​backout.py Stacked
(No changes)
Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​chunks.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
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
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
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
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
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
 # chunks.py - TortoiseHg patch/diff browser and editor  #  # Copyright 2010 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.    import cStringIO  import os    from mercurial import hg, util, patch, commands, cmdutil  from mercurial import match as matchmod, ui as uimod  from hgext import record    from tortoisehg.util import hglib  from tortoisehg.util.patchctx import patchctx  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, thgrepo, qscilib, lexers, visdiff, revert  from tortoisehg.hgqt import filelistmodel, filelistview, filedata    from PyQt4.QtCore import *  from PyQt4.QtGui import *  from PyQt4 import Qsci    # TODO  # Add support for tools like TortoiseMerge that help resolve rejected chunks    qsci = Qsci.QsciScintilla    class ChunksWidget(QWidget):     linkActivated = pyqtSignal(QString)   showMessage = pyqtSignal(QString)   chunksSelected = pyqtSignal(bool)   fileSelected = pyqtSignal(bool)   fileModelEmpty = pyqtSignal(bool)   fileModified = pyqtSignal()     contextmenu = None     def __init__(self, repo, parent, multiselectable):   QWidget.__init__(self, parent)     self.repo = repo   self.multiselectable = multiselectable   self.currentFile = None     layout = QVBoxLayout(self)   layout.setSpacing(0)   layout.setMargin(0)   layout.setContentsMargins(2, 2, 2, 2)   self.setLayout(layout)     self.splitter = QSplitter(self)   self.splitter.setOrientation(Qt.Vertical)   self.splitter.setChildrenCollapsible(False)   self.layout().addWidget(self.splitter)     self.filelist = filelistview.HgFileListView(repo, self, multiselectable)   self.filelistmodel = filelistmodel.HgFileListModel(self)   self.filelist.setModel(self.filelistmodel)   self.filelist.setContextMenuPolicy(Qt.CustomContextMenu)   self.filelist.customContextMenuRequested.connect(self.menuRequest)   self.filelist.doubleClicked.connect(self.vdiff)     self.fileListFrame = QFrame(self.splitter)   self.fileListFrame.setFrameShape(QFrame.NoFrame)   vbox = QVBoxLayout()   vbox.setSpacing(0)   vbox.setMargin(0)   vbox.addWidget(self.filelist)   self.fileListFrame.setLayout(vbox)     self.diffbrowse = DiffBrowser(self.splitter)   self.diffbrowse.setFont(qtlib.getfont('fontdiff').font())   self.diffbrowse.showMessage.connect(self.showMessage)   self.diffbrowse.linkActivated.connect(self.linkActivated)   self.diffbrowse.chunksSelected.connect(self.chunksSelected)     self.filelist.fileSelected.connect(self.displayFile)   self.filelist.clearDisplay.connect(self.diffbrowse.clearDisplay)     self.splitter.setStretchFactor(0, 0)   self.splitter.setStretchFactor(1, 3)   self.timerevent = self.startTimer(500)     self._actions = {}   for name, desc, icon, key, tip, cb in [   ('diff', _('Visual Diff'), 'visualdiff', 'Ctrl+D',   _('View file changes in external diff tool'), self.vdiff),   ('edit', _('Edit Local'), 'edit-file', 'Shift+Ctrl+E',   _('Edit current file in working copy'), self.editCurrentFile),   ('revert', _('Revert to Revision'), 'hg-revert', 'Alt+Ctrl+T',   _('Revert file(s) to contents at this revision'),   self.revertfile),   ]:   act = QAction(desc, self)   if icon:   act.setIcon(qtlib.getmenuicon(icon))   if key:   act.setShortcut(key)   if tip:   act.setStatusTip(tip)   if cb:   act.triggered.connect(cb)   self._actions[name] = act   self.addAction(act)     @pyqtSlot(QPoint)   def menuRequest(self, point):   actionlist = ['diff', 'edit', 'revert']   if not self.contextmenu:   menu = QMenu(self)   for act in actionlist:   menu.addAction(self._actions[act])   self.contextmenu = menu   self.contextmenu.exec_(self.filelist.mapToGlobal(point))     def vdiff(self):   filenames = self.getSelectedFiles()   if len(filenames) == 0:   return   opts = {'change':self.ctx.rev()}   dlg = visdiff.visualdiff(self.repo.ui, self.repo, filenames, opts)   if dlg:   dlg.exec_()   dlg.deleteLater()     def revertfile(self):   filenames = self.getSelectedFiles()   if len(filenames) == 0:   return   rev = self.ctx.rev()   if rev is None:   rev = self.ctx.p1().rev()   dlg = revert.RevertDialog(self.repo, filenames, rev, self)   dlg.exec_()   dlg.deleteLater()     def timerEvent(self, event):   'Periodic poll of currently displayed patch or working file'   if not hasattr(self, 'filelist'):   return   ctx = self.ctx   if ctx is None:   return   if isinstance(ctx, patchctx):   path = ctx._path   mtime = ctx._mtime   elif self.currentFile:   path = self.repo.wjoin(self.currentFile)   mtime = self.mtime   else:   return   if os.path.exists(path):   newmtime = os.path.getmtime(path)   if mtime != newmtime:   self.mtime = newmtime   self.refresh()     def runPatcher(self, fp, wfile, updatestate):   ui = self.repo.ui.copy()   class warncapt(ui.__class__):   def warn(self, msg, *args, **opts):   self.write(msg)   ui.__class__ = warncapt     ok = True   repo = self.repo   ui.pushbuffer()   pfiles = {}   curdir = os.getcwd()   try:   eolmode = ui.config('patch', 'eol', 'strict')   if eolmode.lower() not in patch.eolmodes:   eolmode = 'strict'   else:   eolmode = eolmode.lower()   os.chdir(repo.root)   if patch.applydiff(ui, fp, pfiles, eolmode=eolmode) < 0:   ok = False   self.showMessage.emit(_('Patch failed to apply'))   except (patch.PatchError, EnvironmentError), err:   ok = False   self.showMessage.emit(hglib.tounicode(str(err)))   os.chdir(curdir)   for line in ui.popbuffer().splitlines():   if line.endswith(wfile + '.rej'):   if qtlib.QuestionMsgBox(_('Manually resolve rejected chunks?'),   hglib.tounicode(line) + u'<br><br>' +   _('Edit patched file and rejects?'),   parent=self):   from tortoisehg.hgqt import rejects   dlg = rejects.RejectsDialog(repo.wjoin(wfile), self)   if dlg.exec_() == QDialog.Accepted:   ok = True   break   if updatestate and ok:   # Apply operations specified in git diff headers   cmdutil.updatedir(repo.ui, repo, pfiles)   return ok     def editCurrentFile(self):   ctx = self.ctx   if isinstance(ctx, patchctx):   paths = [ctx._path]   else:   paths = self.getSelectedFiles()   qtlib.editfiles(self.repo, paths, parent=self)     def getSelectedFileAndChunks(self):   chunks = self.diffbrowse.curchunks   if chunks:   dchunks = [c for c in chunks[1:] if c.selected]   return self.currentFile, [chunks[0]] + dchunks   else:   return self.currentFile, []     def getSelectedFiles(self):   return self.filelist.getSelectedFiles()     def deleteSelectedChunks(self):   'delete currently selected chunks'   repo = self.repo   chunks = self.diffbrowse.curchunks   dchunks = [c for c in chunks[1:] if c.selected]   if not dchunks:   self.showMessage.emit(_('No deletable chunks'))   return   kchunks = [c for c in chunks[1:] if not c.selected]   revertall = False   if not kchunks and qtlib.QuestionMsgBox(_('No chunks remain'),   _('Remove all file changes?')):   revertall = True   ctx = self.ctx   if isinstance(ctx, patchctx):   repo.thgbackup(ctx._path)   fp = util.atomictempfile(ctx._path, 'wb') + buf = cStringIO.StringIO()   try:   if ctx._ph.comments: - fp.write('\n'.join(ctx._ph.comments)) - fp.write('\n\n') + buf.write('\n'.join(ctx._ph.comments)) + buf.write('\n\n')   needsnewline = False   for wfile in ctx._fileorder:   if wfile == self.currentFile:   if revertall:   continue - chunks[0].write(fp) + chunks[0].write(buf)   for chunk in kchunks: - chunk.write(fp) - if not chunks[-1].selected: - needsnewline = True + chunk.write(buf)   else: - if needsnewline: - fp.write('\n') - needsnewline = False + if buf.tell() and buf.getvalue()[-1] != '\n': + buf.write('\n')   for chunk in ctx._files[wfile]: - chunk.write(fp) + chunk.write(buf) + fp.write(buf.getvalue())   fp.rename()   finally:   del fp   ctx.invalidate()   self.fileModified.emit()   else:   path = repo.wjoin(self.currentFile)   if not os.path.exists(path):   self.showMessage.emit(_('file has been deleted, refresh'))   return   if self.mtime != os.path.getmtime(path):   self.showMessage.emit(_('file has been modified, refresh'))   return   repo.thgbackup(path)   if revertall:   commands.revert(repo.ui, repo, path, no_backup=True)   else:   wlock = repo.wlock()   try:   repo.wopener(self.currentFile, 'wb').write(   self.diffbrowse.origcontents)   fp = cStringIO.StringIO()   chunks[0].write(fp)   for c in kchunks:   c.write(fp)   fp.seek(0)   self.runPatcher(fp, self.currentFile, False)   finally:   wlock.release()   self.fileModified.emit()     def mergeChunks(self, wfile, chunks):   def isAorR(header):   for line in header:   if line.startswith('--- /dev/null'):   return True   if line.startswith('+++ /dev/null'):   return True   return False   repo = self.repo   ctx = self.ctx   if isinstance(ctx, patchctx):   if wfile in ctx._files:   patchchunks = ctx._files[wfile]   if isAorR(chunks[0].header) or isAorR(patchchunks[0].header):   qtlib.InfoMsgBox(_('Unable to merge chunks'),   _('Add or remove patches must be merged '   'in the working directory'))   return False   # merge new chunks into existing chunks, sorting on start line   newchunks = [chunks[0]]   pidx = nidx = 1   while pidx < len(patchchunks) or nidx < len(chunks):   if pidx == len(patchchunks):   newchunks.append(chunks[nidx])   nidx += 1   elif nidx == len(chunks):   newchunks.append(patchchunks[pidx])   pidx += 1   elif chunks[nidx].fromline < patchchunks[pidx].fromline:   newchunks.append(chunks[nidx])   nidx += 1   else:   newchunks.append(patchchunks[pidx])   pidx += 1   ctx._files[wfile] = newchunks   else:   # add file to patch   ctx._files[wfile] = chunks   ctx._fileorder.append(wfile)   repo.thgbackup(ctx._path)   fp = util.atomictempfile(ctx._path, 'wb')   try:   if ctx._ph.comments:   fp.write('\n'.join(ctx._ph.comments))   fp.write('\n\n')   for file in ctx._fileorder:   for chunk in ctx._files[file]:   chunk.write(fp)   fp.rename()   ctx.invalidate()   self.fileModified.emit()   return True   finally:   del fp   return False   else:   # Apply chunks to wfile   repo.thgbackup(repo.wjoin(wfile))   fp = cStringIO.StringIO()   for c in chunks:   c.write(fp)   fp.seek(0)   wlock = repo.wlock()   try:   return self.runPatcher(fp, wfile, True)   finally:   wlock.release()   return False     def getFileList(self):   return self.ctx.files()     def removeFile(self, wfile):   repo = self.repo   ctx = self.ctx   if isinstance(ctx, patchctx):   repo.thgbackup(ctx._path)   fp = util.atomictempfile(ctx._path, 'wb')   try:   if ctx._ph.comments:   fp.write('\n'.join(ctx._ph.comments))   fp.write('\n\n')   for file in ctx._fileorder:   if file == wfile:   continue   for chunk in ctx._files[file]:   chunk.write(fp)   fp.rename()   finally:   del fp   ctx.invalidate()   else:   repo.thgbackup(repo.wjoin(wfile))   wasadded = wfile in repo[None].added()   commands.revert(repo.ui, repo, repo.wjoin(wfile), no_backup=True)   if wasadded:   os.unlink(repo.wjoin(wfile))   self.fileModified.emit()     def getChunksForFile(self, wfile):   repo = self.repo   ctx = self.ctx   if isinstance(ctx, patchctx):   if wfile in ctx._files:   return ctx._files[wfile]   else:   return []   else:   buf = cStringIO.StringIO()   diffopts = patch.diffopts(repo.ui, {'git':True})   m = matchmod.exact(repo.root, repo.root, [wfile])   for p in patch.diff(repo, ctx.p1().node(), None, match=m,   opts=diffopts):   buf.write(p)   buf.seek(0)   chunks = record.parsepatch(buf)   if chunks:   header = chunks[0]   return [header] + header.hunks   else:   return []     @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)   if os.path.exists(path):   self.mtime = os.path.getmtime(path)   else:   self.mtime = None   self.diffbrowse.displayFile(file, status)   self.fileSelected.emit(True)   else:   self.currentFile = None   self.diffbrowse.clearDisplay()   self.diffbrowse.clearChunks()   self.fileSelected.emit(False)     def setContext(self, ctx):   self.diffbrowse.setContext(ctx)   self.filelist.setContext(ctx)   empty = len(ctx.files()) == 0   self.fileModelEmpty.emit(empty)   self.fileSelected.emit(not empty)   if empty:   self.currentFile = None   self.diffbrowse.clearDisplay()   self.diffbrowse.clearChunks()   self.diffbrowse.updateSummary()   self.ctx = ctx   for act in ['diff', 'revert']:   self._actions[act].setEnabled(ctx.rev() is None)     def refresh(self):   ctx = self.ctx   if isinstance(ctx, patchctx):   # if patch mtime has not changed, it could return the same ctx   ctx = self.repo.changectx(ctx._path)   else:   self.repo.thginvalidate()   ctx = self.repo.changectx(ctx.node())   self.setContext(ctx)     def loadSettings(self, qs, prefix):   self.diffbrowse.loadSettings(qs, prefix)     def saveSettings(self, qs, prefix):   self.diffbrowse.saveSettings(qs, prefix)      # DO NOT USE. Sadly, this does not work.  class ElideLabel(QLabel):   def __init__(self, text='', parent=None):   QLabel.__init__(self, text, parent)     def sizeHint(self):   return super(ElideLabel, self).sizeHint()     def paintEvent(self, event):   p = QPainter()   fm = QFontMetrics(self.font())   if fm.width(self.text()): # > self.contentsRect().width():   elided = fm.elidedText(self.text(), Qt.ElideLeft,   self.rect().width(), 0)   p.drawText(self.rect(), Qt.AlignTop | Qt.AlignRight |   Qt.TextSingleLine, elided)   else:   super(ElideLabel, self).paintEvent(event)    class DiffBrowser(QFrame):   """diff browser"""     linkActivated = pyqtSignal(QString)   showMessage = pyqtSignal(QString)   chunksSelected = pyqtSignal(bool)     def __init__(self, parent):   QFrame.__init__(self, parent)     self.curchunks = []   self.countselected = 0   self._ctx = None   self._lastfile = None     vbox = QVBoxLayout()   vbox.setContentsMargins(0,0,0,0)   vbox.setSpacing(0)   self.setLayout(vbox)     self.labelhbox = hbox = QHBoxLayout()   hbox.setContentsMargins(0,0,0,0)   hbox.setSpacing(2)   self.layout().addLayout(hbox)   self.filenamelabel = w = QLabel()   self.filenamelabel.hide()   hbox.addWidget(w)   w.setWordWrap(True)   f = w.textInteractionFlags()   w.setTextInteractionFlags(f | Qt.TextSelectableByMouse)   w.linkActivated.connect(self.linkActivated)     self.sumlabel = QLabel()   self.allbutton = QToolButton()   self.allbutton.setText(_('All', 'files'))   self.allbutton.setShortcut(QKeySequence.SelectAll)   self.allbutton.clicked.connect(self.selectAll)   self.nonebutton = QToolButton()   self.nonebutton.setText(_('None', 'files'))   self.nonebutton.setShortcut(QKeySequence.New)   self.nonebutton.clicked.connect(self.selectNone)   hbox.addStretch(1)   hbox.addWidget(self.sumlabel)   hbox.addWidget(self.allbutton)   hbox.addWidget(self.nonebutton)     self.extralabel = w = QLabel()   w.setWordWrap(True)   w.linkActivated.connect(self.linkActivated)   self.layout().addWidget(w)   w.hide()     self.sci = qscilib.Scintilla(self)   self.sci.setFrameStyle(0)   self.sci.setReadOnly(True)   self.sci.setUtf8(True)   self.sci.installEventFilter(qscilib.KeyPressInterceptor(self))   self.sci.setContextMenuPolicy(Qt.CustomContextMenu)   self.sci.customContextMenuRequested.connect(self.menuRequested)   self.sci.setCaretLineVisible(False)     self.sci.setMarginType(1, qsci.SymbolMargin)   self.sci.setMarginLineNumbers(1, False)   self.sci.setMarginWidth(1, QFontMetrics(self.font()).width('XX'))   self.sci.setMarginSensitivity(1, True)   self.sci.marginClicked.connect(self.marginClicked)   self.selected = self.sci.markerDefine(qsci.Plus, -1)   self.unselected = self.sci.markerDefine(qsci.Minus, -1)   self.vertical = self.sci.markerDefine(qsci.VerticalLine, -1)   self.divider = self.sci.markerDefine(qsci.Background, -1)   self.selcolor = self.sci.markerDefine(qsci.Background, -1)   self.sci.setMarkerBackgroundColor(QColor('#BBFFFF'), self.selcolor)   self.sci.setMarkerBackgroundColor(QColor('#AAAAAA'), self.divider)   mask = (1 << self.selected) | (1 << self.unselected) | \   (1 << self.vertical) | (1 << self.selcolor) | (1 << self.divider)   self.sci.setMarginMarkerMask(1, mask)     self.layout().addWidget(self.sci, 1)     lexer = lexers.get_diff_lexer(self)   self.sci.setLexer(lexer)   self.clearDisplay()     def menuRequested(self, point):   point = self.sci.mapToGlobal(point)   return self.sci.createStandardContextMenu().exec_(point)     def loadSettings(self, qs, prefix):   self.sci.loadSettings(qs, prefix)     def saveSettings(self, qs, prefix):   self.sci.saveSettings(qs, prefix)     def updateSummary(self):   self.sumlabel.setText(_('Chunks selected: %d / %d') % (   self.countselected, len(self.curchunks[1:])))   self.chunksSelected.emit(self.countselected > 0)     @pyqtSlot()   def selectAll(self):   for chunk in self.curchunks[1:]:   if not chunk.selected:   self.sci.markerDelete(chunk.mline, -1)   self.sci.markerAdd(chunk.mline, self.selected)   chunk.selected = True   self.countselected += 1   for i in xrange(*chunk.lrange):   self.sci.markerAdd(i, self.selcolor)   self.updateSummary()     @pyqtSlot()   def selectNone(self):   for chunk in self.curchunks[1:]:   if chunk.selected:   self.sci.markerDelete(chunk.mline, -1)   self.sci.markerAdd(chunk.mline, self.unselected)   chunk.selected = False   self.countselected -= 1   for i in xrange(*chunk.lrange):   self.sci.markerDelete(i, self.selcolor)   self.updateSummary()     @pyqtSlot(int, int, Qt.KeyboardModifiers)   def marginClicked(self, margin, line, modifiers):   for chunk in self.curchunks[1:]:   if line >= chunk.lrange[0] and line < chunk.lrange[1]:   self.toggleChunk(chunk)   self.updateSummary()   return     def toggleChunk(self, chunk):   self.sci.markerDelete(chunk.mline, -1)   if chunk.selected:   self.sci.markerAdd(chunk.mline, self.unselected)   chunk.selected = False   self.countselected -= 1   for i in xrange(*chunk.lrange):   self.sci.markerDelete(i, self.selcolor)   else:   self.sci.markerAdd(chunk.mline, self.selected)   chunk.selected = True   self.countselected += 1   for i in xrange(*chunk.lrange):   self.sci.markerAdd(i, self.selcolor)     def setContext(self, ctx):   self._ctx = ctx   self.sci.setTabWidth(ctx._repo.tabwidth)     def clearDisplay(self):   self.sci.clear()   self.filenamelabel.setText(' ')   self.extralabel.hide()     def clearChunks(self):   self.curchunks = []   self.countselected = 0   self.updateSummary()     def displayFile(self, filename, status):   self.clearDisplay()   if filename == self._lastfile:   reenable = [(c.fromline, len(c.before)) for c in self.curchunks[1:]\   if c.selected]   else:   reenable = []   self._lastfile = filename   self.clearChunks()     fd = filedata.FileData(self._ctx, None, 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() or not fd.diff:   self.sci.setText(fd.error or '')   return   elif type(self._ctx.rev()) is str:   chunks = self._ctx._files[filename]   else:   header = record.parsepatch(cStringIO.StringIO(fd.diff))[0]   chunks = [header] + header.hunks     utext = []   for chunk in chunks[1:]:   buf = cStringIO.StringIO()   chunk.selected = False   chunk.write(buf)   chunk.lines = buf.getvalue().splitlines()   utext += [hglib.tounicode(l) for l in chunk.lines]   utext.append('')   self.sci.setText(u'\n'.join(utext))     start = 0   self.sci.markerDeleteAll(-1)   for chunk in chunks[1:]:   chunk.lrange = (start, start+len(chunk.lines))   chunk.mline = start + len(chunk.lines)/2   if start:   self.sci.markerAdd(start-1, self.divider)   for i in xrange(1,len(chunk.lines)-1):   if start + i == chunk.mline:   self.sci.markerAdd(chunk.mline, self.unselected)   else:   self.sci.markerAdd(start+i, self.vertical)   start += len(chunk.lines) + 1   self.origcontents = fd.olddata   self.countselected = 0   self.curchunks = chunks   for c in chunks[1:]:   if (c.fromline, len(c.before)) in reenable:   self.toggleChunk(c)   self.updateSummary()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
183
184
185
 
 
186
187
188
 
183
184
185
186
187
188
189
190
@@ -183,6 +183,8 @@
    self.statusbar = cmdui.ThgStatusBar(self)   self.layout().addWidget(self.statusbar) + self.showMessage(_('Backup copies of modified files can be found ' + 'in .hg/Trashcan/'))     self.refreshCombos()   repo.repositoryChanged.connect(self.refreshCombos)