-
Notifications
You must be signed in to change notification settings - Fork 4
/
egit.el
1256 lines (1146 loc) · 43.8 KB
/
egit.el
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
;;; egit.el --- emacs git commit history interface ala gitk and qgit
;; Copyright (C) 2008 Jim Hourihan
;; Version: 1.1
;; 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.
;;
;; 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
;;; Commentary:
;; This file contains an interface to git commands which are not
;; (currently) part of git.el. Primarily, this is a view of the git commit
;; history with the ability to mark ranges and/or single commits and
;; operate on them. Mutiple branches/tags/ref interfaces can be active at
;; the same time.
;;
;; To install: put this file on the load-path and place the following in
;; your .emacs file:
;;
;; (require 'egit)
;; -or-
;; (autoload 'egit "egit" "Emacs git history" t)
;; (autoload 'egit-file "egit" "Emacs git history file" t)
;; (autoload 'egit-dir "egit" "Emacs git history directory" t)
;;
;; `M-x egit' shows commit history for a given branch, tag, or other ref. With
;; a prefix argument, you supply a directory (to identify the repo), the ref,
;; and a maximum number of commits to show -- e.g., M-x C-u egit
;;
;; `M-x egit-file' will show commits related to a specific file
;;
;; `M-x egit-dir' will show commits related to files within a directory
;;
;; egit is currently useful for browsing the history. It has only a few
;; operations implemented (cherry-pick, revert, tag, delete tag) -- and
;; those are implemented only minimally. The framework for operating on a
;; single or multiple commits (that have been marked) already exists, so
;; adding new git commands should be relatively easy.
;;
;; There isn't a way to specify a range of commits (unless you use the
;; marked commits to do so). There should probably be a dedicated method of
;; creating a range to pass to git commands. It might be good to have a
;; facility like qgit's in which user defined commands can be added
;; (although the default set should be fairly complete)
;;
;; The "occur" feature needs something like himark to highlight the occur
;; regex in the comment buffer(s). There's a piece of code in there that
;; currently calls himark that's commented out. The idea is to "grep"
;; through comments. For example to highlight all cherry picked commits
;; search for "cherry", etc.
;;
;; Start up time can be significant when 10s of thousands of commits are
;; being displayed so the default is 500. You can increase that after the
;; fact by clicking on the number of commits message at the end of the
;; buffer.
;;
;; TODO
;; - graph representation along the left of the commit buffer
;; - graphical rep of a commit range (like the marks)
;; - git reset functions
;; - branch creation at a commit
;; - patch creation from a set of commits
;; - show list of authors/sign-offs related to commits
;; - make occur more useful
;; - speed up
;; - lazy resolve parent commits
;; - make delete tag default to one of the current commit tags
;;
;; WISH
;; - incrementally load commits
;;
(require 'git)
(require 'ewoc)
(eval-when-compile (require 'cl))
(defvar egit-mode-map nil "Mode map for egit mode")
(defvar egit-mode-menu nil "Menu for egit mode")
(defvar egit-default-max-commits 500 "Default number of commits to show")
(defface egit-base-face
'((t (:inherit variable-pitch))) "egit: base"
:group 'egit)
(defface egit-bisect-unknown-face
'((t (:inherit fixed-pitch :background "light blue" :box nil)))
"egit: bisect unknown"
:group 'egit)
(defface egit-bisect-good-face
'((t (:inherit fixed-pitch :background "pale green" :box nil)))
"egit: bisect good"
:group 'egit)
(defface egit-bisect-bad-face
'((t (:inherit fixed-pitch :background "tomato" :box nil)))
"egit: bisect bad"
:group 'egit)
(defface egit-tag-face
'((t (:inherit egit-base-face :background "yellow" :box t))) "egit: tag"
:group 'egit)
(defface egit-remote-face
'((t (:inherit egit-base-face :background "bisque" :box t))) "egit: remote"
:group 'egit)
(defface egit-head-face
'((t (:inherit egit-base-face :background "green" :box t))) "egit: head"
:group 'egit)
(defface egit-merge-base-face
'((t (:inherit egit-base-face :background "green3" :box t))) "egit: merge-base"
:group 'egit)
(defface egit-highlight-face
'((t (:inherit egit-base-face :background "darkseagreen1")))
"egit: highlight"
:group 'egit)
(defface egit-merged-commit-face
'((t (:inherit egit-base-face :background "SkyBlue" :box t))) "egit: merged"
:group 'egit)
(defface egit-marked-face
'((t (:inherit egit-base-face :background "orange" :box t))) "egit: marked"
:group 'egit)
(defface egit-date-face
'((t (:inherit egit-base-face :foreground "grey25"))) "egit: date"
:group 'egit)
(defface egit-subdued-date-face
'((t (:inherit egit-base-face :foreground "grey60"))) "egit: date subdued"
:group 'egit)
(defface egit-author-face
'((t (:inherit fixed-pitch :foreground "grey25"))) "egit: date"
:group 'egit)
(defface egit-subdued-author-face
'((t (:inherit fixed-pitch :foreground "grey60"))) "egit: date subdued"
:group 'egit)
(defface egit-id-face
'((t (:inherit fixed-pitch))) "egit: id"
:group 'egit)
(defface egit-file-name-face
'((t (:inherit default :foreground "blue"))) "egit: file-name"
:group 'egit)
(defface egit-heading-face
'((t (:inherit bold))) "egit: heading"
:group 'egit)
(defface egit-more-face
'((t (:inherit egit-base-face :foreground "blue"))) "egit: more"
:group 'egit)
(defface egit-more-mouse-face
'((t (:inherit egit-more-face :underline t))) "egit: more mouse"
:group 'egit)
(defface egit-diff-diff-face
'((t (:foreground "blue4" :background "lavender"))) "egit: diff diff"
:group 'egit)
(defface egit-diff-minus-face '((t (:foreground "red3"))) "egit: diff minus"
:group 'egit)
(defface egit-diff-plus-face '((t (:foreground "green3"))) "egit: diff plus"
:group 'egit)
(defface egit-diff-graph-plus-face
'((t (:background "green3" :foreground "green3"))) "egit: graph diff plus"
:group 'egit)
(defface egit-diff-graph-minus-face
'((t (:background "red3" :foreground "red3"))) "egit: graph diff minus"
:group 'egit)
(defface egit-diff-context-face '((t (:foreground "magenta4"))) "egit: diff context"
:group 'egit)
(defcustom egit-current-line-bg-color
"grey70"
"Background color used to highlight the current line"
:type 'color
:group 'egit)
(defstruct egit--commit
id
tag
merge-bases
refs
parents
children
subject
author
date
merge
comments
bisect-state
mark)
(defvar egit-log-buffer " *egit-log*")
(defvar egit-branch-buffer " *egit-branch*")
(defvar egit-tag-buffer " *egit-tags*")
(defvar egit-commit-buffer "*egit-commit*")
(defvar egit-diff-buffer "*egit-commit-diff*")
(defvar egit-temp-buffer " *egit-temp*")
(defun egit-parse-commit-line (line commit)
(let ((w (car (split-string line)))
(c (> (length line) 1))
(nwsp (not (equal (aref line 0) ? ))))
(cond
((and nwsp c (string= w "Date:"))
(setf (egit--commit-date commit) (date-to-time (substring line 8 -1))))
((and nwsp c (string= w "Author:"))
(setf (egit--commit-author commit) (substring line 8 -1)))
((and nwsp c (string= w "Merge:"))
(setf (egit--commit-merge commit) (substring line 7 -1)))
((and c (string-match "^commit " line)) nil)
(t
(let ((comments (egit--commit-comments commit))
(subject (egit--commit-subject commit)))
(when (and w (not subject))
(setf (egit--commit-subject commit) (substring line 4 -1)))
(when (or comments w)
(setf (egit--commit-comments commit)
(cons line comments)))
t)))))
(defun egit-heading (s)
(propertize s 'face 'egit-heading-face))
(defun egit-nice-human-name (n)
(string-match "\\(.*\\)<.*>" n)
(let* ((N 12)
(person (match-string 1 n))
(parts (split-string person))
(abbrev (mapconcat 'concat parts " "))
(l (length abbrev)))
(if (> l N)
(substring abbrev 0 N)
(concat (make-string (- N l) ? ) abbrev))))
(defun egit-propertize-ref (s)
(cond
((string-match "refs/heads/\\(.*\\)" s)
(propertize (match-string 1 s) 'face 'egit-head-face))
((string-match "refs/tags/\\(.*\\)" s)
(propertize (match-string 1 s) 'face 'egit-tag-face))
((string-match "refs/remotes/\\(.*\\)" s)
(propertize (match-string 1 s) 'face 'egit-remote-face))
(t nil)))
(defun egit-combine-subject-refs (commit)
(let ((subject-text (egit--commit-subject commit))
(reflist (egit--commit-refs commit)))
(if subject-text
(if (and reflist (sequencep reflist))
(progn
(let ((s ""))
(dolist (x reflist)
(let ((q (egit-propertize-ref x)))
(when q (setq s (concat s q " ")))))
(setf (egit--commit-subject commit)
(concat
s
(propertize subject-text 'face 'egit-base-face)))))
(setf (egit--commit-subject commit) (propertize subject-text 'face 'egit-base-face)))
(setf (egit--commit-subject commit) (propertize "No Commit Message" 'face 'italic)))))
(defun egit-parse-commit-id (text commit)
(let* ((parts (split-string text "[()\n\r]"))
(line (split-string (car parts)))
(refline (car (cdr parts)))
(sha1 (car (cdr line)))
(rents (if (cdr line) (cdr (cdr line)) nil)))
(setf (egit--commit-id commit) sha1)
(setf (egit--commit-parents commit) rents)
(setf (egit--commit-children commit) nil)
(when (and refline (not (string= "" refline)))
(setf (egit--commit-refs commit) (split-string refline "[ ,]")))))
(defun egit-parse-commit ()
"Requires that point is at the beginning of a commit log entry"
(interactive)
(let* ((line (thing-at-point 'line))
(commit-line (cdr (split-string line)))
(commit (make-egit--commit)))
(egit-parse-commit-id line commit)
(forward-line)
(beginning-of-line)
(while (and (not (eobp))
(egit-parse-commit-line (thing-at-point 'line) commit))
(forward-line)
(beginning-of-line))
(egit-combine-subject-refs commit)
(setf (egit--commit-comments commit) (reverse (egit--commit-comments commit)))
commit))
(defun egit-parse-log (ref-start &optional n)
"Read commit log"
(if (and n (> n 0))
(git-run-command-buffer egit-log-buffer
"log" "--parents" "--decorate=full"
(format "-%d" n) ref-start)
(git-run-command-buffer egit-log-buffer
"log" "--parents" "--decorate=full" ref-start))
(save-excursion
(let ((buffer (get-buffer-create egit-log-buffer))
(commits nil))
(set-buffer buffer)
(let ((last-pcent-done 0)
(pcent-down 0)
(start-time (float-time))
(total (- (point-max) (point-min))))
(goto-char (point-min))
(while (not (eobp))
(when (> (- (float-time) start-time) 3.0)
(setq pcent-done (/ (point) (/ total 100)))
(unless (equal pcent-done last-pcent-done)
(setq last-pcent-done pcent-done)
(message "Parsed %d%% ..." pcent-done)))
(setq commits (cons (egit-parse-commit) commits)))
(kill-buffer buffer)
(reverse commits)))))
(defun egit-parse-file-log (file)
"Read commit log for a specific file"
(git-run-command-buffer egit-log-buffer
"log" "--decorate=full" "--follow" "--parents" file)
(save-excursion
(let ((buffer (get-buffer-create egit-log-buffer))
(commits nil))
(set-buffer buffer)
(goto-char (point-min))
(while (not (eobp))
(setq commits (cons (egit-parse-commit) commits)))
;(kill-buffer buffer)
(reverse commits))))
(defun max-number (list biggest)
(if list
(let ((x (car list))
(rest (cdr list)))
(if (> x biggest)
(max-number rest x)
(max-number rest biggest)))
biggest))
(defun egit-update-ewoc ()
(let ((node (ewoc-locate egit-ewoc)))
(ewoc-refresh egit-ewoc)
(ewoc-goto-node egit-ewoc node))
(egit-current-line-decoration))
(defun egit-get-selection ()
"Return a list of marked commits (or the current if none are marked)"
(interactive)
(let ((commits nil))
(dolist (c egit-commits)
(when (egit--commit-mark c)
(setq commits (cons c commits))))
(if commits
commits
(list (ewoc-data (ewoc-locate egit-ewoc))))))
(defun egit-get-full-name (infile)
"Returns the git full name for FILE"
(let ((file (expand-file-name infile)))
(git-run-command-buffer egit-temp-buffer "ls-files" "-z" "--full-name" "--" file)
(with-current-buffer egit-temp-buffer
(goto-char (point-min))
(replace-string "