annotate lisp/vc-git.el @ 105637:a9352fba1fd2

(rcirc-authenticate): Simplify previous change.
author Glenn Morris <rgm@gnu.org>
date Fri, 16 Oct 2009 16:03:33 +0000
parents 1987d1800365
children 6f463ea7a91a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1 ;;; vc-git.el --- VC backend for the git version control system
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100723
diff changeset
3 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
4
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5 ;; Author: Alexandre Julliard <julliard@winehq.org>
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
6 ;; Keywords: tools
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
7
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
13 ;; (at your option) any later version.
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
14
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
18 ;; GNU General Public License for more details.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
19
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
22
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
23 ;;; Commentary:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25 ;; This file contains a VC backend for the git version control
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26 ;; system.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27 ;;
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
28
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
29 ;;; Installation:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
30
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
31 ;; To install: put this file on the load-path and add Git to the list
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
32 ;; of supported backends in `vc-handled-backends'; the following line,
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
33 ;; placed in your ~/.emacs, will accomplish this:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
34 ;;
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
35 ;; (add-to-list 'vc-handled-backends 'Git)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
36
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
37 ;;; Todo:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
38 ;; - check if more functions could use vc-git-command instead
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
39 ;; of start-process.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
40 ;; - changelog generation
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
41
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
42 ;; Implement the rest of the vc interface. See the comment at the
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
43 ;; beginning of vc.el. The current status is:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
44 ;; ("??" means: "figure out what to do about it")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
45 ;;
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
46 ;; FUNCTION NAME STATUS
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
47 ;; BACKEND PROPERTIES
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
48 ;; * revision-granularity OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
49 ;; STATE-QUERYING FUNCTIONS
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
50 ;; * registered (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
51 ;; * state (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
52 ;; - state-heuristic (file) NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
53 ;; * working-revision (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
54 ;; - latest-on-branch-p (file) NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
55 ;; * checkout-model (files) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
56 ;; - workfile-unchanged-p (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
57 ;; - mode-line-string (file) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
58 ;; STATE-CHANGING FUNCTIONS
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
59 ;; * create-repo () OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
60 ;; * register (files &optional rev comment) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
61 ;; - init-revision (file) NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
62 ;; - responsible-p (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
63 ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
64 ;; - receive-file (file rev) NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
65 ;; - unregister (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
66 ;; * checkin (files rev comment) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
67 ;; * find-revision (file rev buffer) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
68 ;; * checkout (file &optional editable rev) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
69 ;; * revert (file &optional contents-done) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
70 ;; - rollback (files) COULD BE SUPPORTED
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
71 ;; - merge (file rev1 rev2) It would be possible to merge
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
72 ;; changes into a single file, but when
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
73 ;; committing they wouldn't
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
74 ;; be identified as a merge
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
75 ;; by git, so it's probably
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
76 ;; not a good idea.
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
77 ;; - merge-news (file) see `merge'
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
78 ;; - steal-lock (file &optional revision) NOT NEEDED
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
79 ;; HISTORY FUNCTIONS
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
80 ;; * print-log (files &optional buffer shortlog) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
81 ;; - log-view-mode () OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
82 ;; - show-log-entry (revision) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
83 ;; - comment-history (file) ??
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
84 ;; - update-changelog (files) COULD BE SUPPORTED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
85 ;; * diff (file &optional rev1 rev2 buffer) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
86 ;; - revision-completion-table (files) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
87 ;; - annotate-command (file buf &optional rev) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
88 ;; - annotate-time () OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
89 ;; - annotate-current-time () NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
90 ;; - annotate-extract-revision-at-line () OK
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
91 ;; TAG SYSTEM
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
92 ;; - create-tag (dir name branchp) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
93 ;; - retrieve-tag (dir name update) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
94 ;; MISCELLANEOUS
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
95 ;; - make-version-backups-p (file) NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
96 ;; - repository-hostname (dirname) NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
97 ;; - previous-revision (file rev) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
98 ;; - next-revision (file rev) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
99 ;; - check-headers () COULD BE SUPPORTED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
100 ;; - clear-headers () NOT NEEDED
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
101 ;; - delete-file (file) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
102 ;; - rename-file (old new) OK
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
103 ;; - find-file-hook () NOT NEEDED
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
104
94290
55b13d307a7a (vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94107
diff changeset
105 (eval-when-compile
55b13d307a7a (vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94107
diff changeset
106 (require 'cl)
55b13d307a7a (vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94107
diff changeset
107 (require 'vc)
96260
d011b21b3f08 * vc-hg.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96213
diff changeset
108 (require 'vc-dir)
94290
55b13d307a7a (vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94107
diff changeset
109 (require 'grep))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
110
99932
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
111 (defcustom vc-git-diff-switches t
100179
7dffc98adf8f (vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100056
diff changeset
112 "String or list of strings specifying switches for Git diff under VC.
7dffc98adf8f (vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100056
diff changeset
113 If nil, use the value of `vc-diff-switches'. If t, use no switches."
99932
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
114 :type '(choice (const :tag "Unspecified" nil)
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
115 (const :tag "None" t)
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
116 (string :tag "Argument String")
100179
7dffc98adf8f (vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100056
diff changeset
117 (repeat :tag "Argument List" :value ("") string))
99932
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
118 :version "23.1"
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
119 :group 'vc)
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
120
104039
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
121 (defcustom vc-git-add-signoff nil
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
122 "Add a Signed-off-by line when committing."
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
123 :type 'boolean
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
124 :version "23.2"
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
125 :group 'vc)
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
126
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
127
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
128 (defvar git-commits-coding-system 'utf-8
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
129 "Default coding system for git commits.")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
130
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
131 ;;; BACKEND PROPERTIES
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
132
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94539
diff changeset
133 (defun vc-git-revision-granularity () 'repository)
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94539
diff changeset
134 (defun vc-git-checkout-model (files) 'implicit)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
135
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
136 ;;; STATE-QUERYING FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
137
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
138 ;;;###autoload (defun vc-git-registered (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
139 ;;;###autoload "Return non-nil if FILE is registered with git."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
140 ;;;###autoload (if (vc-find-root file ".git") ; short cut
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
141 ;;;###autoload (progn
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
142 ;;;###autoload (load "vc-git")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
143 ;;;###autoload (vc-git-registered file))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
144
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
145 (defun vc-git-registered (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
146 "Check whether FILE is registered with git."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
147 (when (vc-git-root file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148 (with-temp-buffer
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
149 (let* (process-file-side-effects
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
150 (dir (file-name-directory file))
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
151 (name (file-relative-name file dir))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
152 (str (ignore-errors
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
153 (when dir (cd dir))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
154 (vc-git--out-ok "ls-files" "-c" "-z" "--" name)
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
155 ;; if result is empty, use ls-tree to check for deleted file
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
156 (when (eq (point-min) (point-max))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
157 (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" "--" name))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
158 (buffer-string))))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
159 (and str
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
160 (> (length str) (length name))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
161 (string= (substring str 0 (1+ (length name)))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
162 (concat name "\0")))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
163
93173
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
164 (defun vc-git--state-code (code)
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
165 "Convert from a string to a added/deleted/modified state."
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
166 (case (string-to-char code)
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
167 (?M 'edited)
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
168 (?A 'added)
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
169 (?D 'removed)
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
170 (?U 'edited) ;; FIXME
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
171 (?T 'edited))) ;; FIXME
019e6794fecf (vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93146
diff changeset
172
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
173 (defun vc-git-state (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
174 "Git-specific version of `vc-state'."
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
175 ;; FIXME: This can't set 'ignored yet
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
176 (if (not (vc-git-registered file))
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
177 'unregistered
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
178 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file))
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
179 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
180 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0"
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
181 diff))
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
182 (vc-git--state-code (match-string 1 diff))
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
183 (if (vc-git--empty-db-p) 'added 'up-to-date)))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
184
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
185 (defun vc-git-working-revision (file)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
186 "Git-specific version of `vc-working-revision'."
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
187 (let* (process-file-side-effects
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
188 (str (with-output-to-string
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
189 (with-current-buffer standard-output
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
190 (vc-git--out-ok "symbolic-ref" "HEAD")))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
191 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
192 (match-string 2 str)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
193 str)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
194
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
195 (defun vc-git-workfile-unchanged-p (file)
78687
429a17d4958d * vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78404
diff changeset
196 (eq 'up-to-date (vc-git-state file)))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
197
82843
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
198 (defun vc-git-mode-line-string (file)
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
199 "Return string for placement into the modeline for FILE."
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
200 (let* ((branch (vc-git-working-revision file))
82843
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
201 (def-ml (vc-default-mode-line-string 'Git file))
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
202 (help-echo (get-text-property 0 'help-echo def-ml)))
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
203 (if (zerop (length branch))
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
204 (propertize
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
205 (concat def-ml "!")
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
206 'help-echo (concat help-echo "\nNo current branch (detached HEAD)"))
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
207 (propertize def-ml
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
208 'help-echo (concat help-echo "\nCurrent branch: " branch)))))
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
209
93426
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
210 (defstruct (vc-git-extra-fileinfo
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
211 (:copier nil)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
212 (:constructor vc-git-create-extra-fileinfo (old-perm new-perm &optional rename-state orig-name))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
213 (:conc-name vc-git-extra-fileinfo->))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
214 old-perm new-perm ;; permission flags
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
215 rename-state ;; rename or copy state
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
216 orig-name) ;; original name for renames or copies
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
217
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
218 (defun vc-git-escape-file-name (name)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
219 "Escape a file name if necessary."
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
220 (if (string-match "[\n\t\"\\]" name)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
221 (concat "\""
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
222 (mapconcat (lambda (c)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
223 (case c
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
224 (?\n "\\n")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
225 (?\t "\\t")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
226 (?\\ "\\\\")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
227 (?\" "\\\"")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
228 (t (char-to-string c))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
229 name "")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
230 "\"")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
231 name))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
232
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
233 (defun vc-git-file-type-as-string (old-perm new-perm)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
234 "Return a string describing the file type based on its permissions."
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
235 (let* ((old-type (lsh (or old-perm 0) -9))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
236 (new-type (lsh (or new-perm 0) -9))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
237 (str (case new-type
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
238 (?\100 ;; file
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
239 (case old-type
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
240 (?\100 nil)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
241 (?\120 " (type change symlink -> file)")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
242 (?\160 " (type change subproject -> file)")))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
243 (?\120 ;; symlink
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
244 (case old-type
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
245 (?\100 " (type change file -> symlink)")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
246 (?\160 " (type change subproject -> symlink)")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
247 (t " (symlink)")))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
248 (?\160 ;; subproject
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
249 (case old-type
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
250 (?\100 " (type change file -> subproject)")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
251 (?\120 " (type change symlink -> subproject)")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
252 (t " (subproject)")))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
253 (?\110 nil) ;; directory (internal, not a real git state)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
254 (?\000 ;; deleted or unknown
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
255 (case old-type
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
256 (?\120 " (symlink)")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
257 (?\160 " (subproject)")))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
258 (t (format " (unknown type %o)" new-type)))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
259 (cond (str (propertize str 'face 'font-lock-comment-face))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
260 ((eq new-type ?\110) "/")
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
261 (t ""))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
262
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
263 (defun vc-git-rename-as-string (state extra)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
264 "Return a string describing the copy or rename associated with INFO, or an empty string if none."
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
265 (let ((rename-state (when extra
93426
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
266 (vc-git-extra-fileinfo->rename-state extra))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
267 (if rename-state
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
268 (propertize
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
269 (concat " ("
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
270 (if (eq rename-state 'copy) "copied from "
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
271 (if (eq state 'added) "renamed from "
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
272 "renamed to "))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
273 (vc-git-escape-file-name (vc-git-extra-fileinfo->orig-name extra))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
274 ")") 'face 'font-lock-comment-face)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
275 "")))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
276
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
277 (defun vc-git-permissions-as-string (old-perm new-perm)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
278 "Format a permission change as string."
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
279 (propertize
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
280 (if (or (not old-perm)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
281 (not new-perm)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
282 (eq 0 (logand ?\111 (logxor old-perm new-perm))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
283 " "
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
284 (if (eq 0 (logand ?\111 old-perm)) "+x" "-x"))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
285 'face 'font-lock-type-face))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
286
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98701
diff changeset
287 (defun vc-git-dir-printer (info)
94107
5d2bbe3fd618 Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94060
diff changeset
288 "Pretty-printer for the vc-dir-fileinfo structure."
96881
44c60e2cb9ef (vc-git-status-printer): Update the directory display
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96540
diff changeset
289 (let* ((isdir (vc-dir-fileinfo->directory info))
44c60e2cb9ef (vc-git-status-printer): Update the directory display
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96540
diff changeset
290 (state (if isdir "" (vc-dir-fileinfo->state info)))
94107
5d2bbe3fd618 Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94060
diff changeset
291 (extra (vc-dir-fileinfo->extra info))
93426
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
292 (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra)))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
293 (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
294 (insert
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
295 " "
94107
5d2bbe3fd618 Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94060
diff changeset
296 (propertize (format "%c" (if (vc-dir-fileinfo->marked info) ?* ? ))
93426
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
297 'face 'font-lock-type-face)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
298 " "
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
299 (propertize
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
300 (format "%-12s" state)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
301 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
302 ((eq state 'missing) 'font-lock-warning-face)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
303 (t 'font-lock-variable-name-face))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
304 'mouse-face 'highlight)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
305 " " (vc-git-permissions-as-string old-perm new-perm)
100723
bca91c325d5c (vc-git-dir-printer): Fix filename column.
Andreas Schwab <schwab@suse.de>
parents: 100179
diff changeset
306 " "
94107
5d2bbe3fd618 Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94060
diff changeset
307 (propertize (vc-git-escape-file-name (vc-dir-fileinfo->name info))
97108
086f5c9fa0be (vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96881
diff changeset
308 'face (if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face)
086f5c9fa0be (vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96881
diff changeset
309 'help-echo
086f5c9fa0be (vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96881
diff changeset
310 (if isdir
086f5c9fa0be (vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96881
diff changeset
311 "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
086f5c9fa0be (vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96881
diff changeset
312 "File\nmouse-3: Pop-up menu")
101940
dea4466580a6 * vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
313 'keymap vc-dir-filename-mouse-map
97108
086f5c9fa0be (vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96881
diff changeset
314 'mouse-face 'highlight)
93426
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
315 (vc-git-file-type-as-string old-perm new-perm)
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
316 (vc-git-rename-as-string state extra))))
912e50ecb992 * vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
317
94060
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
318 (defun vc-git-after-dir-status-stage (stage files update-function)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
319 "Process sentinel for the various dir-status stages."
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
320 (let (remaining next-stage result)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
321 (goto-char (point-min))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
322 (case stage
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
323 ('update-index
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
324 (setq next-stage (if (vc-git--empty-db-p) 'ls-files-added
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
325 (if files 'ls-files-up-to-date 'diff-index))))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
326 ('ls-files-added
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
327 (setq next-stage 'ls-files-unknown)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
328 (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
329 (let ((new-perm (string-to-number (match-string 1) 8))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
330 (name (match-string 2)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
331 (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm)) result))))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
332 ('ls-files-up-to-date
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
333 (setq next-stage 'diff-index)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
334 (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
335 (let ((perm (string-to-number (match-string 1) 8))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
336 (name (match-string 2)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
337 (push (list name 'up-to-date (vc-git-create-extra-fileinfo perm perm)) result))))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
338 ('ls-files-unknown
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
339 (when files (setq next-stage 'ls-files-ignored))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
340 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
341 (push (list (match-string 1) 'unregistered (vc-git-create-extra-fileinfo 0 0)) result)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
342 ('ls-files-ignored
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
343 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
344 (push (list (match-string 1) 'ignored (vc-git-create-extra-fileinfo 0 0)) result)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
345 ('diff-index
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
346 (setq next-stage 'ls-files-unknown)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
347 (while (re-search-forward
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
348 ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMUT]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
349 nil t 1)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
350 (let ((old-perm (string-to-number (match-string 1) 8))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
351 (new-perm (string-to-number (match-string 2) 8))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
352 (state (or (match-string 4) (match-string 6)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
353 (name (or (match-string 5) (match-string 7)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
354 (new-name (match-string 8)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
355 (if new-name ; copy or rename
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
356 (if (eq ?C (string-to-char state))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
357 (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'copy name)) result)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
358 (push (list name 'removed (vc-git-create-extra-fileinfo 0 0 'rename new-name)) result)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
359 (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'rename name)) result))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
360 (push (list name (vc-git--state-code state) (vc-git-create-extra-fileinfo old-perm new-perm)) result))))))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
361 (when result
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
362 (setq result (nreverse result))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
363 (when files
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
364 (dolist (entry result) (setq files (delete (car entry) files)))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
365 (unless files (setq next-stage nil))))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
366 (when (or result (not next-stage)) (funcall update-function result next-stage))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
367 (when next-stage (vc-git-dir-status-goto-stage next-stage files update-function))))
93123
38f18130d057 (vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93122
diff changeset
368
94060
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
369 (defun vc-git-dir-status-goto-stage (stage files update-function)
93123
38f18130d057 (vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93122
diff changeset
370 (erase-buffer)
94060
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
371 (case stage
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
372 ('update-index
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
373 (if files
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
374 (vc-git-command (current-buffer) 'async files "add" "--refresh" "--")
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
375 (vc-git-command (current-buffer) 'async nil "update-index" "--refresh")))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
376 ('ls-files-added
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
377 (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-c" "-s" "--"))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
378 ('ls-files-up-to-date
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
379 (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-c" "-s" "--"))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
380 ('ls-files-unknown
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
381 (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o"
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
382 "--directory" "--no-empty-directory" "--exclude-standard" "--"))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
383 ('ls-files-ignored
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
384 (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i"
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
385 "--directory" "--no-empty-directory" "--exclude-standard" "--"))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
386 ('diff-index
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
387 (vc-git-command (current-buffer) 'async files "diff-index" "-z" "-M" "HEAD" "--")))
93123
38f18130d057 (vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93122
diff changeset
388 (vc-exec-after
94060
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
389 `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function))))
93146
c73e70274c0c (vc-git--empty-db-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93145
diff changeset
390
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93426
diff changeset
391 (defun vc-git-dir-status (dir update-function)
94060
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
392 "Return a list of (FILE STATE EXTRA) entries for DIR."
93122
ab6a0ec29e00 (vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93118
diff changeset
393 ;; Further things that would have to be fixed later:
ab6a0ec29e00 (vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93118
diff changeset
394 ;; - how to handle unregistered directories
94107
5d2bbe3fd618 Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94060
diff changeset
395 ;; - how to support vc-dir on a subdir of the project tree
94060
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
396 (vc-git-dir-status-goto-stage 'update-index nil update-function))
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
397
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
398 (defun vc-git-dir-status-files (dir files default-state update-function)
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
399 "Return a list of (FILE STATE EXTRA) entries for FILES in DIR."
6c138603231c (vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents: 94003
diff changeset
400 (vc-git-dir-status-goto-stage 'update-index files update-function))
91929
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
401
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98701
diff changeset
402 (defun vc-git-dir-extra-headers (dir)
93333
53eee5c271f4 * vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93240
diff changeset
403 (let ((str (with-output-to-string
53eee5c271f4 * vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93240
diff changeset
404 (with-current-buffer standard-output
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
405 (vc-git--out-ok "symbolic-ref" "HEAD"))))
105017
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
406 (stash (vc-git-stash-list))
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
407 branch remote remote-url)
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
408 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
409 (progn
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
410 (setq branch (match-string 2 str))
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
411 (setq remote
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
412 (with-output-to-string
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
413 (with-current-buffer standard-output
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
414 (vc-git--out-ok "config" (concat "branch." branch ".remote")))))
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
415 (when (string-match "\\([^\n]+\\)" remote)
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
416 (setq remote (match-string 1 remote)))
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
417 (when remote
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
418 (setq remote-url
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
419 (with-output-to-string
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
420 (with-current-buffer standard-output
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
421 (vc-git--out-ok "config" (concat "remote." remote ".url"))))))
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
422 (when (string-match "\\([^\n]+\\)" remote-url)
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
423 (setq remote-url (match-string 1 remote-url))))
105593
1987d1800365 (vc-git-dir-extra-headers): Set the branch name
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105129
diff changeset
424 (setq branch "not (detached HEAD)"))
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
425 ;; FIXME: maybe use a different face when nothing is stashed.
93333
53eee5c271f4 * vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93240
diff changeset
426 (concat
53eee5c271f4 * vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93240
diff changeset
427 (propertize "Branch : " 'face 'font-lock-type-face)
105017
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
428 (propertize branch
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
429 'face 'font-lock-variable-name-face)
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
430 (when remote
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
431 (concat
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
432 "\n"
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
433 (propertize "Remote : " 'face 'font-lock-type-face)
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
434 (propertize remote-url
bfda253c8f66 (vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
435 'face 'font-lock-variable-name-face)))
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
436 "\n"
105129
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
437 (if stash
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
438 (concat
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
439 (propertize "Stash :\n" 'face 'font-lock-type-face)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
440 (mapconcat
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
441 (lambda (x)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
442 (propertize x
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
443 'face 'font-lock-variable-name-face
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
444 'mouse-face 'highlight
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
445 'keymap vc-git-stash-map))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
446 stash "\n"))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
447 (concat
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
448 (propertize "Stash : " 'face 'font-lock-type-face)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
449 (propertize "Nothing stashed"
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
450 'face 'font-lock-variable-name-face))))))
93333
53eee5c271f4 * vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93240
diff changeset
451
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
452 ;;; STATE-CHANGING FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
453
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
454 (defun vc-git-create-repo ()
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
455 "Create a new Git repository."
78687
429a17d4958d * vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78404
diff changeset
456 (vc-git-command nil 0 nil "init"))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
457
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
458 (defun vc-git-register (files &optional rev comment)
104616
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
459 "Register FILES into the git version-control system."
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
460 (let (flist dlist)
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
461 (dolist (crt files)
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
462 (if (file-directory-p crt)
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
463 (push crt dlist)
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
464 (push crt flist)))
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
465 (when flist
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
466 (vc-git-command nil 0 flist "update-index" "--add" "--"))
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
467 (when dlist
2d38fd635554 (vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104598
diff changeset
468 (vc-git-command nil 0 dlist "add"))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
469
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
470 (defalias 'vc-git-responsible-p 'vc-git-root)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
471
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
472 (defun vc-git-unregister (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
473 (vc-git-command nil 0 file "rm" "-f" "--cached" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
474
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
475
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
476 (defun vc-git-checkin (files rev comment)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
477 (let ((coding-system-for-write git-commits-coding-system))
104039
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
478 (vc-git-command nil 0 files "commit"
104094
67098a669a4c (vc-git-checkin): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104043
diff changeset
479 (if vc-git-add-signoff "-s") "-m" comment "--only" "--")))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
480
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
481 (defun vc-git-find-revision (file rev buffer)
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
482 (let* (process-file-side-effects
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
483 (coding-system-for-read 'binary)
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
484 (coding-system-for-write 'binary)
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
485 (fullname (substring
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
486 (vc-git--run-command-string
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
487 file "ls-files" "-z" "--full-name" "--")
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
488 0 -1)))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
489 (vc-git-command
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
490 buffer 0
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
491 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
492
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
493 (defun vc-git-checkout (file &optional editable rev)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
494 (vc-git-command nil 0 file "checkout" (or rev "HEAD")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
495
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
496 (defun vc-git-revert (file &optional contents-done)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
497 "Revert FILE to the version stored in the git repository."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
498 (if contents-done
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
499 (vc-git-command nil 0 file "update-index" "--")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
500 (vc-git-command nil 0 file "checkout" "HEAD")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
501
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
502 ;;; HISTORY FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
503
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
504 (defun vc-git-print-log (files &optional buffer shortlog)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
505 "Get change log associated with FILES."
105593
1987d1800365 (vc-git-dir-extra-headers): Set the branch name
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105129
diff changeset
506 (let ((coding-system-for-read git-commits-coding-system))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
507 ;; `vc-do-command' creates the buffer, but we need it before running
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
508 ;; the command.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
509 (vc-setup-buffer buffer)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
510 ;; If the buffer exists from a previous invocation it might be
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
511 ;; read-only.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
512 (let ((inhibit-read-only t))
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
513 (with-current-buffer
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
514 buffer
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
515 (if shortlog
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
516 (vc-git-command buffer 'async files
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
517 "log" ;; "--graph"
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
518 "--date=short" "--pretty=format:%h %ad %s" "--abbrev-commit"
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
519 "--")
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
520 (vc-git-command buffer 'async files
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
521 "rev-list" ;; "--graph"
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
522 "--pretty" "HEAD" "--"))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
523
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
524 (defvar log-view-message-re)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
525 (defvar log-view-file-re)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
526 (defvar log-view-font-lock-keywords)
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
527 (defvar log-view-per-file-logs)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
528
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
529 ;; Dynamically bound.
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
530 (defvar vc-short-log)
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
531
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
532 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
533 (require 'add-log) ;; we need the faces add-log
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
534 ;; Don't have file markers, so use impossible regexp.
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
535 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
536 (set (make-local-variable 'log-view-per-file-logs) nil)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
537 (set (make-local-variable 'log-view-message-re)
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
538 (if vc-short-log
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
539 "^\\(?:[*/\\| ]+ \\)?\\([0-9a-z]+\\) \\([-a-z0-9]+\\) \\(.*\\)"
105040
f43dfae3e132 (vc-git-log-view-mode): Undo inadvertent change.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105017
diff changeset
540 "^commit *\\([0-9a-z]+\\)"))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
541 (set (make-local-variable 'log-view-font-lock-keywords)
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
542 (if vc-short-log
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
543 (append
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
544 `((,log-view-message-re
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
545 (1 'change-log-acknowledgement)
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
546 (2 'change-log-date))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
547 (append
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
548 `((,log-view-message-re (1 'change-log-acknowledgement)))
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
549 ;; Handle the case:
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
550 ;; user: foo@bar
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
551 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
552 (1 'change-log-email))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
553 ;; Handle the case:
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
554 ;; user: FirstName LastName <foo@bar>
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
555 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
556 (1 'change-log-name)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
557 (2 'change-log-email))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
558 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
559 (1 'change-log-name))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
560 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
561 (1 'change-log-name)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
562 (2 'change-log-email))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
563 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
564 (1 'change-log-acknowledgement)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
565 (2 'change-log-acknowledgement))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
566 ("^Date: \\(.+\\)" (1 'change-log-date))
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
567 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
568
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
569
86397
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
570 (defun vc-git-show-log-entry (revision)
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
571 "Move to the log entry for REVISION.
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
572 REVISION may have the form BRANCH, BRANCH~N,
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
573 or BRANCH^ (where \"^\" can be repeated)."
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
574 (goto-char (point-min))
98220
962e4709829b * vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97108
diff changeset
575 (when revision
98701
5970e7c70c96 * vc-git.el (vc-git-show-log-entry): Include the revision in the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98220
diff changeset
576 (search-forward (format "\ncommit %s" revision) nil t
98220
962e4709829b * vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97108
diff changeset
577 (cond ((string-match "~\\([0-9]\\)$" revision)
962e4709829b * vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97108
diff changeset
578 (1+ (string-to-number (match-string 1 revision))))
962e4709829b * vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97108
diff changeset
579 ((string-match "\\^+$" revision)
962e4709829b * vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97108
diff changeset
580 (1+ (length (match-string 0 revision))))
962e4709829b * vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97108
diff changeset
581 (t nil))))
86397
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
582 (beginning-of-line))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
583
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
584 (defun vc-git-diff (files &optional rev1 rev2 buffer)
99932
36e205658d72 (vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
585 "Get a difference report using Git between two revisions of FILES."
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
586 (let (process-file-side-effects)
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
587 (apply #'vc-git-command (or buffer "*vc-diff*") 1 files
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
588 (if (and rev1 rev2) "diff-tree" "diff-index")
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
589 "--exit-code"
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
590 (append (vc-switches 'git 'diff)
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
591 (list "-p" (or rev1 "HEAD") rev2 "--")))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
592
85459
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
593 (defun vc-git-revision-table (files)
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
594 ;; What about `files'?!? --Stef
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
595 (let (process-file-side-effects
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
596 (table (list "HEAD")))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
597 (with-temp-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
598 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
599 (goto-char (point-min))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
600 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
601 (push (match-string 2) table)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
602 table))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
603
85459
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
604 (defun vc-git-revision-completion-table (files)
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
605 (lexical-let ((files files)
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78356
diff changeset
606 table)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78356
diff changeset
607 (setq table (lazy-completion-table
85459
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
608 table (lambda () (vc-git-revision-table files))))
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78356
diff changeset
609 table))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
610
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
611 (defun vc-git-annotate-command (file buf &optional rev)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
612 (let ((name (file-relative-name file)))
104871
7aab0a4e4fcd (vc-git-annotate-command): Use separator to parse
Nick Roberts <nickrob@snap.net.nz>
parents: 104617
diff changeset
613 (vc-git-command buf 'async name "blame" "--date=iso" rev "--")))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
614
96213
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95020
diff changeset
615 (declare-function vc-annotate-convert-time "vc-annotate" (time))
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95020
diff changeset
616
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
617 (defun vc-git-annotate-time ()
86422
68e2cdfcf931 (vc-git-annotate-time): Handle optional field FILENAME.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86403
diff changeset
618 (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
619 (vc-annotate-convert-time
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
620 (apply #'encode-time (mapcar (lambda (match)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
621 (string-to-number (match-string match)))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
622 '(6 5 4 3 2 1 7))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
623
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
624 (defun vc-git-annotate-extract-revision-at-line ()
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
625 (save-excursion
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
626 (move-beginning-of-line 1)
93145
9a34bf3a4363 (vc-git-annotate-extract-revision-at-line):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
627 (and (looking-at "[0-9a-f^][0-9a-f]+")
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
628 (buffer-substring-no-properties (match-beginning 0) (match-end 0)))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
629
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
630 ;;; TAG SYSTEM
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
631
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
632 (defun vc-git-create-tag (dir name branchp)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
633 (let ((default-directory dir))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
634 (and (vc-git-command nil 0 nil "update-index" "--refresh")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
635 (if branchp
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
636 (vc-git-command nil 0 nil "checkout" "-b" name)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
637 (vc-git-command nil 0 nil "tag" name)))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
638
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
639 (defun vc-git-retrieve-tag (dir name update)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
640 (let ((default-directory dir))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
641 (vc-git-command nil 0 nil "checkout" name)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
642 ;; FIXME: update buffers if `update' is true
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
643 ))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
644
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
645
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
646 ;;; MISCELLANEOUS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
647
85141
b16f7408cd3f Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85139
diff changeset
648 (defun vc-git-previous-revision (file rev)
b16f7408cd3f Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85139
diff changeset
649 "Git-specific version of `vc-previous-revision'."
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
650 (if file
102536
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
651 (let* ((default-directory (file-name-directory (expand-file-name file)))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
652 (file (file-name-nondirectory file))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
653 (prev-rev (with-temp-buffer
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
654 (and
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
655 (vc-git--out-ok "rev-list" "-2" rev "--" file)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
656 (goto-char (point-max))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
657 (bolp)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
658 (zerop (forward-line -1))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
659 (not (bobp))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
660 (buffer-substring-no-properties
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
661 (point)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
662 (1- (point-max)))))))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
663 (or (vc-git-symbolic-commit prev-rev) prev-rev))
96524
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
664 (with-temp-buffer
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
665 (and
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
666 (vc-git--out-ok "rev-parse" (concat rev "^"))
d620ef3acfdc * vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents: 96487
diff changeset
667 (buffer-substring-no-properties (point-min) (+ (point-min) 40))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
668
85141
b16f7408cd3f Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85139
diff changeset
669 (defun vc-git-next-revision (file rev)
b16f7408cd3f Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85139
diff changeset
670 "Git-specific version of `vc-next-revision'."
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
671 (let* ((default-directory (file-name-directory
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
672 (expand-file-name file)))
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
673 (file (file-name-nondirectory file))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
674 (current-rev
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
675 (with-temp-buffer
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
676 (and
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
677 (vc-git--out-ok "rev-list" "-1" rev "--" file)
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
678 (goto-char (point-max))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
679 (bolp)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
680 (zerop (forward-line -1))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
681 (bobp)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
682 (buffer-substring-no-properties
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
683 (point)
102536
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
684 (1- (point-max))))))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
685 (next-rev
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
686 (and current-rev
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
687 (with-temp-buffer
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
688 (and
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
689 (vc-git--out-ok "rev-list" "HEAD" "--" file)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
690 (goto-char (point-min))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
691 (search-forward current-rev nil t)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
692 (zerop (forward-line -1))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
693 (buffer-substring-no-properties
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
694 (point)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
695 (progn (forward-line 1) (1- (point)))))))))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
696 (or (vc-git-symbolic-commit next-rev) next-rev)))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
697
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
698 (defun vc-git-delete-file (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
699 (vc-git-command nil 0 file "rm" "-f" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
700
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
701 (defun vc-git-rename-file (old new)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
702 (vc-git-command nil 0 (list old new) "mv" "-f" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
703
93240
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
704 (defvar vc-git-extra-menu-map
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
705 (let ((map (make-sparse-keymap)))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
706 (define-key map [git-grep]
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
707 '(menu-item "Git grep..." vc-git-grep
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
708 :help "Run the `git grep' command"))
104617
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
709 (define-key map [git-st]
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
710 '(menu-item "Stash..." vc-git-stash
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
711 :help "Stash away changes"))
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
712 (define-key map [git-ss]
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
713 '(menu-item "Show Stash..." vc-git-stash-show
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
714 :help "Show stash contents"))
104039
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
715 (define-key map [git-sig]
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
716 '(menu-item "Add Signed-off-by on commit" vc-git-toggle-signoff
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
717 :help "Add Add Signed-off-by when commiting (i.e. add the -s flag)"
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
718 :button (:toggle . vc-git-add-signoff)))
93240
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
719 map))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
720
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
721 (defun vc-git-extra-menu () vc-git-extra-menu-map)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
722
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
723 (defun vc-git-extra-status-menu () vc-git-extra-menu-map)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
724
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
725 (defun vc-git-root (file)
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
726 (vc-find-root file ".git"))
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104871
diff changeset
727
104039
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
728 (defun vc-git-toggle-signoff ()
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
729 (interactive)
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
730 (setq vc-git-add-signoff (not vc-git-add-signoff)))
1416a5bb9353 (vc-git-add-signoff): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103596
diff changeset
731
93240
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
732 ;; Derived from `lgrep'.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
733 (defun vc-git-grep (regexp &optional files dir)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
734 "Run git grep, searching for REGEXP in FILES in directory DIR.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
735 The search is limited to file names matching shell pattern FILES.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
736 FILES may use abbreviations defined in `grep-files-aliases', e.g.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
737 entering `ch' is equivalent to `*.[ch]'.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
738
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
739 With \\[universal-argument] prefix, you can edit the constructed shell command line
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
740 before it is executed.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
741 With two \\[universal-argument] prefixes, directly edit and run `grep-command'.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
742
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
743 Collect output in a buffer. While git grep runs asynchronously, you
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
744 can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
745 in the grep output buffer,
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
746 to go to the lines where grep found matches.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
747
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
748 This command shares argument histories with \\[rgrep] and \\[grep]."
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
749 (interactive
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
750 (progn
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
751 (grep-compute-defaults)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
752 (cond
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
753 ((equal current-prefix-arg '(16))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
754 (list (read-from-minibuffer "Run: " "git grep"
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
755 nil nil 'grep-history)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
756 nil))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
757 (t (let* ((regexp (grep-read-regexp))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
758 (files (grep-read-files regexp))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
759 (dir (read-directory-name "In directory: "
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
760 nil default-directory t)))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
761 (list regexp files dir))))))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
762 (require 'grep)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
763 (when (and (stringp regexp) (> (length regexp) 0))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
764 (let ((command regexp))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
765 (if (null files)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
766 (if (string= command "git grep")
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
767 (setq command nil))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
768 (setq dir (file-name-as-directory (expand-file-name dir)))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
769 (setq command
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
770 (grep-expand-template "git grep -n -e <R> -- <F>" regexp files))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
771 (when command
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
772 (if (equal current-prefix-arg '(4))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
773 (setq command
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
774 (read-from-minibuffer "Confirm: "
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
775 command nil nil 'grep-history))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
776 (add-to-history 'grep-history command))))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
777 (when command
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
778 (let ((default-directory dir)
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
779 (compilation-environment '("PAGER=")))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
780 ;; Setting process-setup-function makes exit-message-function work
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
781 ;; even when async processes aren't supported.
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
782 (compilation-start command 'grep-mode))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
783 (if (eq next-error-last-buffer (current-buffer))
231f72336aed (vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93173
diff changeset
784 (setq default-directory dir))))))
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
785
104617
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
786 (defun vc-git-stash (name)
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
787 "Create a stash."
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
788 (interactive "sStash name: ")
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
789 (let ((root (vc-git-root default-directory)))
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
790 (when root
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
791 (vc-git--call nil "stash" "save" name)
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
792 (vc-resynch-buffer root t t))))
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
793
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
794 (defun vc-git-stash-show (name)
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
795 "Show the contents of stash NAME."
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
796 (interactive "sStash name: ")
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
797 (vc-setup-buffer "*vc-git-stash*")
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
798 (vc-git-command "*vc-git-stash*" 'async nil "stash" "show" "-p" name)
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
799 (set-buffer "*vc-git-stash*")
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
800 (diff-mode)
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
801 (setq buffer-read-only t)
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
802 (pop-to-buffer (current-buffer)))
abce8d2d9707 (vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104616
diff changeset
803
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
804 (defun vc-git-stash-list ()
105129
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
805 (delete
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
806 ""
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
807 (split-string
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
808 (replace-regexp-in-string
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
809 "^stash@" " " (vc-git--run-command-string nil "stash" "list"))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
810 "\n")))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
811
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
812 (defun vc-git-stash-get-at-point (point)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
813 (save-excursion
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
814 (goto-char point)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
815 (beginning-of-line)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
816 (if (looking-at "^ +\\({[0-9]+}\\):")
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
817 (match-string 1)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
818 (error "Cannot find stash at point"))))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
819
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
820 (defun vc-git-stash-delete-at-point ()
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
821 (interactive)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
822 (let ((stash (vc-git-stash-get-at-point (point))))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
823 (when (y-or-n-p (format "Remove stash %s ?" stash))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
824 (vc-git--run-command-string nil "stash" "drop" (format "stash@%s" stash))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
825 (vc-dir-refresh))))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
826
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
827 (defun vc-git-stash-show-at-point ()
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
828 (interactive)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
829 (vc-git-stash-show (format "stash@%s" (vc-git-stash-get-at-point (point)))))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
830
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
831 (defvar vc-git-stash-map
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
832 (let ((map (make-sparse-keymap)))
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
833 (define-key map "\C-k" 'vc-git-stash-delete-at-point)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
834 (define-key map "=" 'vc-git-stash-show-at-point)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
835 (define-key map "\C-m" 'vc-git-stash-show-at-point)
5fc493595567 (vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105040
diff changeset
836 map))
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
837
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
838
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
839 ;;; Internal commands
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
840
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
841 (defun vc-git-command (buffer okstatus file-or-list &rest flags)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
842 "A wrapper around `vc-do-command' for use in vc-git.el.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
843 The difference to vc-do-command is that this function always invokes `git'."
94847
5e64dca662f0 Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94806
diff changeset
844 (apply 'vc-do-command (or buffer "*vc*") okstatus "git" file-or-list flags))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
845
93146
c73e70274c0c (vc-git--empty-db-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93145
diff changeset
846 (defun vc-git--empty-db-p ()
c73e70274c0c (vc-git--empty-db-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93145
diff changeset
847 "Check if the git db is empty (no commit done yet)."
104598
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
848 (let (process-file-side-effects)
1c78b6ed2b93 * vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents: 104379
diff changeset
849 (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD")))))
93146
c73e70274c0c (vc-git--empty-db-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93145
diff changeset
850
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
851 (defun vc-git--call (buffer command &rest args)
87648
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87525
diff changeset
852 ;; We don't need to care the arguments. If there is a file name, it
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87525
diff changeset
853 ;; is always a relative one. This works also for remote
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87525
diff changeset
854 ;; directories.
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87525
diff changeset
855 (apply 'process-file "git" nil buffer nil command args))
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
856
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
857 (defun vc-git--out-ok (command &rest args)
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
858 (zerop (apply 'vc-git--call '(t nil) command args)))
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
859
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
860 (defun vc-git--run-command-string (file &rest args)
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
861 "Run a git command on FILE and return its output as string.
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
862 FILE can be nil."
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
863 (let* ((ok t)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
864 (str (with-output-to-string
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
865 (with-current-buffer standard-output
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
866 (unless (apply 'vc-git--out-ok
104043
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
867 (if file
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
868 (append args (list (file-relative-name
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
869 file)))
772f278e1024 (vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104039
diff changeset
870 args))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
871 (setq ok nil))))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
872 (and ok str)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
873
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
874 (defun vc-git-symbolic-commit (commit)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
875 "Translate COMMIT string into symbolic form.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
876 Returns nil if not possible."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
877 (and commit
102536
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
878 (let ((name (with-temp-buffer
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
879 (and
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
880 (vc-git--out-ok "name-rev" "--name-only" commit)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
881 (goto-char (point-min))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
882 (= (forward-line 2) 1)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
883 (bolp)
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
884 (buffer-substring-no-properties (point-min) (1- (point-max)))))))
97eebd9d88a8 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents: 101940
diff changeset
885 (and name (not (string= name "undefined")) name))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
886
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
887 (provide 'vc-git)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
888
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
889 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
890 ;;; vc-git.el ends here