/
dag.py
1897 lines (1553 loc) · 63.8 KB
/
dag.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
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
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
from __future__ import division, absolute_import, unicode_literals
import collections
import math
from itertools import count
from qtpy.QtCore import Qt
from qtpy.QtCore import Signal
from qtpy import QtCore
from qtpy import QtGui
from qtpy import QtWidgets
from ..compat import maxsize
from ..i18n import N_
from ..models import dag
from .. import core
from .. import cmds
from .. import difftool
from .. import hotkeys
from .. import icons
from .. import observable
from .. import qtcompat
from .. import qtutils
from . import archive
from . import browse
from . import completion
from . import createbranch
from . import createtag
from . import defs
from . import diff
from . import filelist
from . import standard
def git_dag(model, args=None, settings=None, existing_view=None):
"""Return a pre-populated git DAG widget."""
branch = model.currentbranch
# disambiguate between branch names and filenames by using '--'
branch_doubledash = branch and (branch + ' --') or ''
ctx = dag.DAG(branch_doubledash, 1000)
ctx.set_arguments(args)
if existing_view is None:
view = GitDAG(model, ctx, settings=settings)
else:
view = existing_view
view.set_context(ctx)
if ctx.ref:
view.display()
return view
class FocusRedirectProxy(object):
"""Redirect actions from the main widget to child widgets"""
def __init__(self, *widgets):
"""Provide proxied widgets; the default widget must be first"""
self.widgets = widgets
self.default = widgets[0]
def __getattr__(self, name):
return (lambda *args, **kwargs:
self._forward_action(name, *args, **kwargs))
def _forward_action(self, name, *args, **kwargs):
"""Forward the captured action to the focused or default widget"""
widget = QtWidgets.QApplication.focusWidget()
if widget in self.widgets and hasattr(widget, name):
fn = getattr(widget, name)
else:
fn = getattr(self.default, name)
return fn(*args, **kwargs)
class ViewerMixin(object):
"""Implementations must provide selected_items()"""
def __init__(self):
self.selected = None
self.clicked = None
self.menu_actions = None # provided by implementation
def selected_item(self):
"""Return the currently selected item"""
selected_items = self.selected_items()
if not selected_items:
return None
return selected_items[0]
def selected_oid(self):
item = self.selected_item()
if item is None:
result = None
else:
result = item.commit.oid
return result
def selected_oids(self):
return [i.commit for i in self.selected_items()]
def with_oid(self, fn):
oid = self.selected_oid()
if oid:
result = fn(oid)
else:
result = None
return result
def diff_selected_this(self):
clicked_oid = self.clicked.oid
selected_oid = self.selected.oid
self.diff_commits.emit(selected_oid, clicked_oid)
def diff_this_selected(self):
clicked_oid = self.clicked.oid
selected_oid = self.selected.oid
self.diff_commits.emit(clicked_oid, selected_oid)
def cherry_pick(self):
self.with_oid(lambda oid: cmds.do(cmds.CherryPick, [oid]))
def copy_to_clipboard(self):
self.with_oid(lambda oid: qtutils.set_clipboard(oid))
def create_branch(self):
self.with_oid(lambda oid: createbranch.create_new_branch(revision=oid))
def create_tag(self):
self.with_oid(lambda oid: createtag.create_tag(ref=oid))
def create_tarball(self):
self.with_oid(lambda oid: archive.show_save_dialog(oid, parent=self))
def show_diff(self):
self.with_oid(lambda oid:
difftool.diff_expression(self, oid + '^!',
hide_expr=False, focus_tree=True))
def show_dir_diff(self):
self.with_oid(lambda oid:
cmds.difftool_launch(left=oid, left_take_magic=True,
dir_diff=True))
def reset_branch_head(self):
self.with_oid(lambda oid: cmds.do(cmds.ResetBranchHead, ref=oid))
def reset_worktree(self):
self.with_oid(lambda oid: cmds.do(cmds.ResetWorktree, ref=oid))
def save_blob_dialog(self):
self.with_oid(lambda oid: browse.BrowseDialog.browse(oid))
def update_menu_actions(self, event):
selected_items = self.selected_items()
item = self.itemAt(event.pos())
if item is None:
self.clicked = commit = None
else:
self.clicked = commit = item.commit
has_single_selection = len(selected_items) == 1
has_selection = bool(selected_items)
can_diff = bool(commit and has_single_selection and
commit is not selected_items[0].commit)
if can_diff:
self.selected = selected_items[0].commit
else:
self.selected = None
self.menu_actions['diff_this_selected'].setEnabled(can_diff)
self.menu_actions['diff_selected_this'].setEnabled(can_diff)
self.menu_actions['diff_commit'].setEnabled(has_single_selection)
self.menu_actions['diff_commit_all'].setEnabled(has_single_selection)
self.menu_actions['cherry_pick'].setEnabled(has_single_selection)
self.menu_actions['copy'].setEnabled(has_single_selection)
self.menu_actions['create_branch'].setEnabled(has_single_selection)
self.menu_actions['create_patch'].setEnabled(has_selection)
self.menu_actions['create_tag'].setEnabled(has_single_selection)
self.menu_actions['create_tarball'].setEnabled(has_single_selection)
self.menu_actions['reset_branch_head'].setEnabled(has_single_selection)
self.menu_actions['reset_worktree'].setEnabled(has_single_selection)
self.menu_actions['save_blob'].setEnabled(has_single_selection)
def context_menu_event(self, event):
self.update_menu_actions(event)
menu = qtutils.create_menu(N_('Actions'), self)
menu.addAction(self.menu_actions['diff_this_selected'])
menu.addAction(self.menu_actions['diff_selected_this'])
menu.addAction(self.menu_actions['diff_commit'])
menu.addAction(self.menu_actions['diff_commit_all'])
menu.addSeparator()
menu.addAction(self.menu_actions['create_branch'])
menu.addAction(self.menu_actions['create_tag'])
menu.addSeparator()
menu.addAction(self.menu_actions['cherry_pick'])
menu.addAction(self.menu_actions['create_patch'])
menu.addAction(self.menu_actions['create_tarball'])
menu.addSeparator()
reset_menu = menu.addMenu(N_('Reset'))
reset_menu.addAction(self.menu_actions['reset_branch_head'])
reset_menu.addAction(self.menu_actions['reset_worktree'])
menu.addSeparator()
menu.addAction(self.menu_actions['save_blob'])
menu.addAction(self.menu_actions['copy'])
menu.exec_(self.mapToGlobal(event.pos()))
def viewer_actions(widget):
return {
'diff_this_selected':
qtutils.add_action(widget, N_('Diff this -> selected'),
widget.proxy.diff_this_selected),
'diff_selected_this':
qtutils.add_action(widget, N_('Diff selected -> this'),
widget.proxy.diff_selected_this),
'create_branch':
qtutils.add_action(widget, N_('Create Branch'),
widget.proxy.create_branch),
'create_patch':
qtutils.add_action(widget, N_('Create Patch'),
widget.proxy.create_patch),
'create_tag':
qtutils.add_action(widget, N_('Create Tag'),
widget.proxy.create_tag),
'create_tarball':
qtutils.add_action(widget, N_('Save As Tarball/Zip...'),
widget.proxy.create_tarball),
'cherry_pick':
qtutils.add_action(widget, N_('Cherry Pick'),
widget.proxy.cherry_pick),
'diff_commit':
qtutils.add_action(widget, N_('Launch Diff Tool'),
widget.proxy.show_diff, hotkeys.DIFF),
'diff_commit_all':
qtutils.add_action(widget, N_('Launch Directory Diff Tool'),
widget.proxy.show_dir_diff, hotkeys.DIFF_SECONDARY),
'reset_branch_head':
qtutils.add_action(widget, N_('Reset Branch Head'),
widget.proxy.reset_branch_head),
'reset_worktree':
qtutils.add_action(widget, N_('Reset Worktree'),
widget.proxy.reset_worktree),
'save_blob':
qtutils.add_action(widget, N_('Grab File...'),
widget.proxy.save_blob_dialog),
'copy':
qtutils.add_action(widget, N_('Copy SHA-1'),
widget.proxy.copy_to_clipboard,
QtGui.QKeySequence.Copy),
}
class CommitTreeWidgetItem(QtWidgets.QTreeWidgetItem):
def __init__(self, commit, parent=None):
QtWidgets.QTreeWidgetItem.__init__(self, parent)
self.commit = commit
self.setText(0, commit.summary)
self.setText(1, commit.author)
self.setText(2, commit.authdate)
class CommitTreeWidget(standard.TreeWidget, ViewerMixin):
diff_commits = Signal(object, object)
def __init__(self, notifier, parent):
standard.TreeWidget.__init__(self, parent=parent)
ViewerMixin.__init__(self)
self.setSelectionMode(self.ExtendedSelection)
self.setHeaderLabels([N_('Summary'), N_('Author'), N_('Date, Time')])
self.oidmap = {}
self.menu_actions = None
self.notifier = notifier
self.selecting = False
self.commits = []
self.action_up = qtutils.add_action(self, N_('Go Up'),
self.go_up, hotkeys.MOVE_UP)
self.action_down = qtutils.add_action(self, N_('Go Down'),
self.go_down, hotkeys.MOVE_DOWN)
notifier.add_observer(diff.COMMITS_SELECTED, self.commits_selected)
self.itemSelectionChanged.connect(self.selection_changed)
# ViewerMixin
def go_up(self):
self.goto(self.itemAbove)
def go_down(self):
self.goto(self.itemBelow)
def goto(self, finder):
items = self.selected_items()
item = items and items[0] or None
if item is None:
return
found = finder(item)
if found:
self.select([found.commit.oid])
def selected_commit_range(self):
selected_items = self.selected_items()
if not selected_items:
return None, None
return selected_items[-1].commit.oid, selected_items[0].commit.oid
def set_selecting(self, selecting):
self.selecting = selecting
def selection_changed(self):
items = self.selected_items()
if not items:
return
self.set_selecting(True)
self.notifier.notify_observers(diff.COMMITS_SELECTED,
[i.commit for i in items])
self.set_selecting(False)
def commits_selected(self, commits):
if self.selecting:
return
with qtutils.BlockSignals(self):
self.select([commit.oid for commit in commits])
def select(self, oids):
if not oids:
return
self.clearSelection()
for idx, oid in enumerate(oids):
try:
item = self.oidmap[oid]
except KeyError:
continue
self.scrollToItem(item)
item.setSelected(True)
def adjust_columns(self):
width = self.width()-20
zero = width * 2 / 3
onetwo = width / 6
self.setColumnWidth(0, zero)
self.setColumnWidth(1, onetwo)
self.setColumnWidth(2, onetwo)
def clear(self):
QtWidgets.QTreeWidget.clear(self)
self.oidmap.clear()
self.commits = []
def add_commits(self, commits):
self.commits.extend(commits)
items = []
for c in reversed(commits):
item = CommitTreeWidgetItem(c)
items.append(item)
self.oidmap[c.oid] = item
for tag in c.tags:
self.oidmap[tag] = item
self.insertTopLevelItems(0, items)
def create_patch(self):
items = self.selectedItems()
if not items:
return
oids = [item.commit.oid for item in reversed(items)]
all_oids = [c.oid for c in self.commits]
cmds.do(cmds.FormatPatch, oids, all_oids)
# Qt overrides
def contextMenuEvent(self, event):
self.context_menu_event(event)
def mousePressEvent(self, event):
if event.button() == Qt.RightButton:
event.accept()
return
QtWidgets.QTreeWidget.mousePressEvent(self, event)
class GitDAG(standard.MainWindow):
"""The git-dag widget."""
updated = Signal()
def __init__(self, model, ctx, parent=None, settings=None):
super(GitDAG, self).__init__(parent)
self.setMinimumSize(420, 420)
# change when widgets are added/removed
self.widget_version = 2
self.model = model
self.ctx = ctx
self.settings = settings
self.commits = {}
self.commit_list = []
self.selection = []
self.thread = None
self.revtext = completion.GitLogLineEdit()
self.maxresults = standard.SpinBox()
self.zoom_out = qtutils.create_action_button(
tooltip=N_('Zoom Out'), icon=icons.zoom_out())
self.zoom_in = qtutils.create_action_button(
tooltip=N_('Zoom In'), icon=icons.zoom_in())
self.zoom_to_fit = qtutils.create_action_button(
tooltip=N_('Zoom to Fit'), icon=icons.zoom_fit_best())
self.notifier = notifier = observable.Observable()
self.notifier.refs_updated = refs_updated = 'refs_updated'
self.notifier.add_observer(refs_updated, self.display)
self.notifier.add_observer(filelist.HISTORIES_SELECTED,
self.histories_selected)
self.notifier.add_observer(filelist.DIFFTOOL_SELECTED,
self.difftool_selected)
self.notifier.add_observer(diff.COMMITS_SELECTED, self.commits_selected)
self.treewidget = CommitTreeWidget(notifier, self)
self.diffwidget = diff.DiffWidget(notifier, self, is_commit=True)
self.filewidget = filelist.FileWidget(notifier, self)
self.graphview = GraphView(notifier, self)
self.proxy = FocusRedirectProxy(self.treewidget,
self.graphview,
self.filewidget)
self.viewer_actions = actions = viewer_actions(self)
self.treewidget.menu_actions = actions
self.graphview.menu_actions = actions
self.controls_layout = qtutils.hbox(defs.no_margin, defs.spacing,
self.revtext, self.maxresults)
self.controls_widget = QtWidgets.QWidget()
self.controls_widget.setLayout(self.controls_layout)
self.log_dock = qtutils.create_dock(N_('Log'), self, stretch=False)
self.log_dock.setWidget(self.treewidget)
log_dock_titlebar = self.log_dock.titleBarWidget()
log_dock_titlebar.add_corner_widget(self.controls_widget)
self.file_dock = qtutils.create_dock(N_('Files'), self)
self.file_dock.setWidget(self.filewidget)
self.diff_dock = qtutils.create_dock(N_('Diff'), self)
self.diff_dock.setWidget(self.diffwidget)
self.graph_controls_layout = qtutils.hbox(
defs.no_margin, defs.button_spacing,
self.zoom_out, self.zoom_in, self.zoom_to_fit,
defs.spacing)
self.graph_controls_widget = QtWidgets.QWidget()
self.graph_controls_widget.setLayout(self.graph_controls_layout)
self.graphview_dock = qtutils.create_dock(N_('Graph'), self)
self.graphview_dock.setWidget(self.graphview)
graph_titlebar = self.graphview_dock.titleBarWidget()
graph_titlebar.add_corner_widget(self.graph_controls_widget)
self.lock_layout_action = qtutils.add_action_bool(
self, N_('Lock Layout'), self.set_lock_layout, False)
self.refresh_action = qtutils.add_action(
self, N_('Refresh'), self.refresh, hotkeys.REFRESH)
# Create the application menu
self.menubar = QtWidgets.QMenuBar(self)
# View Menu
self.view_menu = qtutils.create_menu(N_('View'), self.menubar)
self.view_menu.addAction(self.refresh_action)
self.view_menu.addAction(self.log_dock.toggleViewAction())
self.view_menu.addAction(self.graphview_dock.toggleViewAction())
self.view_menu.addAction(self.diff_dock.toggleViewAction())
self.view_menu.addAction(self.file_dock.toggleViewAction())
self.view_menu.addSeparator()
self.view_menu.addAction(self.lock_layout_action)
self.menubar.addAction(self.view_menu.menuAction())
self.setMenuBar(self.menubar)
left = Qt.LeftDockWidgetArea
right = Qt.RightDockWidgetArea
self.addDockWidget(left, self.log_dock)
self.addDockWidget(left, self.diff_dock)
self.addDockWidget(right, self.graphview_dock)
self.addDockWidget(right, self.file_dock)
# Also re-loads dag.* from the saved state
self.init_state(settings, self.resize_to_desktop)
qtutils.connect_button(self.zoom_out, self.graphview.zoom_out)
qtutils.connect_button(self.zoom_in, self.graphview.zoom_in)
qtutils.connect_button(self.zoom_to_fit,
self.graphview.zoom_to_fit)
self.treewidget.diff_commits.connect(self.diff_commits)
self.graphview.diff_commits.connect(self.diff_commits)
self.filewidget.grab_file.connect(self.grab_file)
self.maxresults.editingFinished.connect(self.display)
self.revtext.textChanged.connect(self.text_changed)
self.revtext.activated.connect(self.display)
self.revtext.enter.connect(self.display)
self.revtext.down.connect(self.focus_tree)
# The model is updated in another thread so use
# signals/slots to bring control back to the main GUI thread
self.model.add_observer(self.model.message_updated, self.updated.emit)
self.updated.connect(self.model_updated, type=Qt.QueuedConnection)
qtutils.add_action(self, 'Focus Input', self.focus_input, hotkeys.FOCUS)
qtutils.add_close_action(self)
self.set_context(ctx)
def set_context(self, ctx):
self.ctx = ctx
# Update fields affected by model
self.revtext.setText(ctx.ref)
self.maxresults.setValue(ctx.count)
self.update_window_title()
if self.thread is not None:
self.thread.stop()
self.thread = ReaderThread(ctx, self)
thread = self.thread
thread.begin.connect(self.thread_begin, type=Qt.QueuedConnection)
thread.status.connect(self.thread_status, type=Qt.QueuedConnection)
thread.add.connect(self.add_commits, type=Qt.QueuedConnection)
thread.end.connect(self.thread_end, type=Qt.QueuedConnection)
def focus_input(self):
self.revtext.setFocus()
def focus_tree(self):
self.treewidget.setFocus()
def text_changed(self, txt):
self.ctx.ref = txt
self.update_window_title()
def update_window_title(self):
project = self.model.project
if self.ctx.ref:
self.setWindowTitle(N_('%(project)s: %(ref)s - DAG')
% dict(project=project, ref=self.ctx.ref))
else:
self.setWindowTitle(project + N_(' - DAG'))
def export_state(self):
state = standard.MainWindow.export_state(self)
state['count'] = self.ctx.count
return state
def apply_state(self, state):
result = standard.MainWindow.apply_state(self, state)
try:
count = state['count']
if self.ctx.overridden('count'):
count = self.ctx.count
except:
count = self.ctx.count
result = False
self.ctx.set_count(count)
self.lock_layout_action.setChecked(state.get('lock_layout', False))
return result
def model_updated(self):
self.display()
def refresh(self):
cmds.do(cmds.Refresh)
def display(self):
new_ref = self.revtext.value()
new_count = self.maxresults.value()
self.thread.stop()
self.ctx.set_ref(new_ref)
self.ctx.set_count(new_count)
self.thread.start()
def show(self):
standard.MainWindow.show(self)
self.treewidget.adjust_columns()
def commits_selected(self, commits):
if commits:
self.selection = commits
def clear(self):
self.commits.clear()
self.commit_list = []
self.graphview.clear()
self.treewidget.clear()
def add_commits(self, commits):
self.commit_list.extend(commits)
# Keep track of commits
for commit_obj in commits:
self.commits[commit_obj.oid] = commit_obj
for tag in commit_obj.tags:
self.commits[tag] = commit_obj
self.graphview.add_commits(commits)
self.treewidget.add_commits(commits)
def thread_begin(self):
self.clear()
def thread_end(self):
self.focus_tree()
self.restore_selection()
def thread_status(self, successful):
self.revtext.hint.set_error(not successful)
def restore_selection(self):
selection = self.selection
try:
commit_obj = self.commit_list[-1]
except IndexError:
# No commits, exist, early-out
return
new_commits = [self.commits.get(s.oid, None) for s in selection]
new_commits = [c for c in new_commits if c is not None]
if new_commits:
# The old selection exists in the new state
self.notifier.notify_observers(diff.COMMITS_SELECTED, new_commits)
else:
# The old selection is now empty. Select the top-most commit
self.notifier.notify_observers(diff.COMMITS_SELECTED, [commit_obj])
self.graphview.set_initial_view()
def diff_commits(self, a, b):
paths = self.ctx.paths()
if paths:
cmds.difftool_launch(left=a, right=b, paths=paths)
else:
difftool.diff_commits(self, a, b)
# Qt overrides
def closeEvent(self, event):
self.revtext.close_popup()
self.thread.stop()
standard.MainWindow.closeEvent(self, event)
def resizeEvent(self, e):
standard.MainWindow.resizeEvent(self, e)
self.treewidget.adjust_columns()
def histories_selected(self, histories):
argv = [self.model.currentbranch, '--']
argv.extend(histories)
text = core.list2cmdline(argv)
self.revtext.setText(text)
self.display()
def difftool_selected(self, files):
bottom, top = self.treewidget.selected_commit_range()
if not top:
return
cmds.difftool_launch(left=bottom, left_take_parent=True,
right=top, paths=files)
def grab_file(self, filename):
"""Save the selected file from the filelist widget"""
oid = self.treewidget.selected_oid()
model = browse.BrowseModel(oid, filename=filename)
browse.save_path(filename, model)
class ReaderThread(QtCore.QThread):
begin = Signal()
add = Signal(object)
end = Signal()
status = Signal(object)
def __init__(self, ctx, parent):
QtCore.QThread.__init__(self, parent)
self.ctx = ctx
self._abort = False
self._stop = False
self._mutex = QtCore.QMutex()
self._condition = QtCore.QWaitCondition()
def run(self):
repo = dag.RepoReader(self.ctx)
repo.reset()
self.begin.emit()
commits = []
for c in repo:
self._mutex.lock()
if self._stop:
self._condition.wait(self._mutex)
self._mutex.unlock()
if self._abort:
repo.reset()
return
commits.append(c)
if len(commits) >= 512:
self.add.emit(commits)
commits = []
self.status.emit(repo.returncode == 0)
if commits:
self.add.emit(commits)
self.end.emit()
def start(self):
self._abort = False
self._stop = False
QtCore.QThread.start(self)
def pause(self):
self._mutex.lock()
self._stop = True
self._mutex.unlock()
def resume(self):
self._mutex.lock()
self._stop = False
self._mutex.unlock()
self._condition.wakeOne()
def stop(self):
self._abort = True
self.wait()
class Cache(object):
_label_font = None
@classmethod
def label_font(cls):
font = cls._label_font
if font is None:
font = cls._label_font = QtWidgets.QApplication.font()
font.setPointSize(6)
return font
class Edge(QtWidgets.QGraphicsItem):
item_type = QtWidgets.QGraphicsItem.UserType + 1
def __init__(self, source, dest):
QtWidgets.QGraphicsItem.__init__(self)
self.setAcceptedMouseButtons(Qt.NoButton)
self.source = source
self.dest = dest
self.commit = source.commit
self.setZValue(-2)
self.recompute_bound()
self.path_valid = False
# Choose a new color for new branch edges
if self.source.x() < self.dest.x():
color = EdgeColor.cycle()
line = Qt.SolidLine
elif self.source.x() != self.dest.x():
color = EdgeColor.current()
line = Qt.SolidLine
else:
color = EdgeColor.current()
line = Qt.SolidLine
self.pen = QtGui.QPen(color, 4.0, line, Qt.SquareCap, Qt.RoundJoin)
def recompute_bound(self):
dest_pt = Commit.item_bbox.center()
self.source_pt = self.mapFromItem(self.source, dest_pt)
self.dest_pt = self.mapFromItem(self.dest, dest_pt)
self.line = QtCore.QLineF(self.source_pt, self.dest_pt)
width = self.dest_pt.x() - self.source_pt.x()
height = self.dest_pt.y() - self.source_pt.y()
rect = QtCore.QRectF(self.source_pt, QtCore.QSizeF(width, height))
self.bound = rect.normalized()
def commits_were_invalidated(self):
self.recompute_bound()
self.prepareGeometryChange()
# The path should not be recomputed immediately because just small part
# of DAG is actually shown at same time. It will be recomputed on
# demand in course of 'paint' method.
self.path_valid = False
# Hence, just queue redrawing.
self.update()
# Qt overrides
def type(self):
return self.item_type
def boundingRect(self):
return self.bound
def recompute_path(self):
QRectF = QtCore.QRectF
QPointF = QtCore.QPointF
arc_rect = 10
connector_length = 5
path = QtGui.QPainterPath()
if self.source.x() == self.dest.x():
path.moveTo(self.source.x(), self.source.y())
path.lineTo(self.dest.x(), self.dest.y())
else:
# Define points starting from source
point1 = QPointF(self.source.x(), self.source.y())
point2 = QPointF(point1.x(), point1.y() - connector_length)
point3 = QPointF(point2.x() + arc_rect, point2.y() - arc_rect)
# Define points starting from dest
point4 = QPointF(self.dest.x(), self.dest.y())
point5 = QPointF(point4.x(), point3.y() - arc_rect)
point6 = QPointF(point5.x() - arc_rect, point5.y() + arc_rect)
start_angle_arc1 = 180
span_angle_arc1 = 90
start_angle_arc2 = 90
span_angle_arc2 = -90
# If the dest is at the left of the source, then we
# need to reverse some values
if self.source.x() > self.dest.x():
point5 = QPointF(point4.x(), point4.y() + connector_length)
point6 = QPointF(point5.x() + arc_rect, point5.y() + arc_rect)
point3 = QPointF(self.source.x() - arc_rect, point6.y())
point2 = QPointF(self.source.x(), point3.y() + arc_rect)
span_angle_arc1 = 90
path.moveTo(point1)
path.lineTo(point2)
path.arcTo(QRectF(point2, point3),
start_angle_arc1, span_angle_arc1)
path.lineTo(point6)
path.arcTo(QRectF(point6, point5),
start_angle_arc2, span_angle_arc2)
path.lineTo(point4)
self.path = path
self.path_valid = True
def paint(self, painter, option, widget):
if not self.path_valid:
self.recompute_path()
painter.setPen(self.pen)
painter.drawPath(self.path)
class EdgeColor(object):
"""An edge color factory"""
current_color_index = 0
colors = [
QtGui.QColor(Qt.red),
QtGui.QColor(Qt.green),
QtGui.QColor(Qt.blue),
QtGui.QColor(Qt.black),
QtGui.QColor(Qt.darkRed),
QtGui.QColor(Qt.darkGreen),
QtGui.QColor(Qt.darkBlue),
QtGui.QColor(Qt.cyan),
QtGui.QColor(Qt.magenta),
# Orange; Qt.yellow is too low-contrast
qtutils.rgba(0xff, 0x66, 0x00),
QtGui.QColor(Qt.gray),
QtGui.QColor(Qt.darkCyan),
QtGui.QColor(Qt.darkMagenta),
QtGui.QColor(Qt.darkYellow),
QtGui.QColor(Qt.darkGray),
]
@classmethod
def cycle(cls):
cls.current_color_index += 1
cls.current_color_index %= len(cls.colors)
color = cls.colors[cls.current_color_index]
color.setAlpha(128)
return color
@classmethod
def current(cls):
return cls.colors[cls.current_color_index]
@classmethod
def reset(cls):
cls.current_color_index = 0
class Commit(QtWidgets.QGraphicsItem):
item_type = QtWidgets.QGraphicsItem.UserType + 2
commit_radius = 12.0
merge_radius = 18.0
item_shape = QtGui.QPainterPath()
item_shape.addRect(commit_radius/-2.0,
commit_radius/-2.0,
commit_radius, commit_radius)
item_bbox = item_shape.boundingRect()
inner_rect = QtGui.QPainterPath()
inner_rect.addRect(commit_radius/-2.0 + 2.0,
commit_radius/-2.0 + 2.0,
commit_radius - 4.0,
commit_radius - 4.0)
inner_rect = inner_rect.boundingRect()
commit_color = QtGui.QColor(Qt.white)
outline_color = commit_color.darker()
merge_color = QtGui.QColor(Qt.lightGray)
commit_selected_color = QtGui.QColor(Qt.green)
selected_outline_color = commit_selected_color.darker()
commit_pen = QtGui.QPen()
commit_pen.setWidth(1.0)
commit_pen.setColor(outline_color)
def __init__(self, commit,
notifier,
selectable=QtWidgets.QGraphicsItem.ItemIsSelectable,
cursor=Qt.PointingHandCursor,
xpos=commit_radius/2.0 + 1.0,
cached_commit_color=commit_color,
cached_merge_color=merge_color):
QtWidgets.QGraphicsItem.__init__(self)
self.commit = commit
self.notifier = notifier
self.setZValue(0)
self.setFlag(selectable)
self.setCursor(cursor)
self.setToolTip(commit.oid[:12] + ': ' + commit.summary)
if commit.tags:
self.label = label = Label(commit)
label.setParentItem(self)
label.setPos(xpos + 1, -self.commit_radius/2.0)
else:
self.label = None
if len(commit.parents) > 1:
self.brush = cached_merge_color
else:
self.brush = cached_commit_color
self.pressed = False
self.dragged = False
self.edges = {}
def blockSignals(self, blocked):
self.notifier.notification_enabled = not blocked
def itemChange(self, change, value):
if change == QtWidgets.QGraphicsItem.ItemSelectedHasChanged:
# Broadcast selection to other widgets
selected_items = self.scene().selectedItems()
commits = [item.commit for item in selected_items]
self.scene().parent().set_selecting(True)
self.notifier.notify_observers(diff.COMMITS_SELECTED, commits)
self.scene().parent().set_selecting(False)
# Cache the pen for use in paint()
if value:
self.brush = self.commit_selected_color
color = self.selected_outline_color
else:
if len(self.commit.parents) > 1:
self.brush = self.merge_color
else: