annotate lisp/vc-hg.el @ 78075:dbe1fd006899

vc-hg.el: New file.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 06 Jul 2007 21:24:38 +0000
parents
children 9a13508185dc
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
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
3 ;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
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 ;; Version: 1889
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
10
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
14 ;; any later version.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
15
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
16 ;; 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
17 ;; 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
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
19 ;; GNU General Public License for more details.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
20
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24 ;; Boston, MA 02110-1301, USA.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26 ;;; Commentary:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
28 ;; This is a mercurial version control backend
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
29
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
30 ;;; Thanks:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
31
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
32 ;;; Bugs:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
33
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
34 ;;; Installation:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
35
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
36 ;;; Todo:
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 ;; Implement the rest of the vc interface. See the comment at the
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
39 ;; beginning of vc.el. The current status is:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
40
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
41 ;; FUNCTION NAME STATUS
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
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
44 ;; - state-heuristic (file) ?? PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
45 ;; - dir-state (dir) NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
46 ;; * workfile-version (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
47 ;; - latest-on-branch-p (file) ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
48 ;; * checkout-model (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
49 ;; - workfile-unchanged-p (file) ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
50 ;; - mode-line-string (file) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
51 ;; - dired-state-info (file) NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
52 ;; STATE-CHANGING FUNCTIONS
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
53 ;; * register (file &optional rev comment) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
54 ;; - init-version () NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
55 ;; - responsible-p (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
56 ;; - could-register (file) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
57 ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
58 ;; - unregister (file) COMMENTED OUT, MAY BE INCORRECT
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
59 ;; * checkin (file rev comment) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
60 ;; * find-version (file rev buffer) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
61 ;; * checkout (file &optional editable rev) NOT NEEDED, COMMENTED OUT
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
62 ;; * revert (file &optional contents-done) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
63 ;; - cancel-version (file editable) ?? PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
64 ;; - merge (file rev1 rev2) NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
65 ;; - merge-news (file) NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
66 ;; - steal-lock (file &optional version) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
67 ;; HISTORY FUNCTIONS
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
68 ;; * print-log (file &optional buffer) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
69 ;; - log-view-mode () OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
70 ;; - show-log-entry (version) NOT NEEDED, DEFAULT IS GOOD
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
71 ;; - wash-log (file) ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
72 ;; - logentry-check () NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
73 ;; - comment-history (file) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
74 ;; - update-changelog (files) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
75 ;; * diff (file &optional rev1 rev2 buffer) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
76 ;; - revision-completion-table (file) ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
77 ;; - diff-tree (dir &optional rev1 rev2) TEST IT
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
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
80 ;; - annotate-current-time () ?? NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
81 ;; - annotate-extract-revision-at-line () OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
82 ;; SNAPSHOT SYSTEM
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
83 ;; - create-snapshot (dir name branchp) NEEDED (probably branch?)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
84 ;; - assign-name (file name) NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
85 ;; - retrieve-snapshot (dir name update) ?? NEEDED??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
86 ;; MISCELLANEOUS
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
87 ;; - make-version-backups-p (file) ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
88 ;; - repository-hostname (dirname) ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
89 ;; - previous-version (file rev) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
90 ;; - next-version (file rev) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
91 ;; - check-headers () ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
92 ;; - clear-headers () ??
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
93 ;; - delete-file (file) TEST IT
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
94 ;; - rename-file (old new) OK
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
95 ;; - find-file-hook () PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
96 ;; - find-file-not-found-hook () PROBABLY NOT NEEDED
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
97
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
98 ;; Implement Stefan Monnier's advice:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
99 ;; vc-hg-registered and vc-hg-state
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
100 ;; 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
101 ;; 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
102 ;; 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
103 ;; 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
104 ;; 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
105 ;; 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
106 ;; 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
107
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
108 ;;; History:
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
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
111 ;;; Code:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
112
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
113 (eval-when-compile
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
114 (require 'vc))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
115
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
116 ;; XXX This should be moved to vc-hooks after this gets a bit more
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
117 ;; testing in the trunk.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
118 (add-to-list 'vc-handled-backends 'HG)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
119
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
120 ;;; Customization options
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
121
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
122 (defcustom vc-hg-global-switches nil
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
123 "*Global switches to pass to any Hg command."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
124 :type '(choice (const :tag "None" nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
125 (string :tag "Argument String")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
126 (repeat :tag "Argument List"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
127 :value ("")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
128 string))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
129 :version "22.2"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
130 :group 'vc)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
131
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
132 ;;; State querying functions
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
133
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
134 ;;;###autoload (defun vc-hg-registered (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
135 ;;;###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
136 ;;;###autoload (if (vc-find-root file ".hg") ; short cut
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
137 ;;;###autoload (progn
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
138 ;;;###autoload (load "vc-hg")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
139 ;;;###autoload (vc-hg-registered file))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
140
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
141 ;; Modelled after the similar function in vc-bzr.el
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
142 (defun vc-hg-registered (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
143 "Return non-nil if FILE is registered with hg."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
144 (if (vc-hg-root file) ; short cut
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
145 (vc-hg-state file))) ; expensive
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
146
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
147 (defun vc-hg-state (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148 "Hg-specific version of `vc-state'."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
149 (let*
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
150 ((status nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
151 (out
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
152 (with-output-to-string
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
153 (with-current-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
154 standard-output
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
155 (setq status
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
156 (condition-case nil
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
157 ;; Ignore all errors.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
158 (call-process
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
159 "hg" nil t nil "--cwd" (file-name-directory file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
160 "status" (file-name-nondirectory file))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
161 ;; 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
162 ;; executable.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
163 (error nil)))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
164 (when (eq 0 status)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
165 (if (eq 0 (length out)) 'up-to-date
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
166 (let ((state (aref out 0)))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
167 (cond
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
168 ((eq state ?M) 'edited)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
169 ((eq state ?A) 'edited)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
170 ((eq state ?P) 'needs-patch)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
171 ((eq state ??) nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
172 (t 'up-to-date)))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
173
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
174 (defun vc-hg-workfile-version (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
175 "Hg-specific version of `vc-workfile-version'."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
176 (let*
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
177 ((status nil)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
178 (out
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
179 (with-output-to-string
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
180 (with-current-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
181 standard-output
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
182 (setq status
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
183 (condition-case nil
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
184 ;; Ignore all errors.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
185 (call-process
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
186 "hg" nil t nil "--cwd" (file-name-directory file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
187 "log" "-l1" (file-name-nondirectory file))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
188 ;; 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
189 ;; executable.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
190 (error nil)))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
191 (when (eq 0 status)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
192 (if (string-match "changeset: *\\([0-9]*\\)" out)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
193 (match-string 1 out)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
194 "0"))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
195
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
196 ;;; History functions
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
197
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
198 (defun vc-hg-print-log(file &optional buffer)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
199 "Get change log associated with FILE."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
200 ;; `log-view-mode' needs to have the file name in order to function
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
201 ;; 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
202 ;; hand.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
203
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
204 ;; `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
205 ;; the command.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
206 (vc-setup-buffer buffer)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
207 ;; 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
208 ;; read-only.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
209 (let ((inhibit-read-only t))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
210 (with-current-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
211 buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
212 (insert "File: " (file-name-nondirectory file) "\n")))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
213 (vc-hg-command
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
214 buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
215 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
216 file "log"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
217
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
218 (defvar log-view-message-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
219 (defvar log-view-file-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
220 (defvar log-view-font-lock-keywords)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
221
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
222 (define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
223 (require 'add-log) ;; we need the faces add-log
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
224 ;; Don't have file markers, so use impossible regexp.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
225 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
226 (set (make-local-variable 'log-view-message-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
227 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
228 (set (make-local-variable 'log-view-font-lock-keywords)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
229 (append
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
230 log-view-font-lock-keywords
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
231 ;; Handle the case:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
232 ;; user: foo@bar
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
233 '(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
234 (1 'change-log-email))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
235 ;; Handle the case:
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
236 ;; user: FirstName LastName <foo@bar>
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
237 ("^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
238 (1 'change-log-name)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
239 (2 'change-log-email))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
240 ("^date: \\(.+\\)" (1 'change-log-date))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
241 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
242
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
243 (defun vc-hg-diff (file &optional oldvers newvers buffer)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
244 "Get a difference report using hg between two versions of FILE."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
245 (let ((working (vc-workfile-version file)))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
246 (if (and (equal oldvers working) (not newvers))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
247 (setq oldvers nil))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
248 (if (and (not oldvers) newvers)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
249 (setq oldvers working))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
250 (apply 'call-process "hg" nil (or buffer "*vc-diff*") nil
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
251 "--cwd" (file-name-directory file) "diff"
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
252 (append
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
253 (if oldvers
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
254 (if newvers
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
255 (list "-r" oldvers "-r" newvers)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
256 (list "-r" oldvers))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
257 (list ""))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
258 (list (file-name-nondirectory file))))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
259
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
260 (defalias 'vc-hg-diff-tree 'vc-hg-diff)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
261
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
262 (defun vc-hg-annotate-command (file buffer &optional version)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
263 "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
264 Optional arg VERSION is a version to annotate from."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
265 (vc-hg-command buffer 0 file "annotate" "-d" "-n" (if version (concat "-r" version)))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
266 (with-current-buffer buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
267 (goto-char (point-min))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
268 (re-search-forward "^[0-9]")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
269 (delete-region (point-min) (1- (point)))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
270
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
271
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
272 ;; 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
273 ;;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
274 ;; i.e: VERSION_NUMBER DATE: CONTENTS
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
275 (defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
276
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
277 (defun vc-hg-annotate-time ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
278 (when (looking-at vc-hg-annotate-re)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
279 (goto-char (match-end 0))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
280 (vc-annotate-convert-time
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
281 (date-to-time (match-string-no-properties 2)))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
282
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
283 (defun vc-hg-annotate-extract-revision-at-line ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
284 (save-excursion
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
285 (beginning-of-line)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
286 (if (looking-at vc-hg-annotate-re) (match-string-no-properties 1))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
287
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
288 (defun vc-hg-previous-version (file rev)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
289 (let ((newrev (1- (string-to-number rev))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
290 (when (>= newrev 0)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
291 (number-to-string newrev))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
292
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
293 (defun vc-hg-next-version (file rev)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
294 (let ((newrev (1+ (string-to-number rev)))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
295 (tip-version
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
296 (with-temp-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
297 (vc-hg-command t nil nil "tip")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
298 (goto-char (point-min))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
299 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
300 (string-to-number (match-string-no-properties 1)))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
301 ;; We don't want to exceed the maximum possible version number, ie
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
302 ;; the tip version.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
303 (when (<= newrev tip-version)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
304 (number-to-string newrev))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
305
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
306 ;; Modelled after the similar function in vc-bzr.el
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
307 (defun vc-hg-delete-file (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
308 "Delete FILE and delete it in the hg repository."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
309 (condition-case ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
310 (delete-file file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
311 (file-error nil))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
312 (vc-hg-command nil nil file "remove" "--after" "--force"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
313
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
314 ;; Modelled after the similar function in vc-bzr.el
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
315 (defun vc-hg-rename-file (old new)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
316 "Rename file from OLD to NEW using `hg mv'."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
317 (vc-hg-command nil nil new old "mv"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
318
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
319 (defun vc-hg-register (file &optional rev comment)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
320 "Register FILE under hg.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
321 REV is ignored.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
322 COMMENT is ignored."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
323 (vc-hg-command nil nil file "add"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
324
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
325 (defalias 'vc-hg-responsible-p 'vc-hg-root)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
326
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
327 ;; Modelled after the similar function in vc-bzr.el
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
328 (defun vc-hg-could-register (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
329 "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
330 (and (vc-hg-responsible-p file) ; shortcut
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
331 (condition-case ()
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
332 (with-temp-buffer
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
333 (vc-hg-command t nil file "add" "--dry-run"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
334 ;; The command succeeds with no output if file is
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
335 ;; registered.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
336 (error))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
337
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
338 ;; XXX This would remove the file. Is that correct?
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
339 ;; (defun vc-hg-unregister (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
340 ;; "Unregister FILE from hg."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
341 ;; (vc-hg-command nil nil file "remove"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
342
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
343 (defun vc-hg-checkin (file rev comment)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
344 "HG-specific version of `vc-backend-checkin'.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
345 REV is ignored."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
346 (vc-hg-command nil nil file "commit" "-m" comment))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
347
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
348 (defun vc-hg-find-version (file rev buffer)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
349 (let ((coding-system-for-read 'binary)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
350 (coding-system-for-write 'binary))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
351 (if rev
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
352 (vc-hg-command buffer nil file "cat" "-r" rev)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
353 (vc-hg-command buffer nil file "cat"))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
354
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
355 ;; Modelled after the similar function in vc-bzr.el
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
356 ;; This should not be needed, `vc-hg-find-version' provides the same
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
357 ;; functionality.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
358 ;; (defun vc-hg-checkout (file &optional editable rev workfile)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
359 ;; "Retrieve a revision of FILE into a WORKFILE.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
360 ;; EDITABLE is ignored.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
361 ;; REV is the revision to check out into WORKFILE."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
362 ;; (unless workfile
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
363 ;; (setq workfile (vc-version-backup-file-name file rev)))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
364 ;; (let ((coding-system-for-read 'binary)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
365 ;; (coding-system-for-write 'binary))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
366 ;; (with-temp-file workfile
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
367 ;; (if rev
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
368 ;; (vc-hg-command t nil file "cat" "-r" rev)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
369 ;; (vc-hg-command t nil file "cat")))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
370
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
371 (defun vc-hg-checkout-model (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
372 'implicit)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
373
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
374 ;; Modelled after the similar function in vc-bzr.el
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
375 (defun vc-hg-revert (file &optional contents-done)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
376 (unless contents-done
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
377 (with-temp-buffer (vc-hg-command t nil file "revert"))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
378
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
379 ;;; Internal functions
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
380
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
381 (defun vc-hg-command (buffer okstatus file &rest flags)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
382 "A wrapper around `vc-do-command' for use in vc-hg.el.
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
383 The difference to vc-do-command is that this function always invokes `hg',
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
384 and that it passes `vc-hg-global-switches' to it before FLAGS."
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
385 (apply 'vc-do-command buffer okstatus "hg" file
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
386 (if (stringp vc-hg-global-switches)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
387 (cons vc-hg-global-switches flags)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
388 (append vc-hg-global-switches
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
389 flags))))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
390
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
391 (defun vc-hg-root (file)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
392 (vc-find-root file ".hg"))
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
393
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
394 (provide 'vc-hg)
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
395
dbe1fd006899 vc-hg.el: New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
396 ;;; vc-hg.el ends here