From: Dmitry Gutov <dgutov@yandex.ru>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 21383@debbugs.gnu.org, Jonathan H <pythonnut@gmail.com>
Subject: bug#21383: Static revisions in vc-working-revision
Date: Tue, 1 Sep 2015 05:11:22 +0300 [thread overview]
Message-ID: <55E5094A.3010108@yandex.ru> (raw)
In-Reply-To: <jwvio7ve4o4.fsf-monnier+emacsbugs@gnu.org>
On 08/31/2015 08:44 PM, Stefan Monnier wrote:
> So we need to change vc-git-mode-line-string to put the branch name
> in there. Doesn't seem particularly hard.
That sounds like a plan.
Any misgivings about this patch?
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 9522328..50c6d96 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -248,26 +248,30 @@ matching the resulting Git log output, and
KEYWORDS is a list of
(vc-git--state-code diff-letter)))
(if (vc-git--empty-db-p) 'added 'up-to-date))))
-(defun vc-git-working-revision (file)
+(defun vc-git-working-revision (_file)
"Git-specific version of `vc-working-revision'."
- (let* (process-file-side-effects
- (str (vc-git--run-command-string nil "symbolic-ref" "HEAD")))
- (vc-file-setprop file 'vc-git-detached (null str))
- (if str
- (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
- (match-string 2 str)
- str)
- (vc-git--rev-parse "HEAD"))))
+ (let (process-file-side-effects)
+ (vc-git--rev-parse "HEAD")))
+
+(defun vc-git--symbolic-ref (file)
+ (or
+ (vc-file-getprop file 'vc-git-symbolic-ref)
+ (let* (process-file-side-effects
+ (str (vc-git--run-command-string nil "symbolic-ref" "HEAD")))
+ (vc-file-setprop file 'vc-git-symbolic-ref
+ (if str
+ (if (string-match
"^\\(refs/heads/\\)?\\(.+\\)$" str)
+ (match-string 2 str)
+ str))))))
(defun vc-git-mode-line-string (file)
"Return a string for `vc-mode-line' to put in the mode line for FILE."
(let* ((rev (vc-working-revision file))
- (detached (vc-file-getprop file 'vc-git-detached))
+ (disp-rev (or (vc-git--symbolic-ref file)
+ (substring rev 0 7)))
(def-ml (vc-default-mode-line-string 'Git file))
(help-echo (get-text-property 0 'help-echo def-ml)))
- (propertize (if detached
- (substring def-ml 0 (- 7 (length rev)))
- def-ml)
+ (propertize (replace-regexp-in-string (concat rev "\\'") disp-rev
def-ml t t)
'help-echo (concat help-echo "\nCurrent revision: "
rev))))
(cl-defstruct (vc-git-extra-fileinfo
next prev parent reply other threads:[~2015-09-01 2:11 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-31 0:45 bug#21383: Static revisions in vc-working-revision Jonathan H
2015-08-31 4:45 ` Stefan Monnier
2015-08-31 8:47 ` Dmitry Gutov
2015-08-31 17:44 ` Stefan Monnier
2015-09-01 2:11 ` Dmitry Gutov [this message]
2015-09-01 3:55 ` Stefan Monnier
2015-09-01 12:05 ` Dmitry Gutov
2015-09-01 15:45 ` Stefan Monnier
2015-09-01 15:54 ` Dmitry Gutov
2015-09-01 16:52 ` Stefan Monnier
2015-09-01 17:23 ` Dmitry Gutov
2015-09-02 3:50 ` Stefan Monnier
2015-09-02 10:49 ` Dmitry Gutov
2015-09-02 22:44 ` Jonathan H
2015-09-03 12:56 ` Dmitry Gutov
2015-09-03 16:17 ` Stefan Monnier
2015-09-03 17:34 ` Jonathan H
2015-09-03 18:40 ` Dmitry Gutov
2015-09-03 20:07 ` Stefan Monnier
2015-09-03 22:32 ` Dmitry Gutov
2015-09-04 14:36 ` Stefan Monnier
2015-09-05 2:30 ` Dmitry Gutov
2015-09-03 16:04 ` Stefan Monnier
2015-09-03 19:24 ` Dmitry Gutov
2015-09-04 2:20 ` Stefan Monnier
2015-09-05 3:08 ` Dmitry Gutov
2015-09-05 15:12 ` Stefan Monnier
2015-09-05 20:30 ` Dmitry Gutov
2015-09-06 22:29 ` Stefan Monnier
2015-09-07 20:55 ` Using different default-directory and relative paths in VC, Was: Re: bug#21383 Dmitry Gutov
2015-09-07 22:33 ` Stefan Monnier
2015-09-07 23:29 ` Dmitry Gutov
2015-09-07 23:34 ` Dmitry Gutov
2015-09-08 1:31 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55E5094A.3010108@yandex.ru \
--to=dgutov@yandex.ru \
--cc=21383@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=pythonnut@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.