annotate lisp/vc-git.el @ 92912:bf22321f752b

Re-indent. (calendar-absolute-from-julian): Move definition before use. Remove un-needed local `day'. (calendar-goto-julian-date, calendar-goto-astro-day-number): Doc fix.
author Glenn Morris <rgm@gnu.org>
date Fri, 14 Mar 2008 03:34:42 +0000
parents a0193ceeaa83
children 01d3fd1a2cfe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1 ;;; vc-git.el --- VC backend for the git version control system
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2
79721
73661ddc7ac7 Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 79687
diff changeset
3 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
4
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5 ;; Author: Alexandre Julliard <julliard@winehq.org>
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
6 ;; Keywords: tools
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
7
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
12 ;; the Free Software Foundation; either version 3, or (at your option)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
13 ;; any later version.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
14
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
18 ;; GNU General Public License for more details.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
19
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
23 ;; Boston, MA 02110-1301, USA.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25 ;;; Commentary:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27 ;; This file contains a VC backend for the git version control
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
28 ;; system.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
29 ;;
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
30
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
31 ;;; Installation:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
32
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
33 ;; To install: put this file on the load-path and add Git to the list
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
34 ;; of supported backends in `vc-handled-backends'; the following line,
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
35 ;; placed in your ~/.emacs, will accomplish this:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
36 ;;
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
37 ;; (add-to-list 'vc-handled-backends 'Git)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
38
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
39 ;;; Todo:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
40 ;; - check if more functions could use vc-git-command instead
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
41 ;; of start-process.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
42 ;; - changelog generation
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
43
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
44 ;; Implement the rest of the vc interface. See the comment at the
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
45 ;; beginning of vc.el. The current status is:
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
46 ;; ("??" means: "figure out what to do about it")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
47 ;;
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
48 ;; FUNCTION NAME STATUS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
49 ;; BACKEND PROPERTIES
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
50 ;; * revision-granularity OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
51 ;; STATE-QUERYING FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
52 ;; * registered (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
53 ;; * state (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
54 ;; - state-heuristic (file) NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
55 ;; - dir-state (dir) OK
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
56 ;; * working-revision (file) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
57 ;; - latest-on-branch-p (file) NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
58 ;; * checkout-model (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
59 ;; - workfile-unchanged-p (file) OK
82843
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
60 ;; - mode-line-string (file) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
61 ;; - dired-state-info (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
62 ;; STATE-CHANGING FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
63 ;; * create-repo () OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
64 ;; * register (files &optional rev comment) OK
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
65 ;; - init-revision (file) NOT NEEDED
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
66 ;; - responsible-p (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
67 ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
68 ;; - receive-file (file rev) NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
69 ;; - unregister (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
70 ;; * checkin (files rev comment) OK
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
71 ;; * find-revision (file rev buffer) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
72 ;; * checkout (file &optional editable rev) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
73 ;; * revert (file &optional contents-done) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
74 ;; - rollback (files) COULD BE SUPPORTED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
75 ;; - merge (file rev1 rev2) It would be possible to merge changes into
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
76 ;; a single file, but when committing they
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
77 ;; wouldn't be identified as a merge by git,
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
78 ;; so it's probably not a good idea.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
79 ;; - merge-news (file) see `merge'
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
80 ;; - steal-lock (file &optional revision) NOT NEEDED
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
81 ;; HISTORY FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
82 ;; * print-log (files &optional buffer) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
83 ;; - log-view-mode () OK
86397
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
84 ;; - show-log-entry (revision) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
85 ;; - wash-log (file) COULD BE SUPPORTED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
86 ;; - logentry-check () NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
87 ;; - comment-history (file) ??
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
88 ;; - update-changelog (files) COULD BE SUPPORTED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
89 ;; * diff (file &optional rev1 rev2 buffer) OK
85462
43a9834cf1a6 * vc-bzr.el (vc-bzr-diff-tree):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85459
diff changeset
90 ;; - revision-completion-table (files) NEEDED?
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
91 ;; - annotate-command (file buf &optional rev) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
92 ;; - annotate-time () OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
93 ;; - annotate-current-time () NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
94 ;; - annotate-extract-revision-at-line () OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
95 ;; SNAPSHOT SYSTEM
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
96 ;; - create-snapshot (dir name branchp) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
97 ;; - assign-name (file name) NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
98 ;; - retrieve-snapshot (dir name update) OK, needs to update buffers
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
99 ;; MISCELLANEOUS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
100 ;; - make-version-backups-p (file) NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
101 ;; - repository-hostname (dirname) NOT NEEDED
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
102 ;; - previous-revision (file rev) OK
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
103 ;; - next-revision (file rev) OK
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
104 ;; - check-headers () COULD BE SUPPORTED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
105 ;; - clear-headers () NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
106 ;; - delete-file (file) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
107 ;; - rename-file (old new) OK
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
108 ;; - find-file-hook () NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
109 ;; - find-file-not-found-hook () NOT NEEDED
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
110
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
111 (eval-when-compile (require 'cl) (require 'vc))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
112
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
113 (defvar git-commits-coding-system 'utf-8
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
114 "Default coding system for git commits.")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
115
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
116 ;;; BACKEND PROPERTIES
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
117
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
118 (defun vc-git-revision-granularity ()
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
119 'repository)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
120
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
121 ;;; STATE-QUERYING FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
122
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
123 ;;;###autoload (defun vc-git-registered (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
124 ;;;###autoload "Return non-nil if FILE is registered with git."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
125 ;;;###autoload (if (vc-find-root file ".git") ; short cut
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
126 ;;;###autoload (progn
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
127 ;;;###autoload (load "vc-git")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
128 ;;;###autoload (vc-git-registered file))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
129
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
130 (defun vc-git-registered (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
131 "Check whether FILE is registered with git."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
132 (when (vc-git-root file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
133 (with-temp-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
134 (let* ((dir (file-name-directory file))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
135 (name (file-relative-name file dir)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
136 (and (ignore-errors
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
137 (when dir (cd dir))
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
138 (vc-git--out-ok "ls-files" "-c" "-z" "--" name))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
139 (let ((str (buffer-string)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
140 (and (> (length str) (length name))
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
141 (string= (substring str 0 (1+ (length name)))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
142 (concat name "\0")))))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
143
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
144 (defun vc-git-state (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
145 "Git-specific version of `vc-state'."
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
146 ;; FIXME: This can't set 'ignored yet
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
147 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
149 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
150 diff))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
151 'edited
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
152 'up-to-date)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
153
87525
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
154 (defun vc-git--ls-files-state (state &rest args)
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
155 "Set state to STATE on all files found with git-ls-files ARGS."
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
156 (with-temp-buffer
87525
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
157 (apply 'vc-git-command (current-buffer) nil nil "ls-files" "-z" args)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
158 (goto-char (point-min))
87525
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
159 (let ((start (point)))
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
160 (while (search-forward "\0" nil t)
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
161 (let ((file (expand-file-name
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
162 (buffer-substring-no-properties start (1- (point))))))
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
163 (vc-file-setprop file 'vc-backend (if state 'Git 'none))
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
164 (vc-file-setprop file 'vc-state state))
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
165 (setq start (point))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
166
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
167 (defun vc-git-dir-state (dir)
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
168 "Git-specific version of `dir-state'."
87525
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
169 (vc-git--ls-files-state 'up-to-date "-c")
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
170 (vc-git--ls-files-state 'edited "-m")
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
171 (vc-git--ls-files-state 'removed "-d")
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
172 (vc-git--ls-files-state 'ignored "-o" "-i" "--exclude-standard")
77d4b0e5e5d2 * vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87516
diff changeset
173 (vc-git--ls-files-state nil "-o" "--exclude-standard"))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
174
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
175 (defun vc-git-working-revision (file)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
176 "Git-specific version of `vc-working-revision'."
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
177 (let ((str (with-output-to-string
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
178 (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
179 (vc-git--out-ok "symbolic-ref" "HEAD")))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
180 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
181 (match-string 2 str)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
182 str)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
183
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
184 (defun vc-git-checkout-model (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
185 'implicit)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
186
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
187 (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
188 (eq 'up-to-date (vc-git-state file)))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
189
82843
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
190 (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
191 "Return string for placement into the modeline for FILE."
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
192 (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
193 (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
194 (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
195 (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
196 (propertize
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
197 (concat def-ml "!")
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
198 '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
199 (propertize def-ml
768766d373a7 * vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
200 '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
201
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
202 (defun vc-git-dired-state-info (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
203 "Git-specific version of `vc-dired-state-info'."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
204 (let ((git-state (vc-state file)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
205 (if (eq git-state 'edited)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
206 "(modified)"
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
207 ;; fall back to the default VC representation
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
208 (vc-default-dired-state-info 'Git file))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
209
91929
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
210 ;;; vc-dir-status support (EXPERIMENTAL)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
211 ;;; If vc-directory (which is not half bad under Git, w/ some tweaking)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
212 ;;; is to go away, vc-dir-status must at least support the same operations.
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
213 ;;; At the moment, vc-dir-status design is still fluid (a kind way to say
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
214 ;;; half-baked, undocumented, and spottily-supported), so the following
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
215 ;;; should be considered likewise ripe for sudden unannounced change.
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
216 ;;; YHBW, HAND. --ttn
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
217
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
218 (defun vc-git-after-dir-status (callback buffer)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
219 (sort-regexp-fields t "^. \\(.+\\)$" "\\1" (point-min) (point-max))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
220 (let ((map '((?H . cached)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
221 (?M . unmerged)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
222 (?R . removed)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
223 (?C . edited)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
224 (?K . removed) ; ??? "to be killed"
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
225 (?? . unregistered)))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
226 status filename result)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
227 (goto-char (point-min))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
228 (while (> (point-max) (point))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
229 (setq status (string-to-char (buffer-substring (point) (1+ (point))))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
230 status (cdr (assq status map))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
231 filename (buffer-substring (+ 2 (point)) (line-end-position)))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
232 ;; TODO: Add dynamic selection of which status(es) to display, and
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
233 ;; bubble that up to vc-dir-status. For now, we consider `cached'
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
234 ;; to be uninteresting, to mimic vc-directory (somewhat).
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
235 (unless (eq 'cached status)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
236 (push (cons filename status) result))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
237 (forward-line 1))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
238 (funcall callback result buffer)))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
239
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
240 (defun vc-git-dir-status (dir update-function status-buffer)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
241 "Return a list of conses (file . state) for DIR."
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
242 (with-current-buffer
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
243 (get-buffer-create
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
244 (expand-file-name " *VC-Git* tmp status" dir))
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
245 (erase-buffer)
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
246 (vc-git-command (current-buffer) 'async dir "ls-files" "-t"
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
247 "-c" ; cached
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
248 "-d" ; deleted
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
249 "-k" ; killed
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
250 "-m" ; modified
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
251 "-o" ; others
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
252 "--directory"
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
253 "--exclude-per-directory=.gitignore")
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
254 (vc-exec-after
92093
a0193ceeaa83 * vc.el (vc-exec-after): Move setting mode-line-process in the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 91929
diff changeset
255 `(vc-git-after-dir-status (quote ,update-function) ,status-buffer))
a0193ceeaa83 * vc.el (vc-exec-after): Move setting mode-line-process in the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 91929
diff changeset
256 (current-buffer)))
91929
3299b785d830 (vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87649
diff changeset
257
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
258 ;;; STATE-CHANGING FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
259
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
260 (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
261 "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
262 (vc-git-command nil 0 nil "init"))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
263
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
264 (defun vc-git-register (files &optional rev comment)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
265 "Register FILE into the git version-control system."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
266 (vc-git-command nil 0 files "update-index" "--add" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
267
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
268 (defalias 'vc-git-responsible-p 'vc-git-root)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
269
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
270 (defun vc-git-unregister (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
271 (vc-git-command nil 0 file "rm" "-f" "--cached" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
272
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
273
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
274 (defun vc-git-checkin (files rev comment)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
275 (let ((coding-system-for-write git-commits-coding-system))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
276 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
277
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
278 (defun vc-git-find-revision (file rev buffer)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
279 (let ((coding-system-for-read 'binary)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
280 (coding-system-for-write 'binary)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
281 (fullname (substring
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
282 (vc-git--run-command-string
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
283 file "ls-files" "-z" "--full-name" "--")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
284 0 -1)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
285 (vc-git-command
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
286 buffer 0
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
287 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
288
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
289 (defun vc-git-checkout (file &optional editable rev)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
290 (vc-git-command nil 0 file "checkout" (or rev "HEAD")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
291
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
292 (defun vc-git-revert (file &optional contents-done)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
293 "Revert FILE to the version stored in the git repository."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
294 (if contents-done
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
295 (vc-git-command nil 0 file "update-index" "--")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
296 (vc-git-command nil 0 file "checkout" "HEAD")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
297
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
298 ;;; HISTORY FUNCTIONS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
299
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
300 (defun vc-git-print-log (files &optional buffer)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
301 "Get change log associated with FILES."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
302 (let ((coding-system-for-read git-commits-coding-system)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
303 ;; Support both the old print-log interface that passes a
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
304 ;; single file, and the new one that passes a file list.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
305 (flist (if (listp files) files (list files))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
306 ;; `vc-do-command' creates the buffer, but we need it before running
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
307 ;; the command.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
308 (vc-setup-buffer buffer)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
309 ;; If the buffer exists from a previous invocation it might be
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
310 ;; read-only.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
311 (let ((inhibit-read-only t))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
312 ;; XXX `log-view-mode' needs to have something to identify where
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
313 ;; the log for each individual file starts. It seems that by
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
314 ;; default git does not output this info. So loop here and call
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
315 ;; "git rev-list" on each file separately to make sure that each
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
316 ;; file gets a "File:" header before the corresponding
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
317 ;; log. Maybe there is a way to do this with one command...
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
318 (dolist (file flist)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
319 (with-current-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
320 buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
321 (insert "File: " (file-name-nondirectory file) "\n"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
322 (vc-git-command buffer 'async (file-relative-name file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
323 "rev-list" "--pretty" "HEAD" "--")))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
324
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
325 (defvar log-view-message-re)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
326 (defvar log-view-file-re)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
327 (defvar log-view-font-lock-keywords)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
328
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78359
diff changeset
329 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
330 (require 'add-log) ;; we need the faces add-log
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
331 ;; Don't have file markers, so use impossible regexp.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
332 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
333 (set (make-local-variable 'log-view-message-re)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
334 "^commit *\\([0-9a-z]+\\)")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
335 (set (make-local-variable 'log-view-font-lock-keywords)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
336 (append
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
337 `((,log-view-message-re (1 'change-log-acknowledgement))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
338 (,log-view-file-re (1 'change-log-file-face)))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
339 ;; Handle the case:
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
340 ;; user: foo@bar
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
341 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
342 (1 'change-log-email))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
343 ;; Handle the case:
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
344 ;; user: FirstName LastName <foo@bar>
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
345 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
346 (1 'change-log-name)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
347 (2 'change-log-email))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
348 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
349 (1 'change-log-name))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
350 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
351 (1 'change-log-name)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
352 (2 'change-log-email))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
353 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
354 (1 'change-log-acknowledgement)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
355 (2 'change-log-acknowledgement))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
356 ("^Date: \\(.+\\)" (1 'change-log-date))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
357 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
358
86397
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
359 (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
360 "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
361 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
362 or BRANCH^ (where \"^\" can be repeated)."
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
363 (goto-char (point-min))
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
364 (search-forward "\ncommit" nil t
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
365 (cond ((string-match "~\\([0-9]\\)$" revision)
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
366 (1+ (string-to-number (match-string 1 revision))))
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
367 ((string-match "\\^+$" revision)
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
368 (1+ (length (match-string 0 revision))))
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
369 (t nil)))
38193bd1ab69 (vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 85462
diff changeset
370 (beginning-of-line))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
371
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
372 (defun vc-git-diff (files &optional rev1 rev2 buffer)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
373 (let ((buf (or buffer "*vc-diff*")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
374 (if (and rev1 rev2)
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
375 (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
376 rev1 rev2 "--")
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
377 (vc-git-command buf 1 files "diff-index" "--exit-code" "-p"
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
378 (or rev1 "HEAD") "--"))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
379
85459
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
380 (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
381 ;; What about `files'?!? --Stef
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
382 (let ((table (list "HEAD")))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
383 (with-temp-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
384 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
385 (goto-char (point-min))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
386 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
387 (push (match-string 2) table)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
388 table))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
389
85459
dec6fdd5ddf4 (vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
390 (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
391 (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
392 table)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78356
diff changeset
393 (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
394 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
395 table))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
396
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
397 (defun vc-git-annotate-command (file buf &optional rev)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
398 ;; FIXME: rev is ignored
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
399 (let ((name (file-relative-name file)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
400 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev)))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
401
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
402 (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
403 (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
404 (vc-annotate-convert-time
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
405 (apply #'encode-time (mapcar (lambda (match)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
406 (string-to-number (match-string match)))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
407 '(6 5 4 3 2 1 7))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
408
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
409 (defun vc-git-annotate-extract-revision-at-line ()
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
410 (save-excursion
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
411 (move-beginning-of-line 1)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
412 (and (looking-at "[0-9a-f]+")
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
413 (buffer-substring-no-properties (match-beginning 0) (match-end 0)))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
414
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
415 ;;; SNAPSHOT SYSTEM
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
416
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
417 (defun vc-git-create-snapshot (dir name branchp)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
418 (let ((default-directory dir))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
419 (and (vc-git-command nil 0 nil "update-index" "--refresh")
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
420 (if branchp
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
421 (vc-git-command nil 0 nil "checkout" "-b" name)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
422 (vc-git-command nil 0 nil "tag" name)))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
423
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
424 (defun vc-git-retrieve-snapshot (dir name update)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
425 (let ((default-directory dir))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
426 (vc-git-command nil 0 nil "checkout" name)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
427 ;; FIXME: update buffers if `update' is true
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
428 ))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
429
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
430
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
431 ;;; MISCELLANEOUS
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
432
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
433 (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
434 "Git-specific version of `vc-previous-revision'."
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
435 (let ((default-directory (file-name-directory (expand-file-name file)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
436 (file (file-name-nondirectory file)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
437 (vc-git-symbolic-commit
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
438 (with-temp-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
439 (and
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
440 (vc-git--out-ok "rev-list" "-2" rev "--" file)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
441 (goto-char (point-max))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
442 (bolp)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
443 (zerop (forward-line -1))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
444 (not (bobp))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
445 (buffer-substring-no-properties
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
446 (point)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
447 (1- (point-max))))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
448
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
449 (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
450 "Git-specific version of `vc-next-revision'."
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
451 (let* ((default-directory (file-name-directory
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
452 (expand-file-name file)))
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
453 (file (file-name-nondirectory file))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
454 (current-rev
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
455 (with-temp-buffer
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
456 (and
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
457 (vc-git--out-ok "rev-list" "-1" rev "--" file)
86400
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
458 (goto-char (point-max))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
459 (bolp)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
460 (zerop (forward-line -1))
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
461 (bobp)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
462 (buffer-substring-no-properties
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
463 (point)
fdd891feb624 Refill; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86397
diff changeset
464 (1- (point-max)))))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
465 (and current-rev
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
466 (vc-git-symbolic-commit
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
467 (with-temp-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
468 (and
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
469 (vc-git--out-ok "rev-list" "HEAD" "--" file)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
470 (goto-char (point-min))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
471 (search-forward current-rev nil t)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
472 (zerop (forward-line -1))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
473 (buffer-substring-no-properties
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
474 (point)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
475 (progn (forward-line 1) (1- (point))))))))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
476
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
477 (defun vc-git-delete-file (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
478 (vc-git-command nil 0 file "rm" "-f" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
479
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
480 (defun vc-git-rename-file (old new)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
481 (vc-git-command nil 0 (list old new) "mv" "-f" "--"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
482
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
483
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
484 ;;; Internal commands
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
485
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
486 (defun vc-git-root (file)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
487 (vc-find-root file ".git"))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
488
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
489 (defun vc-git-command (buffer okstatus file-or-list &rest flags)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
490 "A wrapper around `vc-do-command' for use in vc-git.el.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
491 The difference to vc-do-command is that this function always invokes `git'."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
492 (apply 'vc-do-command buffer okstatus "git" file-or-list flags))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
493
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
494 (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
495 ;; 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
496 ;; 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
497 ;; directories.
7ae99e295dfd * vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents: 87525
diff changeset
498 (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
499
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
500 (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
501 (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
502
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
503 (defun vc-git--run-command-string (file &rest args)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
504 "Run a git command on FILE and return its output as string."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
505 (let* ((ok t)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
506 (str (with-output-to-string
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
507 (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
508 (unless (apply 'vc-git--out-ok
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
509 (append args (list (file-relative-name
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
510 file))))
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
511 (setq ok nil))))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
512 (and ok str)))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
513
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
514 (defun vc-git-symbolic-commit (commit)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
515 "Translate COMMIT string into symbolic form.
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
516 Returns nil if not possible."
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
517 (and commit
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
518 (with-temp-buffer
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
519 (and
86403
d2c8f5a27761 (vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 86400
diff changeset
520 (vc-git--out-ok "name-rev" "--name-only" "--tags" commit)
78355
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
521 (goto-char (point-min))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
522 (= (forward-line 2) 1)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
523 (bolp)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
524 (buffer-substring-no-properties (point-min) (1- (point-max)))))))
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
525
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
526 (provide 'vc-git)
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
527
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
528 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12
c6e2dfb349be New File.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
529 ;;; vc-git.el ends here