forked from noguchit/egg
-
Notifications
You must be signed in to change notification settings - Fork 20
/
egg.el
7784 lines (7059 loc) · 348 KB
/
egg.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
;;; egg.el --- Emacs Got Git - Emacs interface to Git
;; Copyright (C) 2008 Linh Dang
;; Copyright (C) 2008 Marius Vollmer
;; Copyright (C) 2009 Tim Moore
;; Copyright (C) 2010 Alexander Prusov
;; Copyright (C) 2011-2018 byplayer
;;
;; Author: Bogolisk <bogolisk@gmail.com>
;; Created: 19 Aug 2008
;; Version: 1.1.4
;; Keywords: git, version control, release management
;;
;; Special Thanks to
;; Antoine Levitt, Bogolisk,
;; Christian Köstlin
;; Max Mikhanosha
;; Aleksandar Simic
;; Maksim Golubev
;; Felix S Klock II
;;
;; Egg 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 3, or (at your option)
;; any later version.
;;
;; Egg 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 GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary
;;; This is my fork of Marius's excellent magit. his work is at:
;;; http://zagadka.vm.bytemark.co.uk/magit
;;;
;;; This is my fork of bogolisk egg . his work is at
;; http://github.com/bogolisk/egg
;;
;; ssh and github: please use key authentication since egg doesn't
;; handle login/passwd prompt
;;
;; gpg and tag : please add "use-agent" option in your gpg.conf
;; since egg doesn't handle passphrase prompt.
;;;
;; Options
;; If you want to auto-update egg-status on file save,
;; you set follow value on your .emacs.
;; (setq egg-auto-update t)
;;
;; Set to nonnil for egg-status to switch to the status buffer in the same window.
;; (setq egg-switch-to-buffer t)
;;
;; If you want to change prefix of lunch egg,
;; you set follow value on your .emacs.
;; (custom-set-variables
;; '(egg-mode-key-prefix "C-c v"))
(eval-when-compile (require 'cl))
(require 'egg-custom)
(require 'egg-base)
(require 'egg-const)
(require 'egg-git)
(require 'electric)
(require 'ediff)
(require 'ffap)
(require 'diff-mode)
(require 'rx)
(defconst egg-version "1.1.4")
(defconst egg-basic-map
(let ((map (make-sparse-keymap "Egg:Basic")))
(set-keymap-parent map egg-section-map)
(define-key map (kbd "C-c C-s") 'egg-status)
(define-key map (kbd "s") 'egg-status)
(define-key map (kbd "l") 'egg-log)
(define-key map (kbd "L") 'egg-log-buffer-reflog-ref)
(define-key map (kbd "/") 'egg-search-changes)
(define-key map (kbd "c") 'egg-commit-log-edit)
map)
"Keymap for a basic egg buffer.
\\{egg-basic-map}")
(defconst egg-file-index-map
(let ((map (make-sparse-keymap "Egg:FileIndex")))
(set-keymap-parent map egg-basic-map)
map)
"Keymap for an egg buffer show the index version of a file.
\\{egg-file-index-map}")
(defvar egg-global-mode-name nil)
(defvar egg-global-mode nil)
(defun egg-set-global-mode (&optional string)
(interactive)
(when (egg-is-in-git)
(when (boundp 'vc-mode)
(set 'vc-mode nil))
(set (make-local-variable 'egg-global-mode) t)
(set (make-local-variable 'egg-global-mode-name)
(if string (concat " " string)))
;; (setq egg-global-mode-name
;; (intern (concat "egg-" (egg-git-dir) "-HEAD")))
(or (assq 'egg-global-mode minor-mode-alist)
(push '(egg-global-mode egg-global-mode-name) minor-mode-alist))))
;;(cl-macroexpand '(egg-text blah 'egg-text-3))
(defun egg-show-branch (branch)
(interactive (list (egg-head-at-point)))
(let* ((info (and (stringp branch)
(egg-git-to-string-list "for-each-ref"
"--format=%(refname:short) %(refname) %(upstream:short)"
(concat "refs/heads/" branch))))
(name (nth 0 info))
(full (nth 1 info))
(upstream (nth 2 info)))
(when (stringp name)
(message "local-branch:%s full-name:%s upstream:%s"
(egg-text name 'bold)
(egg-text full 'bold)
(if upstream (egg-text upstream 'bold) "none")))))
(defvar egg-atag-info-buffer (get-buffer-create "*tag-info*"))
(defun egg-show-atag (tag)
(interactive (list (egg-tag-at-point)))
(let ((dir (egg-work-tree-dir))
(buf egg-atag-info-buffer)
(new-buf-name (concat "*tag@" (egg-repo-name) ":" tag "*"))
(inhibit-read-only t)
target-type sig-beg sig-end verify pos)
(with-current-buffer buf
(setq default-directory dir)
(setq target-type (egg-git-to-string "for-each-ref" "--format=%(objecttype)"
(concat "refs/tags/" tag)))
(unless (equal target-type "tag")
(error "Not an annotated tag: %s" tag))
(unless (string-equal (buffer-name) new-buf-name)
(rename-buffer new-buf-name))
(erase-buffer)
(unless (egg--git t "show" "-s" tag)
(error "Failed to show tag %s" tag))
(save-match-data
(goto-char (point-min))
(re-search-forward "^tag ")
(put-text-property (match-end 0) (line-end-position) 'face 'egg-branch)
(re-search-forward "^Tagger:\\s-+")
(put-text-property (match-end 0) (line-end-position) 'face 'egg-text-2)
(re-search-forward "^Date:\\s-+")
(put-text-property (match-end 0) (line-end-position) 'face 'egg-text-2)
(setq pos (line-end-position))
(when (re-search-forward "-----BEGIN PGP SIGNATURE-----" nil t)
(setq sig-beg (match-beginning 0))
(re-search-forward "-----END PGP SIGNATURE-----\n")
(setq sig-end (match-end 0))
(goto-char sig-beg)
(delete-region sig-beg sig-end)
(with-temp-buffer
(egg--git t "tag" "-v" tag)
(goto-char (point-min))
(re-search-forward "^gpg:")
(setq verify (buffer-substring-no-properties (match-beginning 0)
(point-max))))
(insert verify "\n"))
(goto-char pos)
(re-search-forward "^\\(commit\\|gpg:\\)")
(put-text-property pos (match-beginning 0) 'face 'egg-text-1)
(re-search-forward "^Author:\\s-+")
(put-text-property (match-end 0) (line-end-position) 'face 'egg-text-2)
(re-search-forward "^Date:\\s-+")
(put-text-property (match-end 0) (line-end-position) 'face 'egg-text-2)
(put-text-property (line-end-position) (point-max) 'face 'egg-text-1))
(set-buffer-modified-p nil))
(pop-to-buffer buf)))
(defun egg-show-remote-branch (branch)
(interactive (list (egg-remote-at-point)))
(let* ((info (and (stringp branch)
(egg-git-to-string-list "for-each-ref"
"--format=%(refname:short) %(refname)"
(concat "refs/remotes/" branch))))
(name (nth 0 info))
(full (nth 1 info))
(site (and (stringp name) (egg-rbranch-to-remote name)))
(url (and site (egg-git-to-string "ls-remote" "--get-url" site))))
(when (stringp name)
(message "remote-tracking-branch:%s full-name:%s site:%s"
(egg-text name 'bold)
(egg-text full 'bold)
(egg-text url 'bold)))))
(defun egg-call-next-action (action &optional ignored-action only-action)
(when (and action (symbolp action))
(let ((cmd (plist-get '(log egg-log
status egg-status
stash egg-status
commit egg-commit-log-edit
reflog egg-reflog)
action))
(current-prefix-arg nil))
(when (and (commandp cmd) ;; cmd is a valid command
;; if only-action is specified, then only take
;; action if it's the same as only-action
(or (and only-action (eq only-action action))
;; if only-action is not specified, then
;; take the action if it's not ignored.
(and (null only-action)
(not (if (symbolp ignored-action)
(eq action ignored-action)
(memq action ignored-action))))))
(call-interactively cmd)))))
(defsubst egg-tooltip-func ()
(if egg-enable-tooltip 'egg-buffer-help-echo))
(defun egg-read-tracked-filename (prompt &optional default no-match-ok)
(concat (egg-work-tree-dir)
(completing-read prompt #'egg-do-completion
#'egg-get-match-files-substring
(not no-match-ok) default)))
(defun egg-find-tracked-file (file-name)
"Open a file tracked by git."
(interactive (list (egg-read-tracked-filename "Find tracked file: ")))
(switch-to-buffer (find-file-noselect file-name)))
(defun egg-pretty-head-string (&optional state)
"Pretty description of HEAD. if STATE was not nil then use it
as repo state instead of re-read from disc."
(let* ((state (or state (egg-repo-state)))
(branch (plist-get state :branch))
(merge-heads (plist-get state :merge-heads))
(rebase-head (plist-get state :rebase-head))
(squash-head (plist-get state :squash-head))
(rebase-upstream (plist-get state :rebase-upstream))
(sha1 (plist-get state :sha1)))
(cond ((and branch merge-heads)
(concat "Merging to " branch " from: "
(mapconcat 'identity merge-heads ",")))
(merge-heads
(concat "Merging to " (egg-pretty-short-rev sha1) " from: "
(mapconcat 'identity merge-heads ",")))
((and branch squash-head)
(concat "Squashed " squash-head " onto " branch))
(squash-head
(concat "Squashed " squash-head " onto " (egg-pretty-short-rev sha1)))
((and rebase-head rebase-upstream)
(format "Rebasing %s onto %s" rebase-head rebase-upstream))
(branch branch)
(t (concat "Detached HEAD: " (egg-describe-rev sha1))))))
(defsubst egg-pretty-head-name (&optional state)
"Pretty name for HEAD. if STATE was not nil then use it
as repo state instead of re-read from disc."
(let* ((state (or state (egg-repo-state)))
(branch (plist-get state :branch)))
(or branch (egg-pretty-short-rev (plist-get state :sha1)))))
(defun egg--async-create-signed-commit-handler (buffer-to-update)
(goto-char (point-min))
(re-search-forward "EGG-GIT-OUTPUT:\n" nil t)
(if (not (match-end 0))
(message "something wrong with git-commit's output!")
(let* ((proc egg-async-process)
(ret-code (process-exit-status proc))
res)
(goto-char (match-end 0))
(save-restriction
(narrow-to-region (point) (point-max))
(setq res (egg--do-show-output
"GIT-COMMIT-GPG"
(egg--do-handle-exit (cons ret-code (current-buffer))
#'egg--git-pp-commit-output
buffer-to-update)))
(when (plist-get res :success)
(setq res (nconc (list :next-action 'status) res)))
(egg--buffer-handle-result res t)))))
(defsubst egg-buffer-do-amend-no-edit (&rest args)
(egg--buffer-handle-result (egg--git-amend-no-edit-cmd t) t))
(defun egg--buffer-do-create-tag (name rev stdin &optional short-msg force ignored-action)
(let ((args (list name rev))
(check-name (egg-git-to-string "name-rev" name))
res)
(cond (stdin (setq args (nconc (list "-F" "-") args)))
(short-msg (setq args (nconc (list "-m" short-msg))))
(t nil))
(setq force (egg--git-tag-check-name name force))
(when force (setq args (cons "-f" args)))
(when (or stdin short-msg) (setq args (cons "-a" args)))
(setq res (egg--git-tag-cmd (egg-get-log-buffer) stdin args))
;;; useless???
(when (plist-get res :success)
(setq res (nconc (list :next-action 'log) res)))
(egg--buffer-handle-result res t ignored-action)))
;;(setenv "GPG_AGENT_INFO" "/tmp/gpg-SbJxGl/S.gpg-agent:28016:1")
;;(getenv "GPG_AGENT_INFO")
(defun egg--async-create-signed-tag-handler (buffer-to-update name rev)
(goto-char (point-min))
(re-search-forward "EGG-GIT-OUTPUT:\n" nil t)
(if (not (match-end 0))
(message "something wrong with git-tag's output!")
(let* ((proc egg-async-process)
(ret-code (process-exit-status proc))
res)
(goto-char (match-end 0))
(save-restriction
(narrow-to-region (point) (point-max))
(setq res (egg--do-show-output
"GIT-TAG-GPG"
(egg--do-handle-exit (cons ret-code (current-buffer))
#'egg--git-tag-cmd-pp
buffer-to-update)))
(when (plist-get res :success)
(setq res (nconc (list :next-action 'log) res)))
(egg--buffer-handle-result res t)))))
(defun egg--async-create-signed-tag-cmd (buffer-to-update msg name rev &optional gpg-uid force)
(let ((force (egg--git-tag-check-name name force))
(args (list "-m" msg name rev)))
(when force (setq args (cons "-f" args)))
(setq args (if (stringp gpg-uid) (nconc (list "-u" gpg-uid) args) (cons "-s" args)))
(egg-async-1-args (list #'egg--async-create-signed-tag-handler buffer-to-update name rev)
(cons "tag" args))))
(defsubst egg-log-buffer-do-tag-commit (name rev force &optional msg)
(egg--buffer-do-create-tag name rev nil msg force 'log))
(defsubst egg-status-buffer-do-tag-HEAD (name force &optional msg)
(egg--buffer-do-create-tag name "HEAD" nil msg force 'status))
(defsubst egg-edit-buffer-do-create-tag (name rev beg end force)
(egg--buffer-do-create-tag name rev (cons beg end) nil force))
(defun egg--buffer-handle-result (result &optional take-next-action ignored-action only-action)
"Handle the structure returned by the egg--git-xxxxx-cmd functions.
RESULT is the returned value of those functions. Proceed to the next logical action
if TAKE-NEXT-ACTION is non-nil unless the next action is IGNORED-ACTION.
if ONLY-ACTION is non-nil then only perform the next action if it's the same
as ONLY-ACTION.
See documentation of `egg--git-action-cmd-doc' for structure of RESULT."
(let ((ok (plist-get result :success))
(next-action (plist-get result :next-action)))
(egg-revert-visited-files (plist-get result :files))
(when (and ok take-next-action)
(egg-call-next-action next-action ignored-action only-action))
ok))
(defun egg--buffer-handle-result-with-commit (result commit-args
&optional take-next-action
ignored-action only-action)
"Handle the structure returned by the egg--git-xxxxx-cmd functions.
RESULT is the returned value of those functions. Proceed to the next logical action
if TAKE-NEXT-ACTION is non-nil unless the next action is IGNORED-ACTION.
if ONLY-ACTION is non-nil then only perform the next action if it's the same
as ONLY-ACTION.
See documentation of `egg--git-action-cmd-doc' for structure of RESULT."
(let ((ok (plist-get result :success))
(next-action (plist-get result :next-action)))
(egg-revert-visited-files (plist-get result :files))
(when (and ok take-next-action)
(if (eq next-action 'commit)
(apply #'egg-commit-log-edit commit-args)
(egg-call-next-action next-action ignored-action only-action)))
ok))
(defsubst egg-log-buffer-handle-result (result)
"Handle the RESULT returned by egg--git-xxxxx-cmd functions.
This function should be used in the log buffer only.
See documentation of `egg--git-action-cmd-doc' for structure of RESULT."
(egg--buffer-handle-result result t 'log))
(defsubst egg-status-buffer-handle-result (result)
"Handle the RESULT returned by egg--git-xxxxx-cmd functions.
This function should be used in the status buffer only.
See documentation of `egg--git-action-cmd-doc' for structure of RESULT."
(egg--buffer-handle-result result t 'status))
(defsubst egg-stash-buffer-handle-result (result)
"Handle the RESULT returned by egg--git-xxxxx-cmd functions.
This function should be used in the stash buffer only.
See documentation of `egg--git-action-cmd-doc' for structure of RESULT."
(egg--buffer-handle-result result t 'stash))
(defsubst egg-file-buffer-handle-result (result)
"Handle the RESULT returned by egg--git-xxxxx-cmd functions.
This function should be used in a file visiting buffer only.
See documentation of `egg--git-action-cmd-doc' for structure of RESULT."
;; for file buffer, we only take commit action
(egg--buffer-handle-result result t nil 'commit))
(defsubst egg-buffer-do-create-branch (name rev force track ignored-action)
"Create a new branch synchronously when inside an egg special buffer.
NAME is the name of the new branch. REV is the starting point of the branch.
If force is non-nil, then force the creation of new branch even if a branch
NAME already existed. Branch NAME will bet set up to track REV if REV was
a branch and track was non-nil. Take the next logical action unless it's
IGNORED-ACTION."
(egg--buffer-handle-result
(egg--git-branch-cmd (egg-get-log-buffer)
(nconc (if force (list "-f"))
(if track (list "--track"))
(list name rev))) t ignored-action))
(defsubst egg-log-buffer-do-co-rev (rev &rest args)
"Checkout REV using ARGS as arguments when in the log buffer."
(egg-log-buffer-handle-result (egg--git-co-rev-cmd-args t rev args)))
(defsubst egg-status-buffer-do-co-rev (rev &rest args)
"Checkout REV using ARGS as arguments when in the status buffer."
(egg-status-buffer-handle-result (egg--git-co-rev-cmd-args t rev args)))
;;;========================================================
;;; Blame utils
;;;========================================================
(defconst egg-blame-map
(let ((map (make-sparse-keymap "Egg:Blame")))
(define-key map (kbd "l") 'egg-blame-locate-commit)
(define-key map (kbd "RET") 'egg-blame-locate-commit)
(define-key map (kbd "q") 'egg-file-toggle-blame-mode)
(define-key map (kbd "n") 'egg-buffer-cmd-navigate-next)
(define-key map (kbd "p") 'egg-buffer-cmd-navigate-prev)
map)
"Keymap for an annotated section.\\{egg-blame-map}")
(defun egg-parse-git-blame (target-buf blame-buf &optional ov-attributes)
"Parse blame-info in buffer BLAME-BUF and decorate TARGET-BUF buffer.
OV-ATTRIBUTES are the extra decorations for each blame chunk."
(save-match-data
(let ((blank (egg-text " " 'egg-blame))
(nl (egg-text "\n" 'egg-blame))
(commit-hash (make-hash-table :test 'equal :size 577))
commit commit-info old-line new-line num old-file subject author
info ov beg end blame)
(with-current-buffer blame-buf
(goto-char (point-min))
;; search for a ful commit info
(while (re-search-forward (rx line-start
(group (= 40 hex-digit)) " "
(group (1+ digit)) " "
(group (1+ digit)) " "
(group (1+ digit))
line-end)
nil t)
(setq commit (match-string-no-properties 1)
old-line (string-to-number
(match-string-no-properties 2))
new-line (string-to-number
(match-string-no-properties 3))
num (string-to-number
(match-string-no-properties 4)))
;; was this commit already seen (and stored in the hash)?
(setq commit-info (gethash commit commit-hash))
;; Nope, this is the 1st time, the full commit-info follow.
(unless commit-info
(re-search-forward "^author \\(.+\\)$")
(setq author (match-string-no-properties 1))
(re-search-forward "^summary \\(.+\\)$")
(setq subject (match-string-no-properties 1))
(re-search-forward "^filename \\(.+\\)$")
(setq old-file (match-string-no-properties 1))
(setq commit-info (nconc
(list :sha1 commit :author author
:subject subject :file old-file)
ov-attributes))
;; save it in the hash
(puthash commit commit-info commit-hash))
;; add the current blame-block into the list INFO.
(setq info (cons (list old-line new-line num commit-info)
info))))
;; now do from beginning
(setq info (nreverse info))
(with-current-buffer target-buf
;; for every blame chunk
(dolist (chunk info)
(setq commit-info (nth 3 chunk)
old-line (nth 0 chunk)
new-line (nth 1 chunk)
num (nth 2 chunk)
commit (plist-get commit-info :sha1)
author (plist-get commit-info :author)
subject (plist-get commit-info :subject))
(goto-char (point-min))
(forward-line (1- new-line))
(setq beg (line-beginning-position)
end (save-excursion
(forward-line num)
(line-beginning-position)))
;; mark the blame chunk
(put-text-property beg end :blame chunk)
(put-text-property beg end :navigation commit)
;; make an overlay with blame info as 'before-string
;; on the current chunk.
(setq ov (make-overlay beg end))
(overlay-put ov :blame chunk)
(setq blame (concat
(egg-text (substring-no-properties commit 0 8)
'egg-blame)
blank
(egg-text (format "%-20s" author)
'egg-blame-culprit)
blank
(egg-text subject 'egg-blame-subject)
blank nl))
(overlay-put ov 'before-string blame)
(overlay-put ov 'local-map egg-blame-map))))))
(defsubst egg-file-buffer-blame-off (buffer)
(save-excursion
(save-restriction
(with-current-buffer buffer
(widen)
(mapc (lambda (ov)
(if (overlay-get ov :blame)
(delete-overlay ov)))
(overlays-in (point-min) (point-max)))))))
(defun egg-file-buffer-blame-on (buffer &rest ov-attributes)
(egg-file-buffer-blame-off buffer)
(save-excursion
(with-current-buffer buffer
(save-restriction
(with-temp-buffer
(when (egg--git t "blame" "-w" "-M" "-C" "--porcelain" "--"
(file-name-nondirectory
(buffer-file-name buffer)))
(egg-parse-git-blame buffer (current-buffer)
ov-attributes)))))))
(defun egg-blame-locate-commit (pos &optional all)
"Jump to a commit in the branch history from an annotated blame section.
With prefix argument, the history of all refs is used."
(interactive "d\nP")
(let ((overlays (overlays-at pos))
sha1)
(dolist (ov overlays)
(if (overlay-get ov :blame)
(setq sha1 (plist-get (nth 3 (overlay-get ov :blame)) :sha1))))
(if sha1
(egg-do-locate-commit sha1))))
;;;========================================================
;;; Diff/Hunk
;;;========================================================
(defun egg-mouse-do-command (event cmd)
(let* ((window (posn-window (event-end event)))
(buffer (and window (window-buffer window)))
(position (posn-point (event-end event))))
(when (bufferp buffer)
(save-window-excursion
(save-excursion
(select-window window)
(with-current-buffer buffer
(goto-char position)
(call-interactively cmd)))))))
(defun egg-mouse-hide-show-cmd (event)
(interactive "e")
(egg-mouse-do-command event 'egg-section-cmd-toggle-hide-show))
(defun list-nav ()
(interactive)
(message "nav: %c:%s-%c:%s"
(preceding-char)
(get-text-property (1- (point)) :navigation)
(following-char)
(get-text-property (point) :navigation)))
(defsubst egg-decorate-diff-header (beg end line-beg line-end)
(put-text-property line-beg (1+ beg)
'display
(egg-text
(concat "\n"
(buffer-substring-no-properties beg
(1+ beg)))
'egg-diff-file-header))
(put-text-property (1+ beg) end 'face 'egg-diff-file-header)
(put-text-property (1+ beg) end 'help-echo (egg-tooltip-func)))
(defsubst egg-decorate-cc-diff-header (beg end line-beg line-end)
(put-text-property line-beg (1+ beg)
'display
(egg-text
(concat "\n"
(buffer-substring-no-properties beg
(1+ beg)))
'egg-unmerged-diff-file-header))
(put-text-property (1+ beg) end 'face 'egg-unmerged-diff-file-header)
(put-text-property (1+ beg) end 'help-echo (egg-tooltip-func)))
(defsubst egg-decorate-diff-index-line (beg end line-beg line-end)
(put-text-property line-beg (1+ line-end) 'display ""))
(defsubst egg-decorate-hunk-header (beg end line-beg line-end)
(put-text-property beg end 'face 'egg-diff-hunk-header)
(put-text-property end line-end 'face 'egg-diff-none)
(put-text-property beg end 'help-echo (egg-tooltip-func)))
(defvar egg-internal-buffer-obarray nil)
(defsubst egg-make-navigation (parent child)
"Make a symbolic and unique navigation id.
return a symbol PARENT-CHILD from an internal obarray."
(unless (vectorp egg-internal-buffer-obarray)
(error "Arrg! egg-internal-buffer-obarray is not an obarray!"))
(intern (format "%s-%s" parent child) egg-internal-buffer-obarray))
(defsubst egg-do-compute-navigation (section pos)
"Come up with a symbolic and unique navigation id for
section SECTION at position POS."
(egg-make-navigation (get-text-property pos :navigation)
(if (consp section)
(car section)
section)))
(defun egg-compute-navigation (ignored-1 section pos ignored-2)
"Come up with a symbolic and unique navigation id for
section SECTION at position POS."
(egg-do-compute-navigation section pos))
(defun egg-delimit-section (sect-type section beg end
&optional inv-beg
keymap navigation)
"Mark section for navigation and add local/context keymap.
SECT-TYPE is the type of the section (usually a :symbol).
SECTION is the name of the section (usually a string). BEG and
END are limits of the section. INV-BEG is the position after the
position that would remain visible when the section is hidden.
KEYMAP is the local/context keymap for the section.
NAVIGATION is the navigation id of the section. NAVIGATION can also
a function to call to compute the navigation id of the section."
(let ((nav (cond ((and (not (eq navigation 'file))
(functionp navigation))
(funcall navigation sect-type section beg end))
((null navigation) beg)
(t navigation))))
(put-text-property beg end :sect-type sect-type)
(put-text-property beg end sect-type section)
(put-text-property beg end :navigation nav)
(when (keymapp keymap)
(put-text-property beg end 'keymap keymap))
(when (integer-or-marker-p inv-beg)
(let ((current-inv (get-text-property inv-beg 'invisible)))
(add-to-list 'current-inv nav t)
(put-text-property inv-beg (1- end) 'invisible current-inv)))))
(defsubst egg-make-hunk-info (name beg end diff)
"Build a hunk info NAME from BEG to END based on DIFF.
Hunk info contains name and posistions of the hunk. Positions are offsets
from DIFF because it can the whole diff can be pushed around inside
the buffer.
The fourth element of hunk info is NIL and is a placeholder for
HUNK-RANGES list to be placed there by `egg-calculate-hunk-ranges'
"
(let ((b (nth 1 diff)))
(list name (- beg b) (- end b) nil)))
(defsubst egg-make-diff-info (name beg end head-end)
"Build a diff info NAME from BEG to END. HEAD-END is the end position
of the diff header.
Diff info contains name and posistions of the diff. The beginning position
is stored as a marker and the others are offset from the beginning posistion
because the whole diff can be pushed around inside the buffer."
(let ((b (make-marker))
info)
(set-marker b beg)
;; no insertion indo the diff
(set-marker-insertion-type b t)
;; all other posistions are offsets from B.
(setq info (list name b (- end beg) (- head-end beg)))
(save-match-data
(save-excursion
(goto-char beg)
(if (re-search-forward "new file mode" head-end t)
(setq info (nconc info (list 'newfile))))))
info))
(defun egg-decorate-diff-sequence (args)
"Decorate a sequence of deltas. ARGS is a plist containing the
positions of the sequence as well as the decorations.
:begin :end :diff-map :hunk-map :cc-diff-map :cc-hunk-map
:conflict-map :src-prefix :dst-prefix
"
(let* ((beg (plist-get args :begin))
(end (plist-get args :end))
(diff-map (plist-get args :diff-map))
(hunk-map (plist-get args :hunk-map))
(cc-diff-map (plist-get args :cc-diff-map))
(cc-hunk-map (plist-get args :cc-hunk-map))
(conflict-map (plist-get args :conflict-map))
(a (plist-get args :src-prefix))
(b (plist-get args :dst-prefix))
;; the sub match id of the regexp below
(diff-no 1)
(cc-diff-no 2)
(hunk-no 3)
(cc-hunk-no 4)
(src-no 5)
(dst-no 6)
(index-no 7)
(conf-beg-no 8)
(conf-div-no 9)
(conf-end-no 10)
(cc-del-no 11)
(cc-add-no 12)
(del-no 13)
(add-no 14)
(none-no 15)
(regexp
(concat "^\\(?:"
"diff --git " a ".+ " b "\\(.+\\)\\|" ;1 diff header
"diff --cc \\(.+\\)\\|" ;2 cc-diff header
"\\(@@ .+@@\\).*\\|" ;3 hunk
"\\(@@@ .+@@@\\).*\\|" ;4 cc-hunk
"--- " a "\\(.+\\)\\|" ;5 src
"\\+\\+\\+ " b "\\(.+\\)\\|" ;6 dst
"index \\(.+\\)\\|" ;7 index
"\\+\\+<<<<<<< \\(.+\\)\\(?::.+\\)?\\|";8 conflict start
"\\(\\+\\+=======\\)\\|" ;9 conflict div
"\\+\\+>>>>>>> \\(.+\\)\\(?::.+\\)?\\|";10 conflict end
"\\( -.*\\)\\|" ;11 cc-del
"\\( \\+.*\\)\\|" ;12 cc-add
"\\(-.*\\)\\|" ;13 del
"\\(\\+.*\\)\\|" ;14 add
"\\( .*\\)" ;15 none
"\\)$"))
;; where the hunk end?
(hunk-end-re "^\\(?:diff \\|@@\\|\\* \\)")
;; where the diff end?
(diff-end-re "^\\(?:diff \\|\\* \\)")
sub-beg sub-end head-end m-b-0 m-e-0 m-b-x m-e-x
last-diff last-cc current-delta-is tmp pos)
(save-match-data
(save-excursion
(goto-char beg)
(while (re-search-forward regexp end t)
(setq sub-beg (match-beginning 0)
m-b-0 sub-beg
m-e-0 (match-end 0))
(cond ((or (match-beginning del-no)
(and (match-beginning cc-del-no) (eq current-delta-is 'cc-diff))) ;; del
(put-text-property m-b-0 m-e-0 'face 'egg-diff-del))
((or (match-beginning add-no)
(and (match-beginning cc-add-no) (eq current-delta-is 'cc-diff))) ;; add
(put-text-property m-b-0 m-e-0 'face 'egg-diff-add))
((match-beginning none-no) ;; unchanged
(put-text-property m-b-0 m-e-0 'face 'egg-diff-none))
((match-beginning dst-no) ;; +++ b/file
(setq m-b-x (match-beginning dst-no)
m-e-x (match-end dst-no))
(put-text-property m-b-0 m-b-x 'face 'egg-diff-add)
(put-text-property m-b-x m-e-x 'face 'egg-diff-none))
((match-beginning src-no) ;; --- a/file
(setq m-b-x (match-beginning src-no)
m-e-x (match-end src-no))
(put-text-property m-b-0 m-b-x 'face 'egg-diff-del)
(put-text-property m-b-x m-e-x 'face 'egg-diff-none))
((match-beginning conf-beg-no) ;;++<<<<<<<
(setq m-b-x (match-beginning conf-beg-no)
m-e-x (match-end conf-beg-no)
tmp (match-string-no-properties conf-beg-no))
(put-text-property m-b-0 m-b-x 'face 'egg-diff-conflict)
(put-text-property m-b-x m-e-x 'face 'egg-branch-mono)
(put-text-property m-e-x m-e-0 'face 'egg-diff-none)
(setq pos (egg-safe-search "^++=======" end))
(add-text-properties m-b-0 pos (list :conflict-side 'ours
:conflict-head tmp))
;; mark the whole conflict section
(setq sub-end (egg-safe-search "^++>>>>>>>.+\n" end nil nil t))
(egg-delimit-section :conflict (cons sub-beg sub-end) sub-beg sub-end
(+ m-b-0 9) conflict-map 'egg-compute-navigation))
((match-beginning conf-end-no) ;;++>>>>>>>
(setq m-b-x (match-beginning conf-end-no)
m-e-x (match-end conf-end-no)
tmp (match-string-no-properties conf-end-no))
;; just decorate, no mark.
;; the section was already mark when the conf-beg-no
;; matched.
(setq pos (egg-safe-search "^++=======" beg nil t t))
(add-text-properties pos (1+ m-e-0) (list :conflict-side 'theirs
:conflict-head tmp))
(put-text-property m-b-0 m-b-x 'face 'egg-diff-conflict)
(put-text-property m-b-x m-e-x 'face 'egg-branch-mono)
(put-text-property m-e-x m-e-0 'face 'egg-diff-none))
((match-beginning conf-div-no) ;;++=======
;; just decorate, no mark.
;; the section was already mark when the conf-beg-no
;; matched.
(put-text-property m-b-0 m-e-0 'face 'egg-diff-conflict))
((match-beginning hunk-no) ;; hunk @@
(setq m-b-x (match-beginning hunk-no)
m-e-x (match-end hunk-no)
;; find the end of the hunk section
sub-end (or (egg-safe-search hunk-end-re end)
end))
;; decorate the header
(egg-decorate-hunk-header m-b-x m-e-x m-b-0 m-e-0)
;; mark the whole hunk based on the last diff header
(egg-delimit-section
:hunk (egg-make-hunk-info
(match-string-no-properties hunk-no)
sub-beg sub-end last-diff)
sub-beg sub-end m-e-0 hunk-map
'egg-compute-navigation))
((match-beginning cc-hunk-no) ;; cc-hunk
(setq m-b-x (match-beginning cc-hunk-no)
m-e-x (match-end cc-hunk-no)
;; find the end of the hunk section
sub-end (or (egg-safe-search hunk-end-re end)
end))
;; decorate the header
(egg-decorate-hunk-header m-b-x m-e-x m-b-0 m-e-0)
;; mark the whole hunk based on the last cc-diff header
(egg-delimit-section
:hunk (egg-make-hunk-info
(match-string-no-properties cc-hunk-no)
sub-beg sub-end last-cc)
sub-beg sub-end m-e-0 cc-hunk-map
'egg-compute-navigation))
((match-beginning diff-no) ;; diff
(setq m-b-x (match-beginning diff-no)
m-e-x (match-end diff-no)
sub-end (or (egg-safe-search diff-end-re end) end)
;; find the end of the header
head-end (or (egg-safe-search "^\\(@@\\|diff\\)" end) end))
;; decorate the header
(egg-decorate-diff-header m-b-x m-e-x m-b-0 m-e-0)
;; mark the whole diff
(egg-delimit-section
:diff (setq last-diff
(egg-make-diff-info
(match-string-no-properties diff-no)
sub-beg sub-end head-end))
sub-beg sub-end m-e-0 diff-map 'egg-compute-navigation)
(put-text-property (- sub-end 2) sub-end 'intangible t)
(setq current-delta-is 'diff))
((match-beginning cc-diff-no) ;; cc-diff
(setq m-b-x (match-beginning cc-diff-no)
m-e-x (match-end cc-diff-no)
sub-end (or (egg-safe-search diff-end-re end) end)
;; find the end of the header
head-end (or (egg-safe-search "^\\(@@@\\|diff\\)" end) end))
;; decorate the header
(egg-decorate-cc-diff-header m-b-x m-e-x m-b-0 m-e-0)
;; mark the whole diff
(egg-delimit-section
:diff (setq last-cc
(egg-make-diff-info
(match-string-no-properties cc-diff-no)
sub-beg sub-end head-end))
sub-beg sub-end m-e-0 cc-diff-map
'egg-compute-navigation)
(put-text-property (- sub-end 2) sub-end 'intangible t)
(setq current-delta-is 'cc-diff))
((match-beginning index-no) ;; index
(setq m-b-x (match-beginning index-no)
m-e-x (match-end index-no))
(egg-decorate-diff-index-line m-b-x m-e-x m-b-0 m-e-0))
) ;; cond
) ;; while
) ;; save-excursion
) ;;; save -match-data
nil))
(defun egg-decorate-diff-section (&rest args)
"Decorate a section containing a sequence of diffs.
See `egg-decorate-diff-sequence'."
(let ((beg (plist-get args :begin))
(end (plist-get args :end))
(a (or (plist-get args :src-prefix) "a/"))
(b (or (plist-get args :dst-prefix) "b/"))
(a-rev (plist-get args :src-revision))
(b-rev (plist-get args :dst-revision)))
(when (stringp a-rev)
(put-text-property beg end :src-revision a-rev))
(when (stringp b-rev)
(put-text-property beg end :dst-revision b-rev))
(egg-decorate-diff-sequence
(nconc (list :src-prefix a :dst-prefix b) args))))
(defsubst egg-hunk-info-at (pos)
"Rebuild the hunk info at POS.
Hunk info are relative offsets. This function compute the
physical offsets. The hunk-line may be NIL if this is not status
or commit buffer and `egg-calculate-hunk-ranges' was
not called"
(let* ((diff-info (get-text-property pos :diff))
(head-beg (nth 1 diff-info))
(hunk-info (get-text-property pos :hunk))
(hunk-beg (and hunk-info (+ (nth 1 hunk-info) head-beg)))
(hunk-end (and hunk-info (+ (nth 2 hunk-info) head-beg)))
(hunk-ranges (and hunk-info (nth 3 hunk-info))))
(and hunk-info
(list (car diff-info) (car hunk-info) hunk-beg hunk-end hunk-ranges))))
(defun egg-diff-section-cmd-visit-file (file)
"Visit file FILE."
(interactive (list (car (get-text-property (point) :diff))))
(find-file file))
(defun egg-staged-diff-section-cmd-visit-index (file &optional use-wdir-file)
"Visit the index of FILE.
With C-u prefix, visit the work-tree's file instead."
(interactive (list (car (get-text-property (point) :diff))
current-prefix-arg))
(if use-wdir-file
(find-file file)
(egg-buffer-pop-to-file file ":0")))
(defun egg-staged-diff-section-cmd-visit-index-other-window (file &optional use-wdir-file)
(interactive (list (car (get-text-property (point) :diff))
current-prefix-arg))
(if use-wdir-file
(find-file-other-window file)
(egg-buffer-pop-to-file file ":0" t)))
(defun egg-staged-hunk-cmd-visit-index-other-window (use-wdir-file file hunk-header hunk-beg &rest ignored)
(interactive (cons current-prefix-arg (egg-hunk-info-at (point))))
(egg-buffer-pop-to-file file
(unless use-wdir-file ":0")
t
use-wdir-file
(egg-hunk-compute-line-no hunk-header hunk-beg)))
(defun egg-staged-hunk-cmd-visit-index (use-wdir-file file hunk-header hunk-beg &rest ignored)
(interactive (cons current-prefix-arg (egg-hunk-info-at (point))))
(egg-buffer-pop-to-file file
(unless use-wdir-file ":0")
nil
use-wdir-file
(egg-hunk-compute-line-no hunk-header hunk-beg)))