fiddlerwoaroof/dotfiles - Change 7L24DODT2V3BKWIPWCXUYRVE7FAGPYO6PFRN3PMT622IA5HAOXTAC

chore(emacs): move magit earlier in init.el

Created by fiddlerwoaroof on February 9, 2020

7L24DODT2V3BKWIPWCXUYRVE7FAGPYO6PFRN3PMT622IA5HAOXTAC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

Insertion in emacs.d/init.el at line 95 [6.136]

[5.267]

[2.188]


(fwoar/zenburn-with-color-variables
  (defface magit-keyword-feature
    `((t :foreground ,zenburn-green :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces)
  (defface magit-keyword-chore
    `((t :foreground ,zenburn-blue :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces)
  (defface magit-keyword-misc
    `((t :foreground ,zenburn-fg-1 :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces)
  (defface magit-keyword-bug
    `((t :foreground ,zenburn-red :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces))
(defun fwoar/propertize-magit-log (_rev msg)
  (let ((boundary 0))
    (while (string-match "^\\(\\(?:feat\\(?:ure\\)?(\\([^)]+?\\))\\)\\|\\(?:feat\\(ure\\)?\\>\\)\\)" msg boundary)
      (setq boundary (match-end 0))
      (magit--put-face (match-beginning 0) boundary
                       'magit-keyword-feature msg)))
  (let ((boundary 0))
    (while (string-match "^\\(\\(?:chore(\\([^)]+?\\))\\)\\|\\(?:chore\\>\\)\\)" msg boundary)
      (setq boundary (match-end 0))
      (magit--put-face (match-beginning 0) boundary
                       'magit-keyword-chore msg)))
  (let ((boundary 0))
    (while (string-match "^\\(\\(?:bug(\\([^)]+?\\))\\)\\|\\(?:bug\\>\\)\\)"  msg boundary)
      (setq boundary (match-end 0))
      (magit--put-face (match-beginning 0) boundary
                       'magit-keyword-bug msg)))
  (let ((boundary 0))
    (while (string-match "^\\([^:\n\t]+\\):"  msg boundary)
      (setq boundary (match-end 0))
      (let ((group (match-string 1 msg)))
        (unless (or (> (length group) 20)
                    (s-starts-with? "feat" group)
                    (s-starts-with? "Merge" group)
                    (s-starts-with? "merge" group)
                    (s-starts-with? "chore" group)
                    (s-starts-with? "bug" group))
          (magit--put-face (match-beginning 0) (1- boundary)
                           'magit-keyword-misc msg))))))
(use-package magit
  :ensure t
  :config
  (evil-define-key 'normal magit-file-mode-map " a" 'magit)
  ;; TODO: figure this out with transients
  ;;(magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote)
  'magit-dispatch
  (advice-add 'magit-log-propertize-keywords :after
              'fwoar/propertize-magit-log))
(use-package browse-at-remote
  :after magit
  :ensure t
  :config (push (cons "gitlab.cj.com" "gitlab")
                browse-at-remote-remote-type-domains))
(eval-and-compile
  (defvar *fwoar-git-repos*
    (file-name-as-directory
     (expand-file-name (car (file-expand-wildcards "~/git*_repos"))
                       "~"))))
(eval-and-compile
  (defun fwoar-git-repo (name ssh-remote http-remote)
    (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))
      (unless (file-exists-p dir-name)
        (ecase fwoar-git-mode
          (:ssh (magit-run-git-with-input "clone" ssh-remote dir-name))
          (:http (magit-run-git-with-input "clone" http-remote dir-name))))
      dir-name)))
(defvar *dotfiles-repo*
  (fwoar-git-repo "dotfiles"
                  "git@git.fiddlerwoaroof.com:dotfiles.git"
                  "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

Insertion in emacs.d/init.el at line 194 [6.136]
[2.661]
[7.175]
```
(evil-define-key 'normal magit-file-mode-map " a" 'magit)
```
Insertion in emacs.d/init.el at line 196 [6.136]
[7.176]
[8.168]

Deletion in emacs.d/init.el at line 521 [6.136]

B:BD[9.1038] → [10.3283:3286]

B:BD[10.3286] → [11.369:784]

B:BD[11.784] → [12.188:248]

∅:D[12.248] → [11.844:1165]

B:BD[11.844] → [11.844:1165]

B:BD[11.1165] → [12.249:364]

∅:D[12.364] → [11.1273:1436]

B:BD[11.1273] → [11.1273:1436]

B:BD[11.1436] → [12.365:460]

∅:D[12.460] → [11.1524:1685]

B:BD[11.1524] → [11.1524:1685]

B:BD[11.1685] → [12.461:553]

∅:D[12.553] → [11.1770:1929]

B:BD[11.1770] → [11.1770:1929]

B:BD[11.1929] → [12.554:614]

∅:D[12.614] → [11.1994:2072]

B:BD[11.1994] → [11.1994:2072]

B:BD[11.2072] → [12.615:809]

∅:D[12.809] → [11.2122:2373]

B:BD[11.2122] → [11.2122:2373]

∅:D[11.2373] → [10.3315:3325]

B:BD[10.3315] → [10.3315:3325]

∅:D[9.1075] → [13.166:226]

∅:D[10.3325] → [13.166:226]

B:BD[14.20044] → [13.166:226]

B:BD[13.226] → [10.3326:3460]

B:BD[10.3460] → [11.2374:2489]

∅:D[11.2489] → [10.3462:3463]

B:BD[10.3462] → [10.3462:3463]

B:BD[10.3463] → [15.5757:5917]

∅:D[10.3609] → [9.1185:1186]

∅:D[15.5917] → [9.1185:1186]

B:BD[9.1185] → [9.1185:1186]

B:BD[9.1186] → [15.5918:6488]

∅:D[15.6488] → [10.3843:3868]

B:BD[10.3843] → [10.3843:3868]

B:BD[10.3868] → [16.637:796]

∅:D[16.796] → [10.3941:3942]

B:BD[10.3941] → [10.3941:3942]


(fwoar/zenburn-with-color-variables
  (defface magit-keyword-feature
    `((t :foreground ,zenburn-green :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces)
  (defface magit-keyword-chore
    `((t :foreground ,zenburn-blue :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces)
  (defface magit-keyword-misc
    `((t :foreground ,zenburn-fg-1 :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces)
  (defface magit-keyword-bug
    `((t :foreground ,zenburn-red :inherit magit-keyword))
    "Face for parts of commit messages inside brackets."
    :group 'magit-faces))
(defun fwoar/propertize-magit-log (_rev msg)
  (let ((boundary 0))
    (while (string-match "^\\(\\(?:feat\\(?:ure\\)?(\\([^)]+?\\))\\)\\|\\(?:feat\\(ure\\)?\\>\\)\\)" msg boundary)
      (setq boundary (match-end 0))
      (magit--put-face (match-beginning 0) boundary
                       'magit-keyword-feature msg)))
  (let ((boundary 0))
    (while (string-match "^\\(\\(?:chore(\\([^)]+?\\))\\)\\|\\(?:chore\\>\\)\\)" msg boundary)
      (setq boundary (match-end 0))
      (magit--put-face (match-beginning 0) boundary
                       'magit-keyword-chore msg)))
  (let ((boundary 0))
    (while (string-match "^\\(\\(?:bug(\\([^)]+?\\))\\)\\|\\(?:bug\\>\\)\\)"  msg boundary)
      (setq boundary (match-end 0))
      (magit--put-face (match-beginning 0) boundary
                       'magit-keyword-bug msg)))
  (let ((boundary 0))
    (while (string-match "^\\([^:\n\t]+\\):"  msg boundary)
      (setq boundary (match-end 0))
      (let ((group (match-string 1 msg)))
        (unless (or (> (length group) 20)
                    (s-starts-with? "feat" group)
                    (s-starts-with? "Merge" group)
                    (s-starts-with? "merge" group)
                    (s-starts-with? "chore" group)
                    (s-starts-with? "bug" group))
          (magit--put-face (match-beginning 0) (1- boundary)
                           'magit-keyword-misc msg))))))
(use-package magit
  :ensure t
  :config
  (evil-define-key 'normal magit-file-mode-map " a" 'magit)
  ;; TODO: figure this out with transients
  ;;(magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote)
  'magit-dispatch
  (advice-add 'magit-log-propertize-keywords :after
              'fwoar/propertize-magit-log))
(use-package browse-at-remote
  :after magit
  :ensure t
  :config (push (cons "gitlab.cj.com" "gitlab")
                browse-at-remote-remote-type-domains))
(eval-and-compile
  (defvar *fwoar-git-repos*
    (file-name-as-directory
     (expand-file-name (car (file-expand-wildcards "~/git*_repos"))
                       "~"))))
(eval-and-compile
  (defun fwoar-git-repo (name ssh-remote http-remote)
    (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))
      (unless (file-exists-p dir-name)
        (ecase fwoar-git-mode
          (:ssh (magit-run-git-with-input "clone" ssh-remote dir-name))
          (:http (magit-run-git-with-input "clone" http-remote dir-name))))
      dir-name)))
(defvar *dotfiles-repo*
  (fwoar-git-repo "dotfiles"
                  "git@git.fiddlerwoaroof.com:dotfiles.git"
                  "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

chore(emacs): move magit earlier in init.el

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

Insertion in emacs.d/init.el at line 95 [6.136]

Insertion in emacs.d/init.el at line 194 [6.136]

Insertion in emacs.d/init.el at line 196 [6.136]

Deletion in emacs.d/init.el at line 521 [6.136]