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
|
;;; magit-refs.el --- listing references -*- lexical-binding: t -*-
;; Copyright (C) 2010-2020 The Magit Project Contributors
;;
;; You should have received a copy of the AUTHORS.md file which
;; lists all contributors. If not, see http://magit.vc/authors.
;; Author: Jonas Bernoulli <jonas@bernoul.li>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
;; Magit 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.
;;
;; Magit 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 Magit. If not, see http://www.gnu.org/licenses.
;;; Commentary:
;; This library implements support for listing references in a buffer.
;;; Code:
(eval-when-compile
(require 'subr-x))
(require 'magit)
;;; Options
(defgroup magit-refs nil
"Inspect and manipulate Git branches and tags."
:link '(info-link "(magit)References Buffer")
:group 'magit-modes)
(defcustom magit-refs-mode-hook nil
"Hook run after entering Magit-Refs mode."
:package-version '(magit . "2.1.0")
:group 'magit-refs
:type 'hook)
(defcustom magit-refs-sections-hook
'(magit-insert-error-header
magit-insert-branch-description
magit-insert-local-branches
magit-insert-remote-branches
magit-insert-tags)
"Hook run to insert sections into a references buffer."
:package-version '(magit . "2.1.0")
:group 'magit-refs
:type 'hook)
(defcustom magit-refs-show-commit-count nil
"Whether to show commit counts in Magit-Refs mode buffers.
all Show counts for branches and tags.
branch Show counts for branches only.
nil Never show counts.
To change the value in an existing buffer use the command
`magit-refs-show-commit-count'"
:package-version '(magit . "2.1.0")
:group 'magit-refs
:safe (lambda (val) (memq val '(all branch nil)))
:type '(choice (const all :tag "For branches and tags")
(const branch :tag "For branches only")
(const nil :tag "Never")))
(put 'magit-refs-show-commit-count 'safe-local-variable 'symbolp)
(put 'magit-refs-show-commit-count 'permanent-local t)
(defcustom magit-refs-pad-commit-counts nil
"Whether to pad all counts on all sides in `magit-refs-mode' buffers.
If this is nil, then some commit counts are displayed right next
to one of the branches that appear next to the count, without any
space in between. This might look bad if the branch name faces
look too similar to `magit-dimmed'.
If this is non-nil, then spaces are placed on both sides of all
commit counts."
:package-version '(magit . "2.12.0")
:group 'magit-refs
:type 'boolean)
(defvar magit-refs-show-push-remote nil
"Whether to show the push-remotes of local branches.
Also show the commits that the local branch is ahead and behind
the push-target. Unfortunately there is a bug in Git that makes
this useless (the commits ahead and behind the upstream are
shown), so this isn't enabled yet.")
(defcustom magit-refs-show-remote-prefix nil
"Whether to show the remote prefix in lists of remote branches.
This is redundant because the name of the remote is already shown
in the heading preceding the list of its branches."
:package-version '(magit . "2.12.0")
:group 'magit-refs
:type 'boolean)
(defcustom magit-refs-margin
(list nil
(nth 1 magit-log-margin)
'magit-log-margin-width nil
(nth 4 magit-log-margin))
"Format of the margin in `magit-refs-mode' buffers.
The value has the form (INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH).
If INIT is non-nil, then the margin is shown initially.
STYLE controls how to format the author or committer date.
It can be one of `age' (to show the age of the commit),
`age-abbreviated' (to abbreviate the time unit to a character),
or a string (suitable for `format-time-string') to show the
actual date. Option `magit-log-margin-show-committer-date'
controls which date is being displayed.
WIDTH controls the width of the margin. This exists for forward
compatibility and currently the value should not be changed.
AUTHOR controls whether the name of the author is also shown by
default.
AUTHOR-WIDTH has to be an integer. When the name of the author
is shown, then this specifies how much space is used to do so."
:package-version '(magit . "2.9.0")
:group 'magit-refs
:group 'magit-margin
:safe (lambda (val) (memq val '(all branch nil)))
:type magit-log-margin--custom-type
:initialize 'magit-custom-initialize-reset
:set-after '(magit-log-margin)
:set (apply-partially #'magit-margin-set-variable 'magit-refs-mode))
(defcustom magit-refs-margin-for-tags nil
"Whether to show information about tags in the margin.
This is disabled by default because it is slow if there are many
tags."
:package-version '(magit . "2.9.0")
:group 'magit-refs
:group 'magit-margin
:type 'boolean)
(defcustom magit-refs-primary-column-width (cons 16 32)
"Width of the focus column in `magit-refs-mode' buffers.
The primary column is the column that contains the name of the
branch that the current row is about.
If this is an integer, then the column is that many columns wide.
Otherwise it has to be a cons-cell of two integers. The first
specifies the minimal width, the second the maximal width. In that
case the actual width is determined using the length of the names
of the shown local branches. (Remote branches and tags are not
taken into account when calculating to optimal width.)"
:package-version '(magit . "2.12.0")
:group 'magit-refs
:type '(choice (integer :tag "Constant wide")
(cons :tag "Wide constrains"
(integer :tag "Minimum")
(integer :tag "Maximum"))))
(defcustom magit-refs-focus-column-width 5
"Width of the focus column in `magit-refs-mode' buffers.
The focus column is the first column, which marks one
branch (usually the current branch) as the focused branch using
\"*\" or \"@\". For each other reference, this column optionally
shows how many commits it is ahead of the focused branch and \"<\", or
if it isn't ahead then the commits it is behind and \">\", or if it
isn't behind either, then a \"=\".
This column may also display only \"*\" or \"@\" for the focused
branch, in which case this option is ignored. Use \"L v\" to
change the verbosity of this column."
:package-version '(magit . "2.12.0")
:group 'magit-refs
:type 'integer)
(defcustom magit-refs-filter-alist nil
"Alist controlling which refs are omitted from `magit-refs-mode' buffers.
The purpose of this option is to forgo displaying certain refs
based on their name. If you want to not display any refs of a
certain type, then you should remove the appropriate function
from `magit-refs-sections-hook' instead.
All keys are tried in order until one matches. Then its value
is used and subsequent elements are ignored. If the value is
non-nil, then the reference is displayed, otherwise it is not.
If no element matches, then the reference is displayed.
A key can either be a regular expression that the refname has to
match, or a function that takes the refname as only argument and
returns a boolean. A remote branch such as \"origin/master\" is
displayed as just \"master\", however for this comparison the
former is used."
:package-version '(magit . "2.12.0")
:group 'magit-refs
:type '(alist :key-type (choice :tag "Key" regexp function)
:value-type (boolean :tag "Value"
:on "show (non-nil)"
:off "omit (nil)")))
(defcustom magit-visit-ref-behavior nil
"Control how `magit-visit-ref' behaves in `magit-refs-mode' buffers.
By default `magit-visit-ref' behaves like `magit-show-commit',
in all buffers, including `magit-refs-mode' buffers. When the
type of the section at point is `commit' then \"RET\" is bound to
`magit-show-commit', and when the type is either `branch' or
`tag' then it is bound to `magit-visit-ref'.
\"RET\" is one of Magit's most essential keys and at least by
default it should behave consistently across all of Magit,
especially because users quickly learn that it does something
very harmless; it shows more information about the thing at point
in another buffer.
However \"RET\" used to behave differently in `magit-refs-mode'
buffers, doing surprising things, some of which cannot really be
described as \"visit this thing\". If you have grown accustomed
to such inconsistent, but to you useful, behavior, then you can
restore that by adding one or more of the below symbols to the
value of this option. But keep in mind that by doing so you
don't only introduce inconsistencies, you also lose some
functionality and might have to resort to `M-x magit-show-commit'
to get it back.
`magit-visit-ref' looks for these symbols in the order in which
they are described here. If the presence of a symbol applies to
the current situation, then the symbols that follow do not affect
the outcome.
`focus-on-ref'
With a prefix argument update the buffer to show commit counts
and lists of cherry commits relative to the reference at point
instead of relative to the current buffer or `HEAD'.
Instead of adding this symbol, consider pressing \"C-u y o RET\".
`create-branch'
If point is on a remote branch, then create a new local branch
with the same name, use the remote branch as its upstream, and
then check out the local branch.
Instead of adding this symbol, consider pressing \"b c RET RET\",
like you would do in other buffers.
`checkout-any'
Check out the reference at point. If that reference is a tag
or a remote branch, then this results in a detached `HEAD'.
Instead of adding this symbol, consider pressing \"b b RET\",
like you would do in other buffers.
`checkout-branch'
Check out the local branch at point.
Instead of adding this symbol, consider pressing \"b b RET\",
like you would do in other buffers."
:package-version '(magit . "2.9.0")
:group 'magit-refs
:group 'magit-commands
:options '(focus-on-ref create-branch checkout-any checkout-branch)
:type '(list :convert-widget custom-hook-convert-widget))
;;; Mode
(defvar magit-refs-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map magit-mode-map)
(define-key map "\C-y" 'magit-refs-set-show-commit-count)
(define-key map "L" 'magit-margin-settings)
map)
"Keymap for `magit-refs-mode'.")
(define-derived-mode magit-refs-mode magit-mode "Magit Refs"
"Mode which lists and compares references.
This mode is documented in info node `(magit)References Buffer'.
\\<magit-mode-map>\
Type \\[magit-refresh] to refresh the current buffer.
Type \\[magit-section-toggle] to expand or hide the section at point.
Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
to visit the commit or branch at point.
Type \\[magit-branch] to see available branch commands.
Type \\[magit-merge] to merge the branch or commit at point.
Type \\[magit-cherry-pick] to apply the commit at point.
Type \\[magit-reset] to reset `HEAD' to the commit at point.
\\{magit-refs-mode-map}"
:group 'magit-refs
(hack-dir-local-variables-non-file-buffer)
(setq imenu-create-index-function
#'magit-imenu--refs-create-index-function))
(defun magit-refs-setup-buffer (ref args)
(magit-setup-buffer #'magit-refs-mode nil
(magit-buffer-upstream ref)
(magit-buffer-arguments args)))
(defun magit-refs-refresh-buffer ()
(setq magit-set-buffer-margin-refresh (not (magit-buffer-margin-p)))
(unless (magit-rev-verify magit-buffer-upstream)
(setq magit-refs-show-commit-count nil))
(magit-set-header-line-format
(format "%s %s" magit-buffer-upstream
(mapconcat #'identity magit-buffer-arguments " ")))
(magit-insert-section (branchbuf)
(magit-run-section-hook 'magit-refs-sections-hook))
(add-hook 'kill-buffer-hook 'magit-preserve-section-visibility-cache))
(cl-defmethod magit-buffer-value (&context (major-mode magit-refs-mode))
(cons magit-buffer-upstream magit-buffer-arguments))
;;; Commands
;;;###autoload (autoload 'magit-show-refs "magit-refs" nil t)
(define-transient-command magit-show-refs (&optional transient)
"List and compare references in a dedicated buffer."
:man-page "git-branch"
:value (lambda ()
(magit-show-refs-arguments magit-prefix-use-buffer-arguments))
["Arguments"
(magit-for-each-ref:--contains)
("=m" "Merged" "--merged=" magit-transient-read-revision)
("-m" "Merged to HEAD" "--merged")
("-M" "Merged to master" "--merged=master")
("=n" "Not merged" "--no-merged=" magit-transient-read-revision)
("-n" "Not merged to HEAD" "--no-merged")
("-N" "Not merged to master" "--no-merged=master")
(magit-for-each-ref:--sort)]
["Actions"
("y" "Show refs, comparing them with HEAD" magit-show-refs-head)
("c" "Show refs, comparing them with current branch" magit-show-refs-current)
("o" "Show refs, comparing them with other branch" magit-show-refs-other)]
(interactive (list (or (derived-mode-p 'magit-refs-mode)
current-prefix-arg)))
(if transient
(transient-setup 'magit-show-refs)
(magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))
(defun magit-show-refs-arguments (&optional use-buffer-args)
(unless use-buffer-args
(setq use-buffer-args magit-direct-use-buffer-arguments))
(let (args)
(cond
((eq current-transient-command 'magit-show-refs)
(setq args (transient-args 'magit-show-refs)))
((eq major-mode 'magit-refs-mode)
(setq args magit-buffer-arguments))
((and (memq use-buffer-args '(always selected))
(when-let ((buffer (magit-get-mode-buffer
'magit-refs-mode nil
(eq use-buffer-args 'selected))))
(setq args (buffer-local-value 'magit-buffer-arguments buffer))
t)))
(t
(setq args (alist-get 'magit-show-refs transient-values))))
args))
(define-infix-argument magit-for-each-ref:--contains ()
:description "Contains"
:class 'transient-option
:key "-c"
:argument "--contains="
:reader 'magit-transient-read-revision)
(define-infix-argument magit-for-each-ref:--sort ()
:description "Sort"
:class 'transient-option
:key "-s"
:argument "--sort="
:reader 'magit-read-ref-sort)
(defun magit-read-ref-sort (prompt initial-input _history)
(magit-completing-read prompt
'("-committerdate" "-authordate"
"committerdate" "authordate")
nil nil initial-input))
;;;###autoload
(defun magit-show-refs-head (&optional args)
"List and compare references in a dedicated buffer.
Compared with `HEAD'."
(interactive (list (magit-show-refs-arguments)))
(magit-refs-setup-buffer "HEAD" args))
;;;###autoload
(defun magit-show-refs-current (&optional args)
"List and compare references in a dedicated buffer.
Compare with the current branch or `HEAD' if it is detached."
(interactive (list (magit-show-refs-arguments)))
(magit-refs-setup-buffer (magit-get-current-branch) args))
;;;###autoload
(defun magit-show-refs-other (&optional ref args)
"List and compare references in a dedicated buffer.
Compared with a branch read from the user."
(interactive (list (magit-read-other-branch "Compare with")
(magit-show-refs-arguments)))
(magit-refs-setup-buffer ref args))
(defun magit-refs-set-show-commit-count ()
"Change for which refs the commit count is shown."
(interactive)
(setq-local magit-refs-show-commit-count
(magit-read-char-case "Show commit counts for " nil
(?a "[a]ll refs" 'all)
(?b "[b]ranches only" t)
(?n "[n]othing" nil)))
(magit-refresh))
(defun magit-visit-ref ()
"Visit the reference or revision at point in another buffer.
If there is no revision at point or with a prefix argument prompt
for a revision.
This command behaves just like `magit-show-commit', except if
point is on a reference in a `magit-refs-mode' buffer (a buffer
listing branches and tags), in which case the behavior may be
different, but only if you have customized the option
`magit-visit-ref-behavior' (which see)."
(interactive)
(if (and (derived-mode-p 'magit-refs-mode)
(magit-section-match '(branch tag)))
(let ((ref (oref (magit-current-section) value)))
(cond (current-prefix-arg
(cond ((memq 'focus-on-ref magit-visit-ref-behavior)
(magit-refs-setup-buffer ref (magit-show-refs-arguments)))
(magit-visit-ref-behavior
;; Don't prompt for commit to visit.
(let ((current-prefix-arg nil))
(call-interactively #'magit-show-commit)))))
((and (memq 'create-branch magit-visit-ref-behavior)
(magit-section-match [branch remote]))
(let ((branch (cdr (magit-split-branch-name ref))))
(if (magit-branch-p branch)
(if (magit-rev-eq branch ref)
(magit-call-git "checkout" branch)
(setq branch (propertize branch 'face 'magit-branch-local))
(setq ref (propertize ref 'face 'magit-branch-remote))
(pcase (prog1 (read-char-choice (format (propertize "\
Branch %s already exists.
[c]heckout %s as-is
[r]reset %s to %s and checkout %s
[a]bort " 'face 'minibuffer-prompt) branch branch branch ref branch)
'(?c ?r ?a))
(message "")) ; otherwise prompt sticks
(?c (magit-call-git "checkout" branch))
(?r (magit-call-git "checkout" "-B" branch ref))
(?a (user-error "Abort"))))
(magit-call-git "checkout" "-b" branch ref))
(setq magit-buffer-upstream branch)
(magit-refresh)))
((or (memq 'checkout-any magit-visit-ref-behavior)
(and (memq 'checkout-branch magit-visit-ref-behavior)
(magit-section-match [branch local])))
(magit-call-git "checkout" ref)
(setq magit-buffer-upstream ref)
(magit-refresh))
(t
(call-interactively #'magit-show-commit))))
(call-interactively #'magit-show-commit)))
;;; Sections
(defvar magit-remote-section-map
(let ((map (make-sparse-keymap)))
(define-key map [remap magit-delete-thing] 'magit-remote-remove)
(define-key map "R" 'magit-remote-rename)
map)
"Keymap for `remote' sections.")
(defvar magit-branch-section-map
(let ((map (make-sparse-keymap)))
(define-key map [remap magit-visit-thing] 'magit-visit-ref)
(define-key map [remap magit-delete-thing] 'magit-branch-delete)
(define-key map "R" 'magit-branch-rename)
map)
"Keymap for `branch' sections.")
(defvar magit-tag-section-map
(let ((map (make-sparse-keymap)))
(define-key map [remap magit-visit-thing] 'magit-visit-ref)
(define-key map [remap magit-delete-thing] 'magit-tag-delete)
map)
"Keymap for `tag' sections.")
(defun magit-insert-branch-description ()
"Insert header containing the description of the current branch.
Insert a header line with the name and description of the
current branch. The description is taken from the Git variable
`branch.<NAME>.description'; if that is undefined then no header
line is inserted at all."
(when-let ((branch (magit-get-current-branch))
(desc (magit-get "branch" branch "description"))
(desc (split-string desc "\n")))
(when (equal (car (last desc)) "")
(setq desc (butlast desc)))
(magit-insert-section (branchdesc branch t)
(magit-insert-heading branch ": " (car desc))
(when (cdr desc)
(insert (mapconcat 'identity (cdr desc) "\n"))
(insert "\n\n")))))
(defun magit-insert-tags ()
"Insert sections showing all tags."
(when-let ((tags (magit-git-lines "tag" "--list" "-n" magit-buffer-arguments)))
(let ((_head (magit-rev-parse "HEAD")))
(magit-insert-section (tags)
(magit-insert-heading "Tags:")
(dolist (tag tags)
(string-match "^\\([^ \t]+\\)[ \t]+\\([^ \t\n].*\\)?" tag)
(let ((tag (match-string 1 tag))
(msg (match-string 2 tag)))
(when (magit-refs--insert-refname-p tag)
(magit-insert-section (tag tag t)
(magit-insert-heading
(magit-refs--format-focus-column tag 'tag)
(propertize tag 'font-lock-face 'magit-tag)
(make-string (max 1 (- magit-refs-primary-column-width
(length tag)))
?\s)
(and msg (magit-log-propertize-keywords nil msg)))
(when (and magit-refs-margin-for-tags (magit-buffer-margin-p))
(magit-refs--format-margin tag))
(magit-refs--insert-cherry-commits tag)))))
(insert ?\n)
(magit-make-margin-overlay nil t)))))
(defun magit-insert-remote-branches ()
"Insert sections showing all remote-tracking branches."
(dolist (remote (magit-list-remotes))
(magit-insert-section (remote remote)
(magit-insert-heading
(let ((pull (magit-get "remote" remote "url"))
(push (magit-get "remote" remote "pushurl")))
(format (propertize "Remote %s (%s):"
'font-lock-face 'magit-section-heading)
(propertize remote 'font-lock-face 'magit-branch-remote)
(concat pull (and pull push ", ") push))))
(let (head)
(dolist (line (magit-git-lines "for-each-ref" "--format=\
%(symref:short)%00%(refname:short)%00%(refname)%00%(subject)"
(concat "refs/remotes/" remote)
magit-buffer-arguments))
(pcase-let ((`(,head-branch ,branch ,ref ,msg)
(-replace "" nil (split-string line "\0"))))
(if head-branch
(progn (cl-assert (equal branch (concat remote "/HEAD")))
(setq head head-branch))
(when (magit-refs--insert-refname-p branch)
(magit-insert-section (branch branch t)
(let ((headp (equal branch head))
(abbrev (if magit-refs-show-remote-prefix
branch
(substring branch (1+ (length remote))))))
(magit-insert-heading
(magit-refs--format-focus-column branch)
(magit-refs--propertize-branch
abbrev ref (and headp 'magit-branch-remote-head))
(make-string (max 1 (- magit-refs-primary-column-width
(length abbrev)))
?\s)
(and msg (magit-log-propertize-keywords nil msg))))
(when (magit-buffer-margin-p)
(magit-refs--format-margin branch))
(magit-refs--insert-cherry-commits branch)))))))
(insert ?\n)
(magit-make-margin-overlay nil t))))
(defun magit-insert-local-branches ()
"Insert sections showing all local branches."
(magit-insert-section (local nil)
(magit-insert-heading "Branches:")
(dolist (line (magit-refs--format-local-branches))
(pcase-let ((`(,branch . ,strings) line))
(magit-insert-section
((eval (if branch 'branch 'commit))
(or branch (magit-rev-parse "HEAD"))
t)
(apply #'magit-insert-heading strings)
(when (magit-buffer-margin-p)
(magit-refs--format-margin branch))
(magit-refs--insert-cherry-commits branch))))
(insert ?\n)
(magit-make-margin-overlay nil t)))
(defun magit-refs--format-local-branches ()
(let ((lines (-keep 'magit-refs--format-local-branch
(magit-git-lines
"for-each-ref"
(concat "--format=\
%(HEAD)%00%(refname:short)%00%(refname)%00\
%(upstream:short)%00%(upstream)%00%(upstream:track)%00"
(if magit-refs-show-push-remote "\
%(push:remotename)%00%(push)%00%(push:track)%00%(subject)"
"%00%00%00%(subject)"))
"refs/heads"
magit-buffer-arguments))))
(unless (magit-get-current-branch)
(push (magit-refs--format-local-branch
(concat "*\0\0\0\0\0\0\0\0" (magit-rev-format "%s")))
lines))
(setq-local magit-refs-primary-column-width
(let ((def (default-value 'magit-refs-primary-column-width)))
(if (atom def)
def
(pcase-let ((`(,min . ,max) def))
(min max (apply #'max min (mapcar #'car lines)))))))
(mapcar (pcase-lambda (`(,_ ,branch ,focus ,branch-desc ,u:ahead ,p:ahead
,u:behind ,upstream ,p:behind ,push ,msg))
(list branch focus branch-desc u:ahead p:ahead
(make-string (max 1 (- magit-refs-primary-column-width
(length (concat branch-desc
u:ahead
p:ahead
u:behind))))
?\s)
u:behind upstream p:behind push
msg))
lines)))
(defun magit-refs--format-local-branch (line)
(pcase-let ((`(,head ,branch ,ref ,upstream ,u:ref ,u:track
,push ,p:ref ,p:track ,msg)
(-replace "" nil (split-string line "\0"))))
(when (or (not branch)
(magit-refs--insert-refname-p branch))
(let* ((headp (equal head "*"))
(pushp (and push
magit-refs-show-push-remote
(magit-rev-verify p:ref)
(not (equal p:ref u:ref))))
(branch-desc
(if branch
(magit-refs--propertize-branch
branch ref (and headp 'magit-branch-current))
(magit--propertize-face "(detached)"
'font-lock-warning-face)))
(u:ahead (and u:track
(string-match "ahead \\([0-9]+\\)" u:track)
(magit--propertize-face
(concat (and magit-refs-pad-commit-counts " ")
(match-string 1 u:track)
">")
'magit-dimmed)))
(u:behind (and u:track
(string-match "behind \\([0-9]+\\)" u:track)
(magit--propertize-face
(concat "<"
(match-string 1 u:track)
(and magit-refs-pad-commit-counts " "))
'magit-dimmed)))
(p:ahead (and pushp p:track
(string-match "ahead \\([0-9]+\\)" p:track)
(magit--propertize-face
(concat (match-string 1 p:track)
">"
(and magit-refs-pad-commit-counts " "))
'magit-branch-remote)))
(p:behind (and pushp p:track
(string-match "behind \\([0-9]+\\)" p:track)
(magit--propertize-face
(concat "<"
(match-string 1 p:track)
(and magit-refs-pad-commit-counts " "))
'magit-dimmed))))
(list (1+ (length (concat branch-desc u:ahead p:ahead u:behind)))
branch
(magit-refs--format-focus-column branch headp)
branch-desc u:ahead p:ahead u:behind
(and upstream
(concat (if (equal u:track "[gone]")
(magit--propertize-face upstream 'error)
(magit-refs--propertize-branch upstream u:ref))
" "))
(and pushp
(concat p:behind
(magit--propertize-face
push 'magit-branch-remote)
" "))
(and msg (magit-log-propertize-keywords nil msg)))))))
(defun magit-refs--format-focus-column (ref &optional type)
(let ((focus magit-buffer-upstream)
(width (if magit-refs-show-commit-count
magit-refs-focus-column-width
1)))
(format
(format "%%%ss " width)
(cond ((or (equal ref focus)
(and (eq type t)
(equal focus "HEAD")))
(magit--propertize-face (concat (if (equal focus "HEAD") "@" "*")
(make-string (1- width) ?\s))
'magit-section-heading))
((if (eq type 'tag)
(eq magit-refs-show-commit-count 'all)
magit-refs-show-commit-count)
(pcase-let ((`(,behind ,ahead)
(magit-rev-diff-count magit-buffer-upstream ref)))
(magit--propertize-face
(cond ((> ahead 0) (concat "<" (number-to-string ahead)))
((> behind 0) (concat (number-to-string behind) ">"))
(t "="))
'magit-dimmed)))
(t "")))))
(defun magit-refs--propertize-branch (branch ref &optional head-face)
(let ((face (cdr (cl-find-if (pcase-lambda (`(,re . ,_))
(string-match-p re ref))
magit-ref-namespaces))))
(magit--propertize-face
branch (if head-face (list face head-face) face))))
(defun magit-refs--insert-refname-p (refname)
(--if-let (-first (pcase-lambda (`(,key . ,_))
(if (functionp key)
(funcall key refname)
(string-match-p key refname)))
magit-refs-filter-alist)
(cdr it)
t))
(defun magit-refs--insert-cherry-commits (ref)
(magit-insert-section-body
(let ((start (point))
(magit-insert-section--current nil))
(magit-git-wash (apply-partially 'magit-log-wash-log 'cherry)
"cherry" "-v" (magit-abbrev-arg) magit-buffer-upstream ref)
(if (= (point) start)
(message "No cherries for %s" ref)
(magit-make-margin-overlay nil t)))))
(defun magit-refs--format-margin (commit)
(save-excursion
(goto-char (line-beginning-position 0))
(let ((line (magit-rev-format "%ct%cN" commit)))
(magit-log-format-margin commit
(substring line 10)
(substring line 0 10)))))
;;; _
(provide 'magit-refs)
;;; magit-refs.el ends here
|
