Mercurial > emacs
annotate lisp/vc/vc-git.el @ 110149:4ac2b883320e
Forgor to save ChangeLog for previous commit.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 02 Sep 2010 12:20:20 +0200 |
parents | 280c8ae2476d |
children | 1b626601d32d 417b1e4d63cd |
rev | line source |
---|---|
78355 | 1 ;;; vc-git.el --- VC backend for the git version control system |
2 | |
106815 | 3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
78355 | 4 |
5 ;; Author: Alexandre Julliard <julliard@winehq.org> | |
108971
d928a6a7c3f2
* lisp/finder.el (finder-known-keywords): Add keyword "vc"
Juri Linkov <juri@jurta.org>
parents:
108970
diff
changeset
|
6 ;; Keywords: vc tools |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
7 ;; Package: vc |
78355 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
78355 | 12 ;; 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
|
13 ;; 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
|
14 ;; (at your option) any later version. |
78355 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; 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
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
78355 | 23 |
24 ;;; Commentary: | |
25 | |
26 ;; This file contains a VC backend for the git version control | |
27 ;; system. | |
28 ;; | |
29 | |
30 ;;; Installation: | |
31 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
32 ;; To install: put this file on the load-path and add Git to the list |
78355 | 33 ;; of supported backends in `vc-handled-backends'; the following line, |
34 ;; placed in your ~/.emacs, will accomplish this: | |
35 ;; | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
36 ;; (add-to-list 'vc-handled-backends 'Git) |
78355 | 37 |
38 ;;; Todo: | |
39 ;; - check if more functions could use vc-git-command instead | |
40 ;; of start-process. | |
41 ;; - changelog generation | |
42 | |
43 ;; Implement the rest of the vc interface. See the comment at the | |
44 ;; beginning of vc.el. The current status is: | |
45 ;; ("??" means: "figure out what to do about it") | |
46 ;; | |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
47 ;; FUNCTION NAME STATUS |
78355 | 48 ;; BACKEND PROPERTIES |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
49 ;; * revision-granularity OK |
78355 | 50 ;; STATE-QUERYING FUNCTIONS |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
51 ;; * registered (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
52 ;; * state (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
53 ;; - state-heuristic (file) NOT NEEDED |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
54 ;; * working-revision (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
55 ;; - 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
|
56 ;; * checkout-model (files) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
57 ;; - workfile-unchanged-p (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
58 ;; - mode-line-string (file) OK |
78355 | 59 ;; STATE-CHANGING FUNCTIONS |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
60 ;; * create-repo () OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
61 ;; * 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
|
62 ;; - init-revision (file) NOT NEEDED |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
63 ;; - responsible-p (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
64 ;; - 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
|
65 ;; - 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
|
66 ;; - unregister (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
67 ;; * checkin (files rev comment) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
68 ;; * 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
|
69 ;; * 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
|
70 ;; * 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
|
71 ;; - 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
|
72 ;; - merge (file rev1 rev2) It would be possible to merge |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
73 ;; changes into a single file, but |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
74 ;; when committing they wouldn't |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
75 ;; 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
|
76 ;; 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
|
77 ;; not a good idea. |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
78 ;; - merge-news (file) see `merge' |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
79 ;; - steal-lock (file &optional revision) NOT NEEDED |
78355 | 80 ;; HISTORY FUNCTIONS |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106464
diff
changeset
|
81 ;; * print-log (files buffer &optional shortlog start-revision limit) OK |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
82 ;; - log-view-mode () OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
83 ;; - show-log-entry (revision) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
84 ;; - comment-history (file) ?? |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
85 ;; - 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
|
86 ;; * 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
|
87 ;; - revision-completion-table (files) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
88 ;; - 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
|
89 ;; - annotate-time () OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
90 ;; - annotate-current-time () NOT NEEDED |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
91 ;; - 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
|
92 ;; TAG SYSTEM |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
93 ;; - 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
|
94 ;; - retrieve-tag (dir name update) OK |
78355 | 95 ;; MISCELLANEOUS |
104616
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
96 ;; - 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
|
97 ;; - repository-hostname (dirname) NOT NEEDED |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
98 ;; - previous-revision (file rev) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
99 ;; - next-revision (file rev) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
100 ;; - check-headers () COULD BE SUPPORTED |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
101 ;; - clear-headers () NOT NEEDED |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
102 ;; - delete-file (file) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
103 ;; - rename-file (old new) OK |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
104 ;; - find-file-hook () NOT NEEDED |
78355 | 105 |
94290
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
106 (eval-when-compile |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
107 (require 'cl) |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
108 (require 'vc) |
96260 | 109 (require 'vc-dir) |
94290
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
110 (require 'grep)) |
78355 | 111 |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
112 (defcustom vc-git-diff-switches t |
100179
7dffc98adf8f
(vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100056
diff
changeset
|
113 "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
|
114 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
|
115 :type '(choice (const :tag "Unspecified" nil) |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
116 (const :tag "None" t) |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
117 (string :tag "Argument String") |
100179
7dffc98adf8f
(vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100056
diff
changeset
|
118 (repeat :tag "Argument List" :value ("") string)) |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
119 :version "23.1" |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
120 :group 'vc) |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
121 |
108009
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
122 (defvar vc-git-commits-coding-system 'utf-8 |
78355 | 123 "Default coding system for git commits.") |
124 | |
125 ;;; BACKEND PROPERTIES | |
126 | |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94539
diff
changeset
|
127 (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
|
128 (defun vc-git-checkout-model (files) 'implicit) |
78355 | 129 |
130 ;;; STATE-QUERYING FUNCTIONS | |
131 | |
132 ;;;###autoload (defun vc-git-registered (file) | |
133 ;;;###autoload "Return non-nil if FILE is registered with git." | |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
134 ;;;###autoload (if (vc-find-root file ".git") ; Short cut. |
78355 | 135 ;;;###autoload (progn |
136 ;;;###autoload (load "vc-git") | |
137 ;;;###autoload (vc-git-registered file)))) | |
138 | |
139 (defun vc-git-registered (file) | |
140 "Check whether FILE is registered with git." | |
106331
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
141 (let ((dir (vc-git-root file))) |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
142 (when dir |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
143 (with-temp-buffer |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
144 (let* (process-file-side-effects |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
145 ;; Do not use the `file-name-directory' here: git-ls-files |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
146 ;; sometimes fails to return the correct status for relative |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
147 ;; path specs. |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
148 ;; See also: http://marc.info/?l=git&m=125787684318129&w=2 |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
149 (name (file-relative-name file dir)) |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
150 (str (ignore-errors |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
151 (cd dir) |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
152 (vc-git--out-ok "ls-files" "-c" "-z" "--" name) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
153 ;; If result is empty, use ls-tree to check for deleted |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
154 ;; file. |
106331
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
155 (when (eq (point-min) (point-max)) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
156 (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
157 "--" name)) |
106331
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
158 (buffer-string)))) |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
159 (and str |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
160 (> (length str) (length name)) |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
161 (string= (substring str 0 (1+ (length name))) |
1c9648ddfd5e
(vc-git-registered): Call vc-git-root only once.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106220
diff
changeset
|
162 (concat name "\0")))))))) |
78355 | 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 | 173 (defun vc-git-state (file) |
174 "Git-specific version of `vc-state'." | |
107810
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
175 ;; FIXME: This can't set 'ignored or 'conflict yet |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
176 ;; The 'ignored state could be detected with `git ls-files -i -o |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
177 ;; --exclude-standard` It also can't set 'needs-update or |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
178 ;; 'needs-merge. The rough equivalent would be that upstream branch |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
179 ;; for current branch is in fast-forward state i.e. current branch |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
180 ;; is direct ancestor of corresponding upstream branch, and the file |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
181 ;; was modified upstream. But we can't check that without a network |
03ef65bf2e25
Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents:
107795
diff
changeset
|
182 ;; operation. |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
183 (if (not (vc-git-registered file)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
184 'unregistered |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
185 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file)) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
186 (let ((diff (vc-git--run-command-string |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
187 file "diff-index" "-z" "HEAD" "--"))) |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
188 (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
|
189 diff)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
190 (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
|
191 (if (vc-git--empty-db-p) 'added 'up-to-date))))) |
78355 | 192 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
193 (defun vc-git-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
194 "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
|
195 (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
|
196 (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
|
197 (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
|
198 (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
78355 | 199 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
200 (match-string 2 str) | |
201 str))) | |
202 | |
203 (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
|
204 (eq 'up-to-date (vc-git-state file))) |
78355 | 205 |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
206 (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
|
207 "Return string for placement into the modeline for FILE." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
208 (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
|
209 (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
|
210 (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
|
211 (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
|
212 (propertize |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
213 (concat def-ml "!") |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
214 '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
|
215 (propertize def-ml |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
216 '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
|
217 |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
218 (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
|
219 (:copier nil) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
220 (:constructor vc-git-create-extra-fileinfo |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
221 (old-perm new-perm &optional rename-state orig-name)) |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
222 (:conc-name vc-git-extra-fileinfo->)) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
223 old-perm new-perm ;; Permission flags. |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
224 rename-state ;; Rename or copy state. |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
225 orig-name) ;; Original name for renames or copies. |
93426
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 (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
|
228 "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
|
229 (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
|
230 (concat "\"" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
231 (mapconcat (lambda (c) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
232 (case c |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
233 (?\n "\\n") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
234 (?\t "\\t") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
235 (?\\ "\\\\") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
236 (?\" "\\\"") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
237 (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
|
238 name "") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
239 "\"") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
240 name)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
241 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
242 (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
|
243 "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
|
244 (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
|
245 (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
|
246 (str (case new-type |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
247 (?\100 ;; File. |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
248 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
249 (?\100 nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
250 (?\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
|
251 (?\160 " (type change subproject -> file)"))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
252 (?\120 ;; Symlink. |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
253 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
254 (?\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
|
255 (?\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
|
256 (t " (symlink)"))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
257 (?\160 ;; Subproject. |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
258 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
259 (?\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
|
260 (?\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
|
261 (t " (subproject)"))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
262 (?\110 nil) ;; Directory (internal, not a real git state). |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
263 (?\000 ;; Deleted or unknown. |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
264 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
265 (?\120 " (symlink)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
266 (?\160 " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
267 (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
|
268 (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
|
269 ((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
|
270 (t "")))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
271 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
272 (defun vc-git-rename-as-string (state extra) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
273 "Return a string describing the copy or rename associated with INFO, |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
274 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
|
275 (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
|
276 (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
|
277 (if rename-state |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
278 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
279 (concat " (" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
280 (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
|
281 (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
|
282 "renamed to ")) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
283 (vc-git-escape-file-name |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
284 (vc-git-extra-fileinfo->orig-name extra)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
285 ")") |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
286 'face 'font-lock-comment-face) |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
287 ""))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
288 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
289 (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
|
290 "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
|
291 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
292 (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
|
293 (not new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
294 (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
|
295 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
296 (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
|
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 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98701
diff
changeset
|
299 (defun vc-git-dir-printer (info) |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
300 "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
|
301 (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
|
302 (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
|
303 (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
|
304 (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
|
305 (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
|
306 (insert |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
307 " " |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
308 (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
|
309 '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
|
310 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
311 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
312 (format "%-12s" state) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
313 '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
|
314 ((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
|
315 (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
|
316 'mouse-face 'highlight) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
317 " " (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
|
318 " " |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
319 (propertize (vc-git-escape-file-name (vc-dir-fileinfo->name info)) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
320 'face (if isdir 'font-lock-comment-delimiter-face |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
321 'font-lock-function-name-face) |
97108
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
322 'help-echo |
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
323 (if isdir |
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
324 "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
|
325 "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
|
326 '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
|
327 '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
|
328 (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
|
329 (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
|
330 |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
331 (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
|
332 "Process sentinel for the various dir-status stages." |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
333 (let (next-stage result) |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
334 (goto-char (point-min)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
335 (case stage |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
336 (update-index |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
337 (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
|
338 (if files 'ls-files-up-to-date 'diff-index)))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
339 (ls-files-added |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
340 (setq next-stage 'ls-files-unknown) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
341 (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
|
342 (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
|
343 (name (match-string 2))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
344 (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
345 result)))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
346 (ls-files-up-to-date |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
347 (setq next-stage 'diff-index) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
348 (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
|
349 (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
|
350 (name (match-string 2))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
351 (push (list name 'up-to-date |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
352 (vc-git-create-extra-fileinfo perm perm)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
353 result)))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
354 (ls-files-unknown |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
355 (when files (setq next-stage 'ls-files-ignored)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
356 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
357 (push (list (match-string 1) 'unregistered |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
358 (vc-git-create-extra-fileinfo 0 0)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
359 result))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
360 (ls-files-ignored |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
361 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
362 (push (list (match-string 1) 'ignored |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
363 (vc-git-create-extra-fileinfo 0 0)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
364 result))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
365 (diff-index |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
366 (setq next-stage 'ls-files-unknown) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
367 (while (re-search-forward |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
368 ":\\([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
|
369 nil t 1) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
370 (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
|
371 (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
|
372 (state (or (match-string 4) (match-string 6))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
373 (name (or (match-string 5) (match-string 7))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
374 (new-name (match-string 8))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
375 (if new-name ; Copy or rename. |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
376 (if (eq ?C (string-to-char state)) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
377 (push (list new-name 'added |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
378 (vc-git-create-extra-fileinfo old-perm new-perm |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
379 'copy name)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
380 result) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
381 (push (list name 'removed |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
382 (vc-git-create-extra-fileinfo 0 0 |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
383 'rename new-name)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
384 result) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
385 (push (list new-name 'added |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
386 (vc-git-create-extra-fileinfo old-perm new-perm |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
387 'rename name)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
388 result)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
389 (push (list name (vc-git--state-code state) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
390 (vc-git-create-extra-fileinfo old-perm new-perm)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
391 result)))))) |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
392 (when result |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
393 (setq result (nreverse result)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
394 (when files |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
395 (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
|
396 (unless files (setq next-stage nil)))) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
397 (when (or result (not next-stage)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
398 (funcall update-function result next-stage)) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
399 (when next-stage |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
400 (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
|
401 |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
402 (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
|
403 (erase-buffer) |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
404 (case stage |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
405 (update-index |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
406 (if files |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
407 (vc-git-command (current-buffer) 'async files "add" "--refresh" "--") |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
408 (vc-git-command (current-buffer) 'async nil |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
409 "update-index" "--refresh"))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
410 (ls-files-added |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
411 (vc-git-command (current-buffer) 'async files |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
412 "ls-files" "-z" "-c" "-s" "--")) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
413 (ls-files-up-to-date |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
414 (vc-git-command (current-buffer) 'async files |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
415 "ls-files" "-z" "-c" "-s" "--")) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
416 (ls-files-unknown |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
417 (vc-git-command (current-buffer) 'async files |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
418 "ls-files" "-z" "-o" "--directory" |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
419 "--no-empty-directory" "--exclude-standard" "--")) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
420 (ls-files-ignored |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
421 (vc-git-command (current-buffer) 'async files |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
422 "ls-files" "-z" "-o" "-i" "--directory" |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
423 "--no-empty-directory" "--exclude-standard" "--")) |
107958 | 424 ;; --relative added in Git 1.5.5. |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
425 (diff-index |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
426 (vc-git-command (current-buffer) 'async files |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
427 "diff-index" "--relative" "-z" "-M" "HEAD" "--"))) |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
428 (vc-exec-after |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
429 `(vc-git-after-dir-status-stage ',stage ',files ',update-function))) |
93146 | 430 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93426
diff
changeset
|
431 (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
|
432 "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
|
433 ;; 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
|
434 ;; - how to handle unregistered directories |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
435 ;; - 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
|
436 (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
|
437 |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
438 (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
|
439 "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
|
440 (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
|
441 |
105860
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
442 (defvar vc-git-stash-map |
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
443 (let ((map (make-sparse-keymap))) |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
444 ;; Turn off vc-dir marking |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
445 (define-key map [mouse-2] 'ignore) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
446 |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
447 (define-key map [down-mouse-3] 'vc-git-stash-menu) |
105860
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
448 (define-key map "\C-k" 'vc-git-stash-delete-at-point) |
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
449 (define-key map "=" 'vc-git-stash-show-at-point) |
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
450 (define-key map "\C-m" 'vc-git-stash-show-at-point) |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
451 (define-key map "A" 'vc-git-stash-apply-at-point) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
452 (define-key map "P" 'vc-git-stash-pop-at-point) |
106492
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
453 (define-key map "S" 'vc-git-stash-snapshot) |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
454 map)) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
455 |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
456 (defvar vc-git-stash-menu-map |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
457 (let ((map (make-sparse-keymap "Git Stash"))) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
458 (define-key map [de] |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
459 '(menu-item "Delete stash" vc-git-stash-delete-at-point |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
460 :help "Delete the current stash")) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
461 (define-key map [ap] |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
462 '(menu-item "Apply stash" vc-git-stash-apply-at-point |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
463 :help "Apply the current stash and keep it in the stash list")) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
464 (define-key map [po] |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
465 '(menu-item "Apply and remove stash (pop)" vc-git-stash-pop-at-point |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
466 :help "Apply the current stash and remove it")) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
467 (define-key map [sh] |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
468 '(menu-item "Show stash" vc-git-stash-show-at-point |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
469 :help "Show the contents of the current stash")) |
105860
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
470 map)) |
78f37cce705f
(vc-git-stash-map): Move definition before use.
Glenn Morris <rgm@gnu.org>
parents:
105670
diff
changeset
|
471 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98701
diff
changeset
|
472 (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
|
473 (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
|
474 (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
|
475 (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
|
476 (stash (vc-git-stash-list)) |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
477 (stash-help-echo "Use M-x vc-git-stash to create stashes.") |
105017
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
478 branch remote remote-url) |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
479 (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
|
480 (progn |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
481 (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
|
482 (setq remote |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
483 (with-output-to-string |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
484 (with-current-buffer standard-output |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
485 (vc-git--out-ok "config" |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
486 (concat "branch." branch ".remote"))))) |
105017
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
487 (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
|
488 (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
|
489 (when remote |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
490 (setq remote-url |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
491 (with-output-to-string |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
492 (with-current-buffer standard-output |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
493 (vc-git--out-ok "config" |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
494 (concat "remote." remote ".url")))))) |
105017
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
495 (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
|
496 (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
|
497 (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
|
498 ;; 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
|
499 (concat |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
500 (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
|
501 (propertize branch |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
502 '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
|
503 (when remote |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
504 (concat |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
505 "\n" |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
506 (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
|
507 (propertize remote-url |
bfda253c8f66
(vc-git-dir-extra-headers): Show the remote location.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105010
diff
changeset
|
508 '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
|
509 "\n" |
105129
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
510 (if stash |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
511 (concat |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
512 (propertize "Stash :\n" 'face 'font-lock-type-face |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
513 'help-echo stash-help-echo) |
105129
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
514 (mapconcat |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
515 (lambda (x) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
516 (propertize x |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
517 '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
|
518 'mouse-face 'highlight |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
519 'help-echo "mouse-3: Show stash menu\nRET: Show stash\nA: Apply stash\nP: Apply and remove stash (pop)\nC-k: Delete stash" |
105129
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
520 '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
|
521 stash "\n")) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
522 (concat |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
523 (propertize "Stash : " 'face 'font-lock-type-face |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
524 'help-echo stash-help-echo) |
105129
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
525 (propertize "Nothing stashed" |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
526 'help-echo stash-help-echo |
105129
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
527 '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
|
528 |
78355 | 529 ;;; STATE-CHANGING FUNCTIONS |
530 | |
531 (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
|
532 "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
|
533 (vc-git-command nil 0 nil "init")) |
78355 | 534 |
535 (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
|
536 "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
|
537 (let (flist dlist) |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
538 (dolist (crt files) |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
539 (if (file-directory-p crt) |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
540 (push crt dlist) |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
541 (push crt flist))) |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
542 (when flist |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
543 (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
|
544 (when dlist |
2d38fd635554
(vc-git-register): Use "git add" for directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104598
diff
changeset
|
545 (vc-git-command nil 0 dlist "add")))) |
78355 | 546 |
547 (defalias 'vc-git-responsible-p 'vc-git-root) | |
548 | |
549 (defun vc-git-unregister (file) | |
550 (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
551 | |
108009
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
552 (declare-function log-edit-extract-headers "log-edit" (headers string)) |
78355 | 553 |
108009
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
554 (defun vc-git-checkin (files rev comment) |
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
555 (let ((coding-system-for-write vc-git-commits-coding-system)) |
107811
2c6eaa7826c7
Add --author support to git commit.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
107810
diff
changeset
|
556 (apply 'vc-git-command nil 0 files |
108009
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
557 (nconc (list "commit" "-m") |
108913
c05344a913c8
Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108891
diff
changeset
|
558 (log-edit-extract-headers '(("Author" . "--author") |
c05344a913c8
Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108891
diff
changeset
|
559 ("Date" . "--date")) |
108009
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
560 comment) |
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
561 (list "--only" "--"))))) |
78355 | 562 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
563 (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
|
564 (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
|
565 (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
|
566 (coding-system-for-write 'binary) |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
567 (fullname |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
568 (let ((fn (vc-git--run-command-string |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
569 file "ls-files" "-z" "--full-name" "--"))) |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
570 ;; ls-files does not return anything when looking for a |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
571 ;; revision of a file that has been renamed or removed. |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
572 (if (string= fn "") |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
573 (file-relative-name file (vc-git-root default-directory)) |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
574 (substring fn 0 -1))))) |
78355 | 575 (vc-git-command |
576 buffer 0 | |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
577 nil |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
578 "cat-file" "blob" (concat (if rev rev "HEAD") ":" fullname)))) |
78355 | 579 |
580 (defun vc-git-checkout (file &optional editable rev) | |
581 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) | |
582 | |
583 (defun vc-git-revert (file &optional contents-done) | |
584 "Revert FILE to the version stored in the git repository." | |
585 (if contents-done | |
586 (vc-git-command nil 0 file "update-index" "--") | |
106463
783bd2552dd4
Make vc-revert change VC state from 'added to 'unregistered.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106384
diff
changeset
|
587 (vc-git-command nil 0 file "reset" "-q" "--") |
783bd2552dd4
Make vc-revert change VC state from 'added to 'unregistered.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106384
diff
changeset
|
588 (vc-git-command nil nil file "checkout" "-q" "--"))) |
78355 | 589 |
590 ;;; HISTORY FUNCTIONS | |
591 | |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106464
diff
changeset
|
592 (defun vc-git-print-log (files buffer &optional shortlog start-revision limit) |
107957
54d5490c8e94
* vc-git.el (vc-git-print-log): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
107359
diff
changeset
|
593 "Get change log associated with FILES. |
107958 | 594 Note that using SHORTLOG requires at least Git version 1.5.6, |
595 for the --graph option." | |
108009
17d3324f96dd
Make the log-edit comments use RFC822 format throughout.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107978
diff
changeset
|
596 (let ((coding-system-for-read vc-git-commits-coding-system)) |
78355 | 597 ;; `vc-do-command' creates the buffer, but we need it before running |
598 ;; the command. | |
599 (vc-setup-buffer buffer) | |
600 ;; If the buffer exists from a previous invocation it might be | |
601 ;; read-only. | |
602 (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
|
603 (with-current-buffer |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
604 buffer |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
605 (apply 'vc-git-command buffer |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
606 'async files |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
607 (append |
106660
7c505f803ab1
Supersede color.diff settings in git log (bug#5211).
Juanma Barranquero <lekktu@gmail.com>
parents:
106492
diff
changeset
|
608 '("log" "--no-color") |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
609 (when shortlog |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
610 '("--graph" "--decorate" "--date=short" |
107359
4e4364e2100c
(vc-git-print-log): Use "tformat:" for shortlog, instead of "format:"
Miles Bader <miles@gnu.org>
parents:
107347
diff
changeset
|
611 "--pretty=tformat:%d%h %ad %s" "--abbrev-commit")) |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
612 (when limit (list "-n" (format "%s" limit))) |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106464
diff
changeset
|
613 (when start-revision (list start-revision)) |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
614 '("--"))))))) |
78355 | 615 |
107795
d47e1fb98df3
Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
107430
diff
changeset
|
616 (defun vc-git-log-outgoing (buffer remote-location) |
d47e1fb98df3
Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
107430
diff
changeset
|
617 (interactive) |
d47e1fb98df3
Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
107430
diff
changeset
|
618 (vc-git-command |
d47e1fb98df3
Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
107430
diff
changeset
|
619 buffer 0 nil |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
620 "log" |
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
621 "--no-color" "--graph" "--decorate" "--date=short" |
108891
3e41dbf56aa2
vc-log-incoming/vc-log-outgoing fixes for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108885
diff
changeset
|
622 "--pretty=tformat:%d%h %ad %s" "--abbrev-commit" |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
623 (concat (if (string= remote-location "") |
108891
3e41dbf56aa2
vc-log-incoming/vc-log-outgoing fixes for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108885
diff
changeset
|
624 "@{upstream}" |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
625 remote-location) |
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
626 "..HEAD"))) |
108844
2ad33f941be2
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108009
diff
changeset
|
627 |
2ad33f941be2
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108009
diff
changeset
|
628 (defun vc-git-log-incoming (buffer remote-location) |
2ad33f941be2
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108009
diff
changeset
|
629 (interactive) |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
630 (vc-git-command nil 0 nil "fetch") |
108844
2ad33f941be2
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108009
diff
changeset
|
631 (vc-git-command |
2ad33f941be2
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108009
diff
changeset
|
632 buffer 0 nil |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
633 "log" |
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
634 "--no-color" "--graph" "--decorate" "--date=short" |
108891
3e41dbf56aa2
vc-log-incoming/vc-log-outgoing fixes for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108885
diff
changeset
|
635 "--pretty=tformat:%d%h %ad %s" "--abbrev-commit" |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
636 (concat "HEAD.." (if (string= remote-location "") |
108891
3e41dbf56aa2
vc-log-incoming/vc-log-outgoing fixes for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108885
diff
changeset
|
637 "@{upstream}" |
108885
b008fff91985
vc-log-incoming/vc-log-outgoing improvements for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108844
diff
changeset
|
638 remote-location)))) |
107795
d47e1fb98df3
Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
107430
diff
changeset
|
639 |
78355 | 640 (defvar log-view-message-re) |
641 (defvar log-view-file-re) | |
642 (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
|
643 (defvar log-view-per-file-logs) |
78355 | 644 |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
645 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
646 (require 'add-log) ;; We need the faces add-log. |
78355 | 647 ;; 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
|
648 (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
|
649 (set (make-local-variable 'log-view-per-file-logs) nil) |
78355 | 650 (set (make-local-variable 'log-view-message-re) |
108891
3e41dbf56aa2
vc-log-incoming/vc-log-outgoing fixes for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108885
diff
changeset
|
651 (if (not (eq vc-log-view-type 'long)) |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
652 "^\\(?:[*/\\| ]+ \\)?\\(?: ([^)]+)\\)?\\([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
|
653 "^commit *\\([0-9a-z]+\\)")) |
78355 | 654 (set (make-local-variable 'log-view-font-lock-keywords) |
108891
3e41dbf56aa2
vc-log-incoming/vc-log-outgoing fixes for Git.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108885
diff
changeset
|
655 (if (not (eq vc-log-view-type 'long)) |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
656 '( |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
657 ;; Same as log-view-message-re, except that we don't |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
658 ;; want the shy group for the tag name. |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
659 ("^\\(?:[*/\\| ]+ \\)?\\( ([^)]+)\\)?\\([0-9a-z]+\\) \\([-a-z0-9]+\\) \\(.*\\)" |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
660 (1 'highlight nil lax) |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
661 (2 'change-log-acknowledgement) |
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
662 (3 'change-log-date))) |
78355 | 663 (append |
106464
67d9cb4f16c3
* vc-git.el (vc-git-print-log): Handle a limit argument. Display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106463
diff
changeset
|
664 `((,log-view-message-re (1 'change-log-acknowledgement))) |
86400 | 665 ;; Handle the case: |
666 ;; user: foo@bar | |
667 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
668 (1 'change-log-email)) | |
669 ;; Handle the case: | |
670 ;; user: FirstName LastName <foo@bar> | |
671 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
672 (1 'change-log-name) | |
673 (2 'change-log-email)) | |
674 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
675 (1 'change-log-name)) | |
676 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
677 (1 'change-log-name) | |
678 (2 'change-log-email)) | |
679 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
680 (1 'change-log-acknowledgement) | |
681 (2 'change-log-acknowledgement)) | |
682 ("^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
|
683 ("^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
|
684 |
78355 | 685 |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
686 (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
|
687 "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
|
688 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
|
689 or BRANCH^ (where \"^\" can be repeated)." |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
690 (goto-char (point-min)) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
691 (prog1 |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
692 (when revision |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
693 (search-forward |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
694 (format "\ncommit %s" revision) nil t |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
695 (cond ((string-match "~\\([0-9]\\)\\'" revision) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
696 (1+ (string-to-number (match-string 1 revision)))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
697 ((string-match "\\^+\\'" revision) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
698 (1+ (length (match-string 0 revision)))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
699 (t nil)))) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
700 (beginning-of-line))) |
78355 | 701 |
702 (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
|
703 "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
|
704 (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
|
705 (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
|
706 (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
|
707 "--exit-code" |
1c78b6ed2b93
* vc-git.el (vc-git-registered, vc-git-working-revision)
Michael Albinus <michael.albinus@gmx.de>
parents:
104379
diff
changeset
|
708 (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
|
709 (list "-p" (or rev1 "HEAD") rev2 "--"))))) |
78355 | 710 |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
711 (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
|
712 ;; 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
|
713 (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
|
714 (table (list "HEAD"))) |
78355 | 715 (with-temp-buffer |
716 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
717 (goto-char (point-min)) | |
107363
3d000dfda7b0
vc-git.el (vc-git-revision-table): Include remote branches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107359
diff
changeset
|
718 (while (re-search-forward "^refs/\\(heads\\|tags\\|remotes\\)/\\(.*\\)$" |
3d000dfda7b0
vc-git.el (vc-git-revision-table): Include remote branches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107359
diff
changeset
|
719 nil t) |
78355 | 720 (push (match-string 2) table))) |
721 table)) | |
722 | |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
723 (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
|
724 (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
|
725 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
726 (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
|
727 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
|
728 table)) |
78355 | 729 |
730 (defun vc-git-annotate-command (file buf &optional rev) | |
731 (let ((name (file-relative-name file))) | |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
732 (vc-git-command buf 'async nil "blame" "--date=iso" "-C" "-C" rev "--" name))) |
78355 | 733 |
96213
09da7727f35f
* vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95020
diff
changeset
|
734 (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
|
735 |
78355 | 736 (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
|
737 (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 | 738 (vc-annotate-convert-time |
86400 | 739 (apply #'encode-time (mapcar (lambda (match) |
740 (string-to-number (match-string match))) | |
741 '(6 5 4 3 2 1 7)))))) | |
78355 | 742 |
743 (defun vc-git-annotate-extract-revision-at-line () | |
86400 | 744 (save-excursion |
745 (move-beginning-of-line 1) | |
105670
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105593
diff
changeset
|
746 (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?") |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105593
diff
changeset
|
747 (let ((revision (match-string-no-properties 1))) |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105593
diff
changeset
|
748 (if (match-beginning 2) |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
749 (let ((fname (match-string-no-properties 3))) |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
750 ;; Remove trailing whitespace from the file name. |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
751 (when (string-match " +\\'" fname) |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
752 (setq fname (substring fname 0 (match-beginning 0)))) |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
753 (cons revision |
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
754 (expand-file-name fname (vc-git-root default-directory)))) |
105670
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105593
diff
changeset
|
755 revision))))) |
78355 | 756 |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
757 ;;; TAG SYSTEM |
78355 | 758 |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
759 (defun vc-git-create-tag (dir name branchp) |
78355 | 760 (let ((default-directory dir)) |
761 (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
762 (if branchp | |
763 (vc-git-command nil 0 nil "checkout" "-b" name) | |
764 (vc-git-command nil 0 nil "tag" name))))) | |
765 | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
766 (defun vc-git-retrieve-tag (dir name update) |
78355 | 767 (let ((default-directory dir)) |
768 (vc-git-command nil 0 nil "checkout" name) | |
769 ;; FIXME: update buffers if `update' is true | |
770 )) | |
771 | |
772 | |
773 ;;; MISCELLANEOUS | |
774 | |
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
|
775 (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
|
776 "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
|
777 (if file |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
778 (let* ((fname (file-relative-name file)) |
102536
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
779 (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
|
780 (and |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
parents:
108971
diff
changeset
|
781 (vc-git--out-ok "rev-list" "-2" rev "--" fname) |
102536
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
782 (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
|
783 (bolp) |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
784 (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
|
785 (not (bobp)) |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
786 (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
|
787 (point) |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
788 (1- (point-max))))))) |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
789 (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
|
790 (with-temp-buffer |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
791 (and |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
792 (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
|
793 (buffer-substring-no-properties (point-min) (+ (point-min) 40)))))) |
78355 | 794 |
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
|
795 (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
|
796 "Git-specific version of `vc-next-revision'." |
78355 | 797 (let* ((default-directory (file-name-directory |
798 (expand-file-name file))) | |
86400 | 799 (file (file-name-nondirectory file)) |
800 (current-rev | |
801 (with-temp-buffer | |
802 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
803 (vc-git--out-ok "rev-list" "-1" rev "--" file) |
86400 | 804 (goto-char (point-max)) |
805 (bolp) | |
806 (zerop (forward-line -1)) | |
807 (bobp) | |
808 (buffer-substring-no-properties | |
809 (point) | |
102536
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
810 (1- (point-max)))))) |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
811 (next-rev |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
812 (and current-rev |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
813 (with-temp-buffer |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
814 (and |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
815 (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
|
816 (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
|
817 (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
|
818 (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
|
819 (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
|
820 (point) |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
821 (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
|
822 (or (vc-git-symbolic-commit next-rev) next-rev))) |
78355 | 823 |
824 (defun vc-git-delete-file (file) | |
825 (vc-git-command nil 0 file "rm" "-f" "--")) | |
826 | |
827 (defun vc-git-rename-file (old new) | |
828 (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
829 | |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
830 (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
|
831 (let ((map (make-sparse-keymap))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
832 (define-key map [git-grep] |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
833 '(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
|
834 :help "Run the `git grep' command")) |
106492
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
835 (define-key map [git-sn] |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
836 '(menu-item "Stash a snapshot" vc-git-stash-snapshot |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
837 :help "Stash the current state of the tree and keep the current state")) |
104617
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
838 (define-key map [git-st] |
106492
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
839 '(menu-item "Create Stash..." vc-git-stash |
104617
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
840 :help "Stash away changes")) |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
841 (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
|
842 '(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
|
843 :help "Show stash contents")) |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
844 map)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
845 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
846 (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
|
847 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
848 (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
|
849 |
105010
b3c2589ed19e
* vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104871
diff
changeset
|
850 (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
|
851 (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
|
852 |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
853 ;; Derived from `lgrep'. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
854 (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
|
855 "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
|
856 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
|
857 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
|
858 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
|
859 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
860 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
|
861 before it is executed. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
862 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
|
863 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
864 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
|
865 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
|
866 in the grep output buffer, |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
867 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
|
868 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
869 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
|
870 (interactive |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
871 (progn |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
872 (grep-compute-defaults) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
873 (cond |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
874 ((equal current-prefix-arg '(16)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
875 (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
|
876 nil nil 'grep-history) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
877 nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
878 (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
|
879 (files (grep-read-files regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
880 (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
|
881 nil default-directory t))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
882 (list regexp files dir)))))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
883 (require 'grep) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
884 (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
|
885 (let ((command regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
886 (if (null files) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
887 (if (string= command "git grep") |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
888 (setq command nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
889 (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
|
890 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
891 (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
|
892 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
893 (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
|
894 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
895 (read-from-minibuffer "Confirm: " |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
896 command nil nil 'grep-history)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
897 (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
|
898 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
899 (let ((default-directory dir) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
900 (compilation-environment '("PAGER="))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
901 ;; 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
|
902 ;; 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
|
903 (compilation-start command 'grep-mode)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
904 (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
|
905 (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
|
906 |
104617
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
907 (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
|
908 "Create a stash." |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
909 (interactive "sStash name: ") |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
910 (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
|
911 (when root |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
912 (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
|
913 (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
|
914 |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
915 (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
|
916 "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
|
917 (interactive "sStash name: ") |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
918 (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
|
919 (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
|
920 (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
|
921 (diff-mode) |
abce8d2d9707
(vc-git-stash, vc-git-stash-show): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104616
diff
changeset
|
922 (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
|
923 (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
|
924 |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
925 (defun vc-git-stash-apply (name) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
926 "Apply stash NAME." |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
927 (interactive "sApply stash: ") |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
928 (vc-git-command "*vc-git-stash*" 0 nil "stash" "apply" "-q" name) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
929 (vc-resynch-buffer (vc-git-root default-directory) t t)) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
930 |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
931 (defun vc-git-stash-pop (name) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
932 "Pop stash NAME." |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
933 (interactive "sPop stash: ") |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
934 (vc-git-command "*vc-git-stash*" 0 nil "stash" "pop" "-q" name) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
935 (vc-resynch-buffer (vc-git-root default-directory) t t)) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
936 |
106492
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
937 (defun vc-git-stash-snapshot () |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
938 "Create a stash with the current tree state." |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
939 (interactive) |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
940 (vc-git--call nil "stash" "save" |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
941 (let ((ct (current-time))) |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
942 (concat |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
943 (format-time-string "Snapshot on %Y-%m-%d" ct) |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
944 (format-time-string " at %H:%M" ct)))) |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
945 (vc-git-command "*vc-git-stash*" 0 nil "stash" "apply" "-q" "stash@{0}") |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
946 (vc-resynch-buffer (vc-git-root default-directory) t t)) |
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
947 |
104043
772f278e1024
(vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104039
diff
changeset
|
948 (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
|
949 (delete |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
950 "" |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
951 (split-string |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
952 (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
|
953 "^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
|
954 "\n"))) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
955 |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
956 (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
|
957 (save-excursion |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
958 (goto-char point) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
959 (beginning-of-line) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
960 (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
|
961 (match-string 1) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
962 (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
|
963 |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
964 (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
|
965 (interactive) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
966 (let ((stash (vc-git-stash-get-at-point (point)))) |
106492
88a0c109936e
Add support for stashing a snapshot of the current tree.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106472
diff
changeset
|
967 (when (y-or-n-p (format "Remove stash %s ? " stash)) |
105129
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
968 (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
|
969 (vc-dir-refresh)))) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
970 |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
971 (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
|
972 (interactive) |
5fc493595567
(vc-git-dir-extra-headers): Add keymap and mouse-face
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105040
diff
changeset
|
973 (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
|
974 |
106384
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
975 (defun vc-git-stash-apply-at-point () |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
976 (interactive) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
977 (vc-git-stash-apply (format "stash@%s" (vc-git-stash-get-at-point (point))))) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
978 |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
979 (defun vc-git-stash-pop-at-point () |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
980 (interactive) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
981 (vc-git-stash-pop (format "stash@%s" (vc-git-stash-get-at-point (point))))) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
982 |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
983 (defun vc-git-stash-menu (e) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
984 (interactive "e") |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
985 (vc-dir-at-event e (popup-menu vc-git-stash-menu-map e))) |
8272f561b710
Support applying stashes. Improve UI.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106331
diff
changeset
|
986 |
78355 | 987 |
988 ;;; Internal commands | |
989 | |
990 (defun vc-git-command (buffer okstatus file-or-list &rest flags) | |
991 "A wrapper around `vc-do-command' for use in vc-git.el. | |
992 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
|
993 (apply 'vc-do-command (or buffer "*vc*") okstatus "git" file-or-list flags)) |
78355 | 994 |
93146 | 995 (defun vc-git--empty-db-p () |
996 "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
|
997 (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
|
998 (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD"))))) |
93146 | 999 |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
1000 (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
|
1001 ;; 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
|
1002 ;; 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
|
1003 ;; directories. |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
1004 (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
|
1005 |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
1006 (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
|
1007 (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
|
1008 |
78355 | 1009 (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
|
1010 "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
|
1011 FILE can be nil." |
78355 | 1012 (let* ((ok t) |
1013 (str (with-output-to-string | |
1014 (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
|
1015 (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
|
1016 (if file |
772f278e1024
(vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104039
diff
changeset
|
1017 (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
|
1018 file))) |
772f278e1024
(vc-git--run-command-string): Accept a nil FILE argument.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104039
diff
changeset
|
1019 args)) |
78355 | 1020 (setq ok nil)))))) |
1021 (and ok str))) | |
1022 | |
1023 (defun vc-git-symbolic-commit (commit) | |
1024 "Translate COMMIT string into symbolic form. | |
1025 Returns nil if not possible." | |
1026 (and commit | |
102536
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
1027 (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
|
1028 (and |
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
1029 (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
|
1030 (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
|
1031 (= (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
|
1032 (bolp) |
107341
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
1033 (buffer-substring-no-properties (point-min) |
8bc19ba3da90
* vc-git.el: Re-flow to fit into 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106983
diff
changeset
|
1034 (1- (point-max))))))) |
102536
97eebd9d88a8
* vc-git.el (vc-git-previous-revision, vc-git-next-revision):
Alexandre Julliard <julliard@winehq.org>
parents:
101940
diff
changeset
|
1035 (and name (not (string= name "undefined")) name)))) |
78355 | 1036 |
1037 (provide 'vc-git) | |
1038 | |
1039 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 | |
1040 ;;; vc-git.el ends here |