annotate lisp/vc-hg.el @ 90993:a9e96c4a1a90

(Ffontp): Fix docstring.
author Kenichi Handa <handa@m17n.org>
date Thu, 26 Jul 2007 11:42:32 +0000
parents 878cfe0c0c5a
children 61db43184da9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
81474
51869b1d11fd * 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
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
3 ;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
4
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5 ;; Author: Ivan Kanis
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
6 ;; Keywords: tools
81479
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
7
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
8 ;; This file is part of GNU Emacs.
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
9
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
81474
51869b1d11fd * 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
81479
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
13 ;; any later version.
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
14
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
18 ;; GNU General Public License for more details.
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
19
81474
51869b1d11fd * 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
81479
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
2d50f85a03de Change license wording to match the rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents: 81476
diff changeset
23 ;; Boston, MA 02110-1301, USA.
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25 ;;; Commentary:
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27 ;; This is a mercurial version control backend
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
28
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
29 ;;; Thanks:
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
30
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
31 ;;; Bugs:
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
32
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
33 ;;; Installation:
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
34
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
35 ;;; Todo:
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
36
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
37 ;; Implement the rest of the vc interface. See the comment at the
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
38 ;; beginning of vc.el. The current status is:
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
39
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
40 ;; 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
41 ;; 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
42 ;; * 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
43 ;; STATE-QUERYING FUNCTIONS
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
44 ;; * registered (file) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
45 ;; * state (file) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
46 ;; - state-heuristic (file) ?? PROBABLY NOT NEEDED
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
47 ;; - dir-state (dir) OK
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
48 ;; * workfile-version (file) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
49 ;; - latest-on-branch-p (file) ??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
50 ;; * checkout-model (file) OK
81986
7179773d9d7f (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81984
diff changeset
51 ;; - workfile-unchanged-p (file) OK
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
52 ;; - mode-line-string (file) NOT NEEDED
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
53 ;; - dired-state-info (file) OK
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
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
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
57 ;; - init-version () NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
58 ;; - responsible-p (file) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
59 ;; - could-register (file) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
60 ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
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
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
63 ;; * find-version (file rev buffer) 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
64 ;; * checkout (file &optional editable rev) OK
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
65 ;; * revert (file &optional contents-done) OK
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
66 ;; - rollback (files) ?? PROBABLY NOT NEEDED
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
67 ;; - merge (file rev1 rev2) NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
68 ;; - merge-news (file) NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
69 ;; - steal-lock (file &optional version) NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
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
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
72 ;; - log-view-mode () OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
73 ;; - show-log-entry (version) NOT NEEDED, DEFAULT IS GOOD
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
74 ;; - wash-log (file) ??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
75 ;; - logentry-check () NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
76 ;; - comment-history (file) NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
77 ;; - 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
78 ;; * diff (files &optional rev1 rev2 buffer) OK
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
79 ;; - revision-completion-table (file) OK
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
80 ;; - diff-tree (dir &optional rev1 rev2) TEST IT
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
81 ;; - annotate-command (file buf &optional rev) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
82 ;; - annotate-time () OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
83 ;; - annotate-current-time () ?? NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
84 ;; - annotate-extract-revision-at-line () OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
85 ;; SNAPSHOT SYSTEM
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
86 ;; - create-snapshot (dir name branchp) NEEDED (probably branch?)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
87 ;; - assign-name (file name) NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
88 ;; - retrieve-snapshot (dir name update) ?? NEEDED??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
89 ;; MISCELLANEOUS
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
90 ;; - make-version-backups-p (file) ??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
91 ;; - repository-hostname (dirname) ??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
92 ;; - previous-version (file rev) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
93 ;; - next-version (file rev) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
94 ;; - check-headers () ??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
95 ;; - clear-headers () ??
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
96 ;; - delete-file (file) TEST IT
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
97 ;; - rename-file (old new) OK
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
98 ;; - find-file-hook () PROBABLY NOT NEEDED
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
99 ;; - find-file-not-found-hook () PROBABLY NOT NEEDED
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
100
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
101 ;; Implement Stefan Monnier's advice:
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
102 ;; vc-hg-registered and vc-hg-state
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
103 ;; Both of those functions should be super extra careful to fail gracefully in
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
104 ;; unexpected circumstances. The reason this is important is that any error
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
105 ;; there will prevent the user from even looking at the file :-(
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
106 ;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
107 ;; mercurial's control and extracting the current revision should be done
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
108 ;; without even using `hg' (this way even if you don't have `hg' installed,
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
109 ;; Emacs is able to tell you this file is under mercurial's control).
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
110
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
111 ;;; History:
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
112 ;;
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
113
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
114 ;;; Code:
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
115
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
116 (eval-when-compile
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
117 (require 'cl)
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
118 (require 'vc))
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
119
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
120 ;;; Customization options
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
121
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
122 (defcustom vc-hg-global-switches nil
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
123 "*Global switches to pass to any Hg command."
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
124 :type '(choice (const :tag "None" nil)
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
125 (string :tag "Argument String")
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
126 (repeat :tag "Argument List"
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
127 :value ("")
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
128 string))
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
129 :version "22.2"
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
130 :group 'vc)
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
131
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
132
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
133 ;;; 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
134
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
135 (defun vc-hg-revision-granularity ()
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
136 'repository)
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
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
138 ;;; State querying functions
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
139
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
140 ;;;###autoload (defun vc-hg-registered (file)
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
141 ;;;###autoload "Return non-nil if FILE is registered with hg."
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
142 ;;;###autoload (if (vc-find-root file ".hg") ; short cut
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
143 ;;;###autoload (progn
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
144 ;;;###autoload (load "vc-hg")
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
145 ;;;###autoload (vc-hg-registered file))))
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
146
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
147 ;; Modelled after the similar function in vc-bzr.el
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148 (defun vc-hg-registered (file)
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
149 "Return non-nil if FILE is registered with hg."
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
150 (when (vc-hg-root file) ; short cut
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
151 (vc-hg-state file))) ; expensive
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
152
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
153 (defun vc-hg-state (file)
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
154 "Hg-specific version of `vc-state'."
81702
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
155 (let*
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
156 ((status nil)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
157 (out
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
158 (with-output-to-string
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
159 (with-current-buffer
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
160 standard-output
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
161 (setq status
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
162 (condition-case nil
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
163 ;; Ignore all errors.
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
164 (call-process
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
165 "hg" nil t nil "--cwd" (file-name-directory file)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
166 "status" (file-name-nondirectory file))
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
167 ;; Some problem happened. E.g. We can't find an `hg'
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
168 ;; executable.
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
169 (error nil)))))))
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
170 (when (eq 0 status)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
171 (if (eq 0 (length out)) 'up-to-date
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
172 (when (null (string-match ".*: No such file or directory$" out))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
173 (let ((state (aref out 0)))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
174 (cond
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
175 ((eq state ?A) 'edited)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
176 ((eq state ?M) 'edited)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
177 ((eq state ?R) nil)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
178 ((eq state ??) nil)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
179 (t 'up-to-date))))))))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
180
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
181 (defun vc-hg-dir-state (dir)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
182 (with-temp-buffer
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
183 (vc-hg-command (current-buffer) nil nil "status")
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
184 (goto-char (point-min))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
185 (let ((status-char nil)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
186 (file nil))
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
187 (while (not (eobp))
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
188 (setq status-char (char-after))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
189 (setq file
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
190 (expand-file-name
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
191 (buffer-substring-no-properties (+ (point) 2)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
192 (line-end-position))))
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
193 (cond
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
194 ;; The rest of the possible states in "hg status" output:
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
195 ;; R = removed
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
196 ;; ! = deleted, but still tracked
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
197 ;; ? = not tracked
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
198 ;; should not show up in vc-dired, so don't deal with them
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
199 ;; here.
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
200 ((eq status-char ?A)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
201 (vc-file-setprop file 'vc-workfile-version "0")
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
202 (vc-file-setprop file 'vc-state 'edited))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
203 ((eq status-char ?M)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
204 (vc-file-setprop file 'vc-state 'edited))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
205 ((eq status-char ??)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
206 (vc-file-setprop file 'vc-backend 'none)
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
207 (vc-file-setprop file 'vc-state 'nil)))
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
208 (forward-line)))))
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
209
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
210 (defun vc-hg-workfile-version (file)
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
211 "Hg-specific version of `vc-workfile-version'."
81702
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
212 (let*
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
213 ((status nil)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
214 (out
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
215 (with-output-to-string
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
216 (with-current-buffer
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
217 standard-output
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
218 (setq status
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
219 (condition-case nil
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
220 ;; Ignore all errors.
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
221 (call-process
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
222 "hg" nil t nil "--cwd" (file-name-directory file)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
223 "log" "-l1" (file-name-nondirectory file))
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
224 ;; Some problem happened. E.g. We can't find an `hg'
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
225 ;; executable.
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
226 (error nil)))))))
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
227 (when (eq 0 status)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
228 (if (string-match "changeset: *\\([0-9]*\\)" out)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
229 (match-string 1 out)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
230 "0"))))
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
231
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
232 ;;; History functions
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
233
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
234 (defun vc-hg-print-log(files &optional buffer)
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
235 "Get change log associated with FILES."
81564
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
236 ;; `log-view-mode' needs to have the file name in order to function
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
237 ;; correctly. "hg log" does not print it, so we insert it here by
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
238 ;; hand.
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
239
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
240 ;; `vc-do-command' creates the buffer, but we need it before running
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
241 ;; the command.
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
242 (vc-setup-buffer buffer)
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
243 ;; If the buffer exists from a previous invocation it might be
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
244 ;; read-only.
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
245 (let ((inhibit-read-only t))
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
246 ;; We need to loop and call "hg log" on each file separately.
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
247 ;; "hg log" with multiple file arguments mashes all the logs
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
248 ;; together.
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
249 (dolist (file files)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
250 (with-current-buffer
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
251 buffer
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
252 (insert "File: " (file-name-nondirectory file) "\n"))
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
253 (vc-hg-command buffer 0 file "log"))))
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
254
81538
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
255 (defvar log-view-message-re)
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
256 (defvar log-view-file-re)
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
257 (defvar log-view-font-lock-keywords)
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
258
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
259 (define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View"
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
260 (require 'add-log) ;; we need the faces add-log
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
261 ;; Don't have file markers, so use impossible regexp.
81564
99961edaa9c1 (vc-hg-print-log): Insert the file name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81538
diff changeset
262 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
81538
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
263 (set (make-local-variable 'log-view-message-re)
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
264 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
265 (set (make-local-variable 'log-view-font-lock-keywords)
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
266 (append
81575
cea1e05b3c83 * vc-hg.el (vc-hg-log-view-mode): Revert incorrect change.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81572
diff changeset
267 log-view-font-lock-keywords
81538
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
268 ;; Handle the case:
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
269 ;; user: foo@bar
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
270 '(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
271 (1 'change-log-email))
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
272 ;; Handle the case:
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
273 ;; user: FirstName LastName <foo@bar>
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
274 ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
275 (1 'change-log-name)
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
276 (2 'change-log-email))
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
277 ("^date: \\(.+\\)" (1 'change-log-date))
81575
cea1e05b3c83 * vc-hg.el (vc-hg-log-view-mode): Revert incorrect change.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81572
diff changeset
278 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
81538
ac8e3d72984f (vc-hg-log-view-mode): New mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81526
diff changeset
279
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
280 (defun vc-hg-diff (files &optional oldvers newvers buffer)
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
281 "Get a difference report using hg between two versions of FILES."
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
282 (let ((working (vc-workfile-version (car files))))
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
283 (if (and (equal oldvers working) (not newvers))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
284 (setq oldvers nil))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
285 (if (and (not oldvers) newvers)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
286 (setq oldvers working))
81998
52950d8efd2b (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81986
diff changeset
287 (apply #'vc-hg-command (or buffer "*vc-diff*") nil
52950d8efd2b (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81986
diff changeset
288 (mapcar (lambda (file) (file-name-nondirectory file)) files)
52950d8efd2b (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81986
diff changeset
289 "--cwd" (file-name-directory (car files))
52950d8efd2b (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81986
diff changeset
290 "diff"
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
291 (append
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
292 (if oldvers
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
293 (if newvers
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
294 (list "-r" oldvers "-r" newvers)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
295 (list "-r" oldvers))
81998
52950d8efd2b (vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81986
diff changeset
296 (list ""))))))
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
297
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
298 (defun vc-hg-revision-table (file)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
299 (let ((default-directory (file-name-directory file)))
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
300 (with-temp-buffer
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
301 (vc-hg-command t nil file "log" "--template" "{rev} ")
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
302 (split-string
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
303 (buffer-substring-no-properties (point-min) (point-max))))))
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
304
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
305 ;; Modelled after the similar function in vc-cvs.el
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
306 (defun vc-hg-revision-completion-table (file)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
307 (lexical-let ((file file)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
308 table)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
309 (setq table (lazy-completion-table
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
310 table (lambda () (vc-hg-revision-table file))))
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
311 table))
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
312
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
313 (defun vc-hg-diff-tree (file &optional oldvers newvers buffer)
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
314 (vc-hg-diff (list file) oldvers newvers buffer))
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
315
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
316 (defun vc-hg-annotate-command (file buffer &optional version)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
317 "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
318 Optional arg VERSION is a version to annotate from."
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
319 (vc-hg-command buffer 0 file "annotate" "-d" "-n" (if version (concat "-r" version)))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
320 (with-current-buffer buffer
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
321 (goto-char (point-min))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
322 (re-search-forward "^[0-9]")
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
323 (delete-region (point-min) (1- (point)))))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
324
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
325
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
326 ;; The format for one line output by "hg annotate -d -n" looks like this:
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
327 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
328 ;; i.e: VERSION_NUMBER DATE: CONTENTS
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
329 (defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ")
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
330
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
331 (defun vc-hg-annotate-time ()
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
332 (when (looking-at vc-hg-annotate-re)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
333 (goto-char (match-end 0))
81566
0e2a83705e5f (vc-hg-registered): Add an autoloaded version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81564
diff changeset
334 (vc-annotate-convert-time
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
335 (date-to-time (match-string-no-properties 2)))))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
336
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
337 (defun vc-hg-annotate-extract-revision-at-line ()
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
338 (save-excursion
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
339 (beginning-of-line)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
340 (if (looking-at vc-hg-annotate-re) (match-string-no-properties 1))))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
341
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
342 (defun vc-hg-previous-version (file rev)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
343 (let ((newrev (1- (string-to-number rev))))
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
344 (when (>= newrev 0)
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
345 (number-to-string newrev))))
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
346
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
347 (defun vc-hg-next-version (file rev)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
348 (let ((newrev (1+ (string-to-number rev)))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
349 (tip-version
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
350 (with-temp-buffer
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
351 (vc-hg-command t 0 nil "tip")
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
352 (goto-char (point-min))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
353 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
354 (string-to-number (match-string-no-properties 1)))))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
355 ;; We don't want to exceed the maximum possible version number, ie
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
356 ;; the tip version.
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
357 (when (<= newrev tip-version)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
358 (number-to-string newrev))))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
359
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
360 ;; Modelled after the similar function in vc-bzr.el
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
361 (defun vc-hg-delete-file (file)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
362 "Delete FILE and delete it in the hg repository."
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
363 (condition-case ()
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
364 (delete-file file)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
365 (file-error nil))
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
366 (vc-hg-command nil 0 file "remove" "--after" "--force"))
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
367
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
368 ;; Modelled after the similar function in vc-bzr.el
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
369 (defun vc-hg-rename-file (old new)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
370 "Rename file from OLD to NEW using `hg mv'."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
371 (vc-hg-command nil 0 new old "mv"))
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
372
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
373 (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
374 "Register FILES under hg.
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
375 REV is ignored.
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
376 COMMENT is ignored."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
377 (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
378
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
379 (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
380 "Create a new Mercurial repository."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
381 (vc-hg-command nil 0 nil "init"))
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
382
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
383 (defalias 'vc-hg-responsible-p 'vc-hg-root)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
384
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
385 ;; Modelled after the similar function in vc-bzr.el
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
386 (defun vc-hg-could-register (file)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
387 "Return non-nil if FILE could be registered under hg."
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
388 (and (vc-hg-responsible-p file) ; shortcut
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
389 (condition-case ()
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
390 (with-temp-buffer
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
391 (vc-hg-command t nil file "add" "--dry-run"))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
392 ;; The command succeeds with no output if file is
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
393 ;; registered.
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
394 (error))))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
395
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
396 ;; XXX This would remove the file. Is that correct?
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
397 ;; (defun vc-hg-unregister (file)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
398 ;; "Unregister FILE from hg."
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
399 ;; (vc-hg-command nil nil file "remove"))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
400
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
401 (defun vc-hg-checkin (files rev comment)
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
402 "HG-specific version of `vc-backend-checkin'.
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
403 REV is ignored."
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
404 (vc-hg-command nil 0 files "commit" "-m" comment))
81526
145f53e0ff66 Add to do items.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81479
diff changeset
405
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
406 (defun vc-hg-find-version (file rev buffer)
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
407 (let ((coding-system-for-read 'binary)
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
408 (coding-system-for-write 'binary))
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
409 (if rev
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
410 (vc-hg-command buffer 0 file "cat" "-r" rev)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
411 (vc-hg-command buffer 0 file "cat"))))
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
412
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
413 ;; Modelled after the similar function in vc-bzr.el
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
414 (defun vc-hg-checkout (file &optional editable rev)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
415 "Retrieve a revision of FILE.
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
416 EDITABLE is ignored.
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
417 REV is the revision to check out into WORKFILE."
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
418 (let ((coding-system-for-read 'binary)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
419 (coding-system-for-write 'binary))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
420 (with-current-buffer (or (get-file-buffer file) (current-buffer))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
421 (if rev
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
422 (vc-hg-command t 0 file "cat" "-r" rev)
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
423 (vc-hg-command t 0 file "cat")))))
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
424
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
425 (defun vc-hg-checkout-model (file)
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
426 'implicit)
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
427
81986
7179773d9d7f (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81984
diff changeset
428 ;; Modelled after the similar function in vc-bzr.el
7179773d9d7f (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81984
diff changeset
429 (defun vc-hg-workfile-unchanged-p (file)
7179773d9d7f (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81984
diff changeset
430 (eq 'up-to-date (vc-hg-state file)))
7179773d9d7f (vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81984
diff changeset
431
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
432 (defun vc-hg-dired-state-info (file)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
433 "Hg-specific version of `vc-dired-state-info'."
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
434 (let ((hg-state (vc-state file)))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
435 (if (eq hg-state 'edited)
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
436 (if (equal (vc-workfile-version file) "0")
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
437 "(added)" "(modified)")
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
438 ;; fall back to the default VC representation
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
439 (vc-default-dired-state-info 'HG file))))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81964
diff changeset
440
81702
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
441 ;; Modelled after the similar function in vc-bzr.el
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
442 (defun vc-hg-revert (file &optional contents-done)
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
443 (unless contents-done
82012
878cfe0c0c5a (vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81998
diff changeset
444 (with-temp-buffer (vc-hg-command t 0 file "revert"))))
81702
fc97b55f9678 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81575
diff changeset
445
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
446 ;;; Internal functions
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
447
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
448 (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
449 "A wrapper around `vc-do-command' for use in vc-hg.el.
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
450 The difference to vc-do-command is that this function always invokes `hg',
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
451 and that it passes `vc-hg-global-switches' to it before FLAGS."
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
452 (apply 'vc-do-command buffer okstatus "hg" file-or-list
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
453 (if (stringp vc-hg-global-switches)
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
454 (cons vc-hg-global-switches flags)
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
455 (append vc-hg-global-switches
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
456 flags))))
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
457
81726
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
458 (defun vc-hg-root (file)
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
459 (vc-find-root file ".hg"))
b7c76df62fba (vc-hg-root): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
460
81474
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
461 (provide 'vc-hg)
51869b1d11fd * vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
462
81757
d4e68ecdb000 Add arch tagline
Miles Bader <miles@gnu.org>
parents: 81726
diff changeset
463 ;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954
81476
3dedb2297b98 (vc-hg-global-switches): Simplify.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81474
diff changeset
464 ;;; vc-hg.el ends here