annotate lisp/vc-hg.el @ 102413:feece1082bed

(doc-view-convert-current-doc): Save the current resolution in the cache directory. (doc-view-initiate-display): Restore the saved resolution when using cached image files.
author Tassilo Horn <tassilo@member.fsf.org>
date Thu, 05 Mar 2009 08:24:26 +0000
parents bbf505632d29
children cb4483f32179
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1 ;;; vc-hg.el --- VC backend for the mercurial version control system
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100180
diff changeset
3 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
4
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5 ;; Author: Ivan Kanis
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
6 ;; Keywords: tools
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
7
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
13 ;; (at your option) any later version.
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
14
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
18 ;; GNU General Public License for more details.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
19
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94572
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
22
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
23 ;;; Commentary:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25 ;; This is a mercurial version control backend
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27 ;;; Thanks:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
28
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
29 ;;; Bugs:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
30
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
31 ;;; Installation:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
32
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
33 ;;; Todo:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
34
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
35 ;; 1) Implement the rest of the vc interface. See the comment at the
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
36 ;; beginning of vc.el. The current status is:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
37
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
38 ;; FUNCTION NAME STATUS
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
39 ;; BACKEND PROPERTIES
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
40 ;; * revision-granularity OK
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
41 ;; STATE-QUERYING FUNCTIONS
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
42 ;; * registered (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
43 ;; * state (file) OK
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
44 ;; - state-heuristic (file) NOT NEEDED
98492
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
45 ;; - dir-status (dir update-function) OK
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
46 ;; - dir-status-files (dir files ds uf) OK
101200
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
47 ;; - dir-extra-headers (dir) OK
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
48 ;; - dir-printer (fileinfo) OK
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 83759
diff changeset
49 ;; * working-revision (file) OK
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
50 ;; - latest-on-branch-p (file) ??
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
51 ;; * checkout-model (files) OK
78167
252b7f091c04 (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78166
diff changeset
52 ;; - workfile-unchanged-p (file) OK
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
53 ;; - mode-line-string (file) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
54 ;; STATE-CHANGING FUNCTIONS
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
55 ;; * register (files &optional rev comment) OK
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
56 ;; * create-repo () OK
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
57 ;; - init-revision () NOT NEEDED
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
58 ;; - responsible-p (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
59 ;; - could-register (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
60 ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
61 ;; - unregister (file) COMMENTED OUT, MAY BE INCORRECT
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
62 ;; * checkin (files rev comment) OK
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
63 ;; * find-revision (file rev buffer) OK
78148
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
64 ;; * checkout (file &optional editable rev) OK
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
65 ;; * revert (file &optional contents-done) OK
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
66 ;; - rollback (files) ?? PROBABLY NOT NEEDED
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
67 ;; - merge (file rev1 rev2) NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
68 ;; - merge-news (file) NEEDED
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
69 ;; - steal-lock (file &optional revision) NOT NEEDED
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
70 ;; HISTORY FUNCTIONS
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
71 ;; * print-log (files &optional buffer) OK
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
72 ;; - log-view-mode () OK
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
73 ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
74 ;; - comment-history (file) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
75 ;; - update-changelog (files) NOT NEEDED
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
76 ;; * diff (files &optional rev1 rev2 buffer) OK
85462
43a9834cf1a6 * vc-bzr.el (vc-bzr-diff-tree):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85460
diff changeset
77 ;; - revision-completion-table (files) OK?
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
78 ;; - annotate-command (file buf &optional rev) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
79 ;; - annotate-time () OK
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
80 ;; - annotate-current-time () NOT NEEDED
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
81 ;; - 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: 94853
diff changeset
82 ;; TAG SYSTEM
101200
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
83 ;; - create-tag (dir name branchp) NEEDED
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
84 ;; - retrieve-tag (dir name update) NEEDED
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
85 ;; MISCELLANEOUS
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
86 ;; - make-version-backups-p (file) ??
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
87 ;; - repository-hostname (dirname) ??
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
88 ;; - previous-revision (file rev) OK
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
89 ;; - next-revision (file rev) OK
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
90 ;; - check-headers () ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
91 ;; - clear-headers () ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
92 ;; - delete-file (file) TEST IT
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
93 ;; - rename-file (old new) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
94 ;; - find-file-hook () PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
95 ;; - find-file-not-found-hook () PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
96
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
97 ;; 2) Implement Stefan Monnier's advice:
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
98 ;; vc-hg-registered and vc-hg-state
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
99 ;; Both of those functions should be super extra careful to fail gracefully in
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
100 ;; unexpected circumstances. The reason this is important is that any error
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
101 ;; there will prevent the user from even looking at the file :-(
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
102 ;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
103 ;; mercurial's control and extracting the current revision should be done
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
104 ;; without even using `hg' (this way even if you don't have `hg' installed,
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
105 ;; Emacs is able to tell you this file is under mercurial's control).
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
106
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
107 ;;; History:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
108 ;;
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
109
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
110 ;;; Code:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
111
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
112 (eval-when-compile
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
113 (require 'cl)
96260
d011b21b3f08 * vc-hg.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96213
diff changeset
114 (require 'vc)
d011b21b3f08 * vc-hg.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96213
diff changeset
115 (require 'vc-dir))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
116
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
117 ;;; Customization options
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
118
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
119 (defcustom vc-hg-global-switches nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 100057
diff changeset
120 "Global switches to pass to any Hg command."
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
121 :type '(choice (const :tag "None" nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
122 (string :tag "Argument String")
100180
a5dc2e77b960 (vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
123 (repeat :tag "Argument List" :value ("") string))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
124 :version "22.2"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
125 :group 'vc)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
126
100180
a5dc2e77b960 (vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
127 (defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u
a5dc2e77b960 (vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
128 "String or list of strings specifying switches for Hg diff under VC.
a5dc2e77b960 (vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
129 If nil, use the value of `vc-diff-switches'. If t, use no switches."
99736
015fd0131c0b (vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
130 :type '(choice (const :tag "Unspecified" nil)
015fd0131c0b (vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
131 (const :tag "None" t)
015fd0131c0b (vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
132 (string :tag "Argument String")
100180
a5dc2e77b960 (vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
133 (repeat :tag "Argument List" :value ("") string))
99736
015fd0131c0b (vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
134 :version "23.1"
015fd0131c0b (vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
135 :group 'vc)
015fd0131c0b (vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 99159
diff changeset
136
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
137
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
138 ;;; Properties of the backend
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
139
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
140 (defun vc-hg-revision-granularity () 'repository)
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
141 (defun vc-hg-checkout-model (files) 'implicit)
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
142
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
143 ;;; State querying functions
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
144
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
145 ;;;###autoload (defun vc-hg-registered (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
146 ;;;###autoload "Return non-nil if FILE is registered with hg."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
147 ;;;###autoload (if (vc-find-root file ".hg") ; short cut
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148 ;;;###autoload (progn
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
149 ;;;###autoload (load "vc-hg")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
150 ;;;###autoload (vc-hg-registered file))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
151
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
152 ;; Modeled after the similar function in vc-bzr.el
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
153 (defun vc-hg-registered (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
154 "Return non-nil if FILE is registered with hg."
78166
516805bc7988 (vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78148
diff changeset
155 (when (vc-hg-root file) ; short cut
87455
06f57a4af48c (vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87450
diff changeset
156 (let ((state (vc-hg-state file))) ; expensive
87865
1a3c90d4d8fa * vc-hg.el (vc-hg-registered): Make it work for non-existent
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87844
diff changeset
157 (and state (not (memq state '(ignored unregistered)))))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
158
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
159 (defun vc-hg-state (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
160 "Hg-specific version of `vc-state'."
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
161 (let*
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
162 ((status nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
163 (out
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
164 (with-output-to-string
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
165 (with-current-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
166 standard-output
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
167 (setq status
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
168 (condition-case nil
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
169 ;; Ignore all errors.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
170 (call-process
99862
83ae2ae7a4c4 (vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99783
diff changeset
171 "hg" nil t nil "--cwd" (file-name-directory file)
87455
06f57a4af48c (vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87450
diff changeset
172 "status" "-A" (file-name-nondirectory file))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
173 ;; Some problem happened. E.g. We can't find an `hg'
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
174 ;; executable.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
175 (error nil)))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
176 (when (eq 0 status)
78166
516805bc7988 (vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78148
diff changeset
177 (when (null (string-match ".*: No such file or directory$" out))
516805bc7988 (vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78148
diff changeset
178 (let ((state (aref out 0)))
516805bc7988 (vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78148
diff changeset
179 (cond
87574
21fcd219fd6e * mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87480
diff changeset
180 ((eq state ?=) 'up-to-date)
93118
01d3fd1a2cfe * vc-hg.el (vc-hg-state):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92345
diff changeset
181 ((eq state ?A) 'added)
78166
516805bc7988 (vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78148
diff changeset
182 ((eq state ?M) 'edited)
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
183 ((eq state ?I) 'ignored)
93163
521810ff0616 (vc-hg-state): Return 'removed for removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93162
diff changeset
184 ((eq state ?R) 'removed)
93327
f6aa1bf031f5 (vc-hg-state, vc-hg-dir-state): Deal with 'missing
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93176
diff changeset
185 ((eq state ?!) 'missing)
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
186 ((eq state ??) 'unregistered)
87574
21fcd219fd6e * mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87480
diff changeset
187 ((eq state ?C) 'up-to-date) ;; Older mercurials use this
87455
06f57a4af48c (vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87450
diff changeset
188 (t 'up-to-date)))))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
189
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 83759
diff changeset
190 (defun vc-hg-working-revision (file)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 83759
diff changeset
191 "Hg-specific version of `vc-working-revision'."
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
192 (let*
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
193 ((status nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
194 (out
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
195 (with-output-to-string
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
196 (with-current-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
197 standard-output
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
198 (setq status
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
199 (condition-case nil
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
200 ;; Ignore all errors.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
201 (call-process
99862
83ae2ae7a4c4 (vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99783
diff changeset
202 "hg" nil t nil "--cwd" (file-name-directory file)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
203 "log" "-l1" (file-name-nondirectory file))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
204 ;; Some problem happened. E.g. We can't find an `hg'
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
205 ;; executable.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
206 (error nil)))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
207 (when (eq 0 status)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
208 (if (string-match "changeset: *\\([0-9]*\\)" out)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
209 (match-string 1 out)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
210 "0"))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
211
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
212 ;;; History functions
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
213
87427
1aea302af710 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
214 (defun vc-hg-print-log (files &optional buffer)
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
215 "Get change log associated with FILES."
87427
1aea302af710 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
216 ;; `log-view-mode' needs to have the file names in order to function
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
217 ;; correctly. "hg log" does not print it, so we insert it here by
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
218 ;; hand.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
219
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
220 ;; `vc-do-command' creates the buffer, but we need it before running
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
221 ;; the command.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
222 (vc-setup-buffer buffer)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
223 ;; If the buffer exists from a previous invocation it might be
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
224 ;; read-only.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
225 (let ((inhibit-read-only t))
95966
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
226 (with-current-buffer
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
227 buffer
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
228 (vc-hg-command buffer 0 files "log"))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
229
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
230 (defvar log-view-message-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
231 (defvar log-view-file-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
232 (defvar log-view-font-lock-keywords)
95966
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
233 (defvar log-view-per-file-logs)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
234
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78363
diff changeset
235 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
236 (require 'add-log) ;; we need the add-log faces
95966
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
237 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
238 (set (make-local-variable 'log-view-per-file-logs) nil)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
239 (set (make-local-variable 'log-view-message-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
240 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
241 (set (make-local-variable 'log-view-font-lock-keywords)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
242 (append
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
243 log-view-font-lock-keywords
79725
4ceae4ec8fb2 (vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79722
diff changeset
244 '(
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
245 ;; Handle the case:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
246 ;; user: FirstName LastName <foo@bar>
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
247 ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
248 (1 'change-log-name)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
249 (2 'change-log-email))
79725
4ceae4ec8fb2 (vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79722
diff changeset
250 ;; Handle the cases:
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
251 ;; user: foo@bar
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
252 ;; and
79725
4ceae4ec8fb2 (vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79722
diff changeset
253 ;; user: foo
4ceae4ec8fb2 (vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79722
diff changeset
254 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
4ceae4ec8fb2 (vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79722
diff changeset
255 (1 'change-log-email))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
256 ("^date: \\(.+\\)" (1 'change-log-date))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
257 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
258
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
259 (defun vc-hg-diff (files &optional oldvers newvers buffer)
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
260 "Get a difference report using hg between two revisions of FILES."
95966
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
261 (let* ((firstfile (car files))
101200
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
262 (cwd (if firstfile (file-name-directory firstfile)
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
263 (expand-file-name default-directory)))
95966
054335cbee3d * log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95542
diff changeset
264 (working (and firstfile (vc-working-revision firstfile))))
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
265 (when (and (equal oldvers working) (not newvers))
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
266 (setq oldvers nil))
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
267 (when (and (not oldvers) newvers)
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
268 (setq oldvers working))
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
269 (apply #'vc-hg-command (or buffer "*vc-diff*") nil
101200
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
270 (mapcar (lambda (file) (file-relative-name file cwd)) files)
bbf505632d29 (vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
271 "--cwd" cwd
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
272 "diff"
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
273 (append
100057
9ab9afca4464 (vc-hg-diff): No need to duplicate vc-switches logic.
Glenn Morris <rgm@gnu.org>
parents: 99862
diff changeset
274 (vc-switches 'hg 'diff)
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
275 (when oldvers
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
276 (if newvers
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
277 (list "-r" oldvers "-r" newvers)
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
278 (list "-r" oldvers)))))))
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
279
85460
d36b2b98840f (vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
280 (defun vc-hg-revision-table (files)
d36b2b98840f (vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
281 (let ((default-directory (file-name-directory (car files))))
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
282 (with-temp-buffer
86234
860a7a8e779e * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85510
diff changeset
283 (vc-hg-command t nil files "log" "--template" "{rev} ")
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
284 (split-string
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
285 (buffer-substring-no-properties (point-min) (point-max))))))
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
286
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
287 ;; Modeled after the similar function in vc-cvs.el
85460
d36b2b98840f (vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
288 (defun vc-hg-revision-completion-table (files)
d36b2b98840f (vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
289 (lexical-let ((files files)
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
290 table)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
291 (setq table (lazy-completion-table
85460
d36b2b98840f (vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
292 table (lambda () (vc-hg-revision-table files))))
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
293 table))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
294
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
295 (defun vc-hg-annotate-command (file buffer &optional revision)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
296 "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
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
297 Optional arg REVISION is a revision to annotate from."
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
298 (vc-hg-command buffer 0 file "annotate" "-d" "-n"
94853
1c9a3c7fa4f1 (vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
299 (when revision (concat "-r" revision)))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
300 (with-current-buffer buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
301 (goto-char (point-min))
80582
7c7ae81f80df (vc-hg-annotate-command): Allow white space before version number.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79800
diff changeset
302 (re-search-forward "^[ \t]*[0-9]")
7c7ae81f80df (vc-hg-annotate-command): Allow white space before version number.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79800
diff changeset
303 (delete-region (point-min) (match-beginning 0))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
304
96213
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95966
diff changeset
305 (declare-function vc-annotate-convert-time "vc-annotate" (time))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
306
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
307 ;; The format for one line output by "hg annotate -d -n" looks like this:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
308 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
309 ;; i.e: VERSION_NUMBER DATE: CONTENTS
80585
8c0cc53e8234 (vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80582
diff changeset
310 ;; If the user has set the "--follow" option, the output looks like:
8c0cc53e8234 (vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80582
diff changeset
311 ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS
8c0cc53e8234 (vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80582
diff changeset
312 ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
8c0cc53e8234 (vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80582
diff changeset
313 (defconst vc-hg-annotate-re
8c0cc53e8234 (vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80582
diff changeset
314 "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)[^:\n]*\\(:[^ \n][^:\n]*\\)*: ")
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
315
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
316 (defun vc-hg-annotate-time ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
317 (when (looking-at vc-hg-annotate-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
318 (goto-char (match-end 0))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
319 (vc-annotate-convert-time
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
320 (date-to-time (match-string-no-properties 2)))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
321
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
322 (defun vc-hg-annotate-extract-revision-at-line ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
323 (save-excursion
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
324 (beginning-of-line)
80585
8c0cc53e8234 (vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80582
diff changeset
325 (when (looking-at vc-hg-annotate-re) (match-string-no-properties 1))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
326
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
327 (defun vc-hg-previous-revision (file rev)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
328 (let ((newrev (1- (string-to-number rev))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
329 (when (>= newrev 0)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
330 (number-to-string newrev))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
331
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
332 (defun vc-hg-next-revision (file rev)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
333 (let ((newrev (1+ (string-to-number rev)))
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
334 (tip-revision
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
335 (with-temp-buffer
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
336 (vc-hg-command t 0 nil "tip")
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
337 (goto-char (point-min))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
338 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
339 (string-to-number (match-string-no-properties 1)))))
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
340 ;; We don't want to exceed the maximum possible revision number, ie
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
341 ;; the tip revision.
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
342 (when (<= newrev tip-revision)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
343 (number-to-string newrev))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
344
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
345 ;; Modeled after the similar function in vc-bzr.el
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
346 (defun vc-hg-delete-file (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
347 "Delete FILE and delete it in the hg repository."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
348 (condition-case ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
349 (delete-file file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
350 (file-error nil))
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
351 (vc-hg-command nil 0 file "remove" "--after" "--force"))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
352
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
353 ;; Modeled after the similar function in vc-bzr.el
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
354 (defun vc-hg-rename-file (old new)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
355 "Rename file from OLD to NEW using `hg mv'."
94439
d6a121c992e3 (vc-hg-rename-file): Fix argument order.
Sam Steingold <sds@gnu.org>
parents: 94003
diff changeset
356 (vc-hg-command nil 0 new "mv" old))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
357
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
358 (defun vc-hg-register (files &optional rev comment)
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
359 "Register FILES under hg.
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
360 REV is ignored.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
361 COMMENT is ignored."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
362 (vc-hg-command nil 0 files "add"))
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
363
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
364 (defun vc-hg-create-repo ()
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
365 "Create a new Mercurial repository."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
366 (vc-hg-command nil 0 nil "init"))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
367
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
368 (defalias 'vc-hg-responsible-p 'vc-hg-root)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
369
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
370 ;; Modeled after the similar function in vc-bzr.el
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
371 (defun vc-hg-could-register (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
372 "Return non-nil if FILE could be registered under hg."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
373 (and (vc-hg-responsible-p file) ; shortcut
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
374 (condition-case ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
375 (with-temp-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
376 (vc-hg-command t nil file "add" "--dry-run"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
377 ;; The command succeeds with no output if file is
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
378 ;; registered.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
379 (error))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
380
96519
0197baf37347 *** empty log message ***
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96518
diff changeset
381 ;; FIXME: This would remove the file. Is that correct?
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
382 ;; (defun vc-hg-unregister (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
383 ;; "Unregister FILE from hg."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
384 ;; (vc-hg-command nil nil file "remove"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
385
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
386 (defun vc-hg-checkin (files rev comment)
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78363
diff changeset
387 "Hg-specific version of `vc-backend-checkin'.
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
388 REV is ignored."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
389 (vc-hg-command nil 0 files "commit" "-m" comment))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
390
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 83759
diff changeset
391 (defun vc-hg-find-revision (file rev buffer)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
392 (let ((coding-system-for-read 'binary)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
393 (coding-system-for-write 'binary))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
394 (if rev
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
395 (vc-hg-command buffer 0 file "cat" "-r" rev)
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
396 (vc-hg-command buffer 0 file "cat"))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
397
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
398 ;; Modeled after the similar function in vc-bzr.el
78148
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
399 (defun vc-hg-checkout (file &optional editable rev)
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
400 "Retrieve a revision of FILE.
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
401 EDITABLE is ignored.
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
402 REV is the revision to check out into WORKFILE."
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
403 (let ((coding-system-for-read 'binary)
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
404 (coding-system-for-write 'binary))
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
405 (with-current-buffer (or (get-file-buffer file) (current-buffer))
9cbb2ce8ec8c (vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78086
diff changeset
406 (if rev
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
407 (vc-hg-command t 0 file "cat" "-r" rev)
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
408 (vc-hg-command t 0 file "cat")))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
409
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
410 ;; Modeled after the similar function in vc-bzr.el
78167
252b7f091c04 (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78166
diff changeset
411 (defun vc-hg-workfile-unchanged-p (file)
252b7f091c04 (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78166
diff changeset
412 (eq 'up-to-date (vc-hg-state file)))
252b7f091c04 (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78166
diff changeset
413
96365
65532b2a1819 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 96260
diff changeset
414 ;; Modeled after the similar function in vc-bzr.el
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
415 (defun vc-hg-revert (file &optional contents-done)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
416 (unless contents-done
78182
86c8d81f944f (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78167
diff changeset
417 (with-temp-buffer (vc-hg-command t 0 file "revert"))))
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
418
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
419 ;;; Hg specific functionality.
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
420
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
421 (defvar vc-hg-extra-menu-map
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
422 (let ((map (make-sparse-keymap)))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
423 (define-key map [incoming] '(menu-item "Show incoming" vc-hg-incoming))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
424 (define-key map [outgoing] '(menu-item "Show outgoing" vc-hg-outgoing))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
425 map))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
426
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
427 (defun vc-hg-extra-menu () vc-hg-extra-menu-map)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
428
92122
74bf6df13b6c * vc.el (vc-find-revision): Make vc-parent-buffer local before
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92093
diff changeset
429 (defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
91951
d42fe75822fe * vc.el (vc-status-menu, vc-status-menu-map-filter): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87903
diff changeset
430
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
431 (define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing")
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
432
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
433 (define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming")
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
434
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
435 (defstruct (vc-hg-extra-fileinfo
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
436 (:copier nil)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
437 (:constructor vc-hg-create-extra-fileinfo (rename-state extra-name))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
438 (:conc-name vc-hg-extra-fileinfo->))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
439 rename-state ;; rename or copy state
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
440 extra-name) ;; original name for copies and rename targets, new name for
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
441
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
442 (declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
96213
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95966
diff changeset
443
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
444 (defun vc-hg-dir-printer (info)
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
445 "Pretty-printer for the vc-dir-fileinfo structure."
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
446 (let ((extra (vc-dir-fileinfo->extra info)))
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
447 (vc-default-dir-printer 'Hg info)
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
448 (when extra
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
449 (insert (propertize
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
450 (format " (%s %s)"
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
451 (case (vc-hg-extra-fileinfo->rename-state extra)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
452 ('copied "copied from")
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
453 ('renamed-from "renamed from")
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
454 ('renamed-to "renamed to"))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
455 (vc-hg-extra-fileinfo->extra-name extra))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
456 'face 'font-lock-comment-face)))))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
457
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93957
diff changeset
458 (defun vc-hg-after-dir-status (update-function)
87844
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
459 (let ((status-char nil)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
460 (file nil)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
461 (translation '((?= . up-to-date)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
462 (?C . up-to-date)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
463 (?A . added)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
464 (?R . removed)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
465 (?M . edited)
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
466 (?I . ignored)
93176
c985261aee9c * vc-hg.el (vc-hg-after-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93163
diff changeset
467 (?! . missing)
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
468 (? . copy-rename-line)
87844
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
469 (?? . unregistered)))
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
470 (translated nil)
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
471 (result nil)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
472 (last-added nil)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
473 (last-line-copy nil))
87844
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
474 (goto-char (point-min))
87599
efe45ef69877 * vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87574
diff changeset
475 (while (not (eobp))
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
476 (setq translated (cdr (assoc (char-after) translation)))
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
477 (setq file
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
478 (buffer-substring-no-properties (+ (point) 2)
87844
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
479 (line-end-position)))
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
480 (cond ((not translated)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
481 (setq last-line-copy nil))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
482 ((eq translated 'up-to-date)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
483 (setq last-line-copy nil))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
484 ((eq translated 'copy-rename-line)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
485 ;; For copied files the output looks like this:
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
486 ;; A COPIED_FILE_NAME
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
487 ;; ORIGINAL_FILE_NAME
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
488 (setf (nth 2 last-added)
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
489 (vc-hg-create-extra-fileinfo 'copied file))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
490 (setq last-line-copy t))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
491 ((and last-line-copy (eq translated 'removed))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
492 ;; For renamed files the output looks like this:
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
493 ;; A NEW_FILE_NAME
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
494 ;; ORIGINAL_FILE_NAME
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
495 ;; R ORIGINAL_FILE_NAME
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
496 ;; We need to adjust the previous entry to not think it is a copy.
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
497 (setf (vc-hg-extra-fileinfo->rename-state (nth 2 last-added))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
498 'renamed-from)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
499 (push (list file translated
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
500 (vc-hg-create-extra-fileinfo
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
501 'renamed-to (nth 0 last-added))) result)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
502 (setq last-line-copy nil))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
503 (t
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
504 (setq last-added (list file translated nil))
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
505 (push last-added result)
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
506 (setq last-line-copy nil)))
87599
efe45ef69877 * vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87574
diff changeset
507 (forward-line))
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93957
diff changeset
508 (funcall update-function result)))
87844
3bd7c8c8bbe7 * vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87674
diff changeset
509
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93957
diff changeset
510 (defun vc-hg-dir-status (dir update-function)
94511
40171abb3041 (vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94481
diff changeset
511 (vc-hg-command (current-buffer) 'async dir "status" "-C")
93382
8e46096e0cb3 * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93327
diff changeset
512 (vc-exec-after
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93957
diff changeset
513 `(vc-hg-after-dir-status (quote ,update-function))))
87599
efe45ef69877 * vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87574
diff changeset
514
98492
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
515 (defun vc-hg-dir-status-files (dir files default-state update-function)
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
516 (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files)
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
517 (vc-exec-after
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
518 `(vc-hg-after-dir-status (quote ,update-function))))
b3eefcc54430 (vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96519
diff changeset
519
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
520 (defun vc-hg-dir-extra-header (name &rest commands)
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
521 (concat (propertize name 'face 'font-lock-type-face)
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
522 (propertize
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
523 (with-temp-buffer
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
524 (apply 'vc-hg-command (current-buffer) 0 nil commands)
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
525 (buffer-substring-no-properties (point-min) (1- (point-max))))
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
526 'face 'font-lock-variable-name-face)))
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
527
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
528 (defun vc-hg-dir-extra-headers (dir)
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
529 "Generate extra status headers for a Mercurial tree."
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
530 (let ((default-directory dir))
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
531 (concat
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
532 (vc-hg-dir-extra-header "Root : " "root") "\n"
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
533 (vc-hg-dir-extra-header "Branch : " "id" "-b") "\n"
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
534 (vc-hg-dir-extra-header "Tags : " "id" "-t") ; "\n"
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
535 ;; these change after each commit
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
536 ;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n"
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98492
diff changeset
537 ;; (vc-hg-dir-extra-header "Global id : " "id" "-i")
95542
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
538 )))
dfffc14d8182 (vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents: 95087
diff changeset
539
96519
0197baf37347 *** empty log message ***
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96518
diff changeset
540 ;; FIXME: this adds another top level menu, instead figure out how to
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
541 ;; replace the Log-View menu.
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
542 (easy-menu-define log-view-mode-menu vc-hg-outgoing-mode-map
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
543 "Hg-outgoing Display Menu"
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
544 `("Hg-outgoing"
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
545 ["Push selected" vc-hg-push]))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
546
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
547 (easy-menu-define log-view-mode-menu vc-hg-incoming-mode-map
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
548 "Hg-incoming Display Menu"
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
549 `("Hg-incoming"
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
550 ["Pull selected" vc-hg-pull]))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
551
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
552 (defun vc-hg-outgoing ()
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
553 (interactive)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
554 (let ((bname "*Hg outgoing*"))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
555 (vc-hg-command bname 0 nil "outgoing" "-n")
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
556 (pop-to-buffer bname)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
557 (vc-hg-outgoing-mode)))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
558
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
559 (defun vc-hg-incoming ()
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
560 (interactive)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
561 (let ((bname "*Hg incoming*"))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
562 (vc-hg-command bname 0 nil "incoming" "-n")
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
563 (pop-to-buffer bname)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
564 (vc-hg-incoming-mode)))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
565
86234
860a7a8e779e * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85510
diff changeset
566 (declare-function log-view-get-marked "log-view" ())
860a7a8e779e * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85510
diff changeset
567
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
568 ;; XXX maybe also add key bindings for these functions.
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
569 (defun vc-hg-push ()
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
570 (interactive)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
571 (let ((marked-list (log-view-get-marked)))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
572 (if marked-list
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
573 (vc-hg-command
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
574 nil 0 nil
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
575 (cons "push"
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
576 (apply 'nconc
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
577 (mapcar (lambda (arg) (list "-r" arg)) marked-list))))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
578 (error "No log entries selected for push"))))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
579
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
580 (defun vc-hg-pull ()
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
581 (interactive)
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
582 (let ((marked-list (log-view-get-marked)))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
583 (if marked-list
91991
f40c311f15ac Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91953
diff changeset
584 (vc-hg-command
83759
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
585 nil 0 nil
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
586 (cons "pull"
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
587 (apply 'nconc
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
588 (mapcar (lambda (arg) (list "-r" arg)) marked-list))))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
589 (error "No log entries selected for pull"))))
493b2df20f41 (vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 82245
diff changeset
590
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
591 ;;; Internal functions
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
592
81964
ba5a7f46413b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81757
diff changeset
593 (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
594 "A wrapper around `vc-do-command' for use in vc-hg.el.
99862
83ae2ae7a4c4 (vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99783
diff changeset
595 The difference to vc-do-command is that this function always invokes `hg',
83ae2ae7a4c4 (vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99783
diff changeset
596 and that it passes `vc-hg-global-switches' to it before FLAGS."
83ae2ae7a4c4 (vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99783
diff changeset
597 (apply 'vc-do-command (or buffer "*vc*") okstatus "hg" file-or-list
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
598 (if (stringp vc-hg-global-switches)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
599 (cons vc-hg-global-switches flags)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
600 (append vc-hg-global-switches
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
601 flags))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
602
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
603 (defun vc-hg-root (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
604 (vc-find-root file ".hg"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
605
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
606 (provide 'vc-hg)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
607
78086
9a13508185dc Add arch tagline
Miles Bader <miles@gnu.org>
parents: 78075
diff changeset
608 ;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954
78075
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
609 ;;; vc-hg.el ends here