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