annotate lisp/vc-hg.el @ 107795:d47e1fb98df3

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