2012-04-26 03:18:47 +00:00
|
|
|
|
;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*-
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
2015-01-01 22:26:41 +00:00
|
|
|
|
;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
|
2007-06-20 06:32:42 +00:00
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
|
;; Author: Ivan Kanis
|
2014-02-10 01:34:22 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
* lisp/finder.el (finder-known-keywords): Add keyword "vc"
for version control.
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
2010-06-11 19:09:57 +00:00
|
|
|
|
;; Keywords: vc tools
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: vc
|
2007-06-20 07:33:45 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2007-06-20 05:59:41 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2007-06-20 07:33:45 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; This is a mercurial version control backend
|
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
|
;;; Thanks:
|
|
|
|
|
|
|
|
|
|
;;; Bugs:
|
|
|
|
|
|
|
|
|
|
;;; Installation:
|
|
|
|
|
|
|
|
|
|
;;; Todo:
|
|
|
|
|
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; 1) Implement the rest of the vc interface. See the comment at the
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; beginning of vc.el. The current status is:
|
|
|
|
|
|
|
|
|
|
;; FUNCTION NAME STATUS
|
2007-07-20 00:09:17 +00:00
|
|
|
|
;; BACKEND PROPERTIES
|
|
|
|
|
;; * revision-granularity OK
|
|
|
|
|
;; STATE-QUERYING FUNCTIONS
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; * registered (file) OK
|
|
|
|
|
;; * state (file) OK
|
2014-12-02 13:01:46 +00:00
|
|
|
|
;; - dir-status-files (dir files uf) OK
|
2009-01-15 08:10:27 +00:00
|
|
|
|
;; - dir-extra-headers (dir) OK
|
|
|
|
|
;; - dir-printer (fileinfo) OK
|
2007-10-10 18:52:45 +00:00
|
|
|
|
;; * working-revision (file) OK
|
2008-05-02 17:47:25 +00:00
|
|
|
|
;; * checkout-model (files) OK
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - mode-line-string (file) NOT NEEDED
|
|
|
|
|
;; STATE-CHANGING FUNCTIONS
|
2007-07-18 16:32:40 +00:00
|
|
|
|
;; * register (files &optional rev comment) OK
|
2007-07-20 00:09:17 +00:00
|
|
|
|
;; * create-repo () OK
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - responsible-p (file) OK
|
|
|
|
|
;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
|
2014-05-11 02:01:08 +00:00
|
|
|
|
;; - unregister (file) OK
|
2007-07-18 16:32:40 +00:00
|
|
|
|
;; * checkin (files rev comment) OK
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; * find-revision (file rev buffer) OK
|
2014-11-20 08:52:24 +00:00
|
|
|
|
;; * checkout (file &optional rev) OK
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; * revert (file &optional contents-done) OK
|
|
|
|
|
;; - merge (file rev1 rev2) NEEDED
|
|
|
|
|
;; - merge-news (file) NEEDED
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; - steal-lock (file &optional revision) NOT NEEDED
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; HISTORY FUNCTIONS
|
2009-12-07 09:02:11 +00:00
|
|
|
|
;; * print-log (files buffer &optional shortlog start-revision limit) OK
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - log-view-mode () OK
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - comment-history (file) NOT NEEDED
|
|
|
|
|
;; - update-changelog (files) NOT NEEDED
|
2007-07-18 16:32:40 +00:00
|
|
|
|
;; * diff (files &optional rev1 rev2 buffer) OK
|
2007-10-20 01:28:35 +00:00
|
|
|
|
;; - revision-completion-table (files) OK?
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - annotate-command (file buf &optional rev) OK
|
|
|
|
|
;; - annotate-time () OK
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; - annotate-current-time () NOT NEEDED
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - annotate-extract-revision-at-line () OK
|
2008-05-15 17:38:50 +00:00
|
|
|
|
;; TAG SYSTEM
|
2014-06-06 16:38:44 +00:00
|
|
|
|
;; - create-tag (dir name branchp) OK
|
|
|
|
|
;; - retrieve-tag (dir name update) OK FIXME UPDATE BUFFERS
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; MISCELLANEOUS
|
|
|
|
|
;; - make-version-backups-p (file) ??
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; - previous-revision (file rev) OK
|
|
|
|
|
;; - next-revision (file rev) OK
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; - check-headers () ??
|
|
|
|
|
;; - delete-file (file) TEST IT
|
|
|
|
|
;; - rename-file (old new) OK
|
2012-12-05 01:49:31 +00:00
|
|
|
|
;; - find-file-hook () added for bug#10709
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
2008-05-10 19:10:31 +00:00
|
|
|
|
;; 2) Implement Stefan Monnier's advice:
|
2007-06-20 06:32:42 +00:00
|
|
|
|
;; vc-hg-registered and vc-hg-state
|
|
|
|
|
;; Both of those functions should be super extra careful to fail gracefully in
|
2007-07-06 21:14:21 +00:00
|
|
|
|
;; unexpected circumstances. The reason this is important is that any error
|
2007-06-20 06:32:42 +00:00
|
|
|
|
;; there will prevent the user from even looking at the file :-(
|
|
|
|
|
;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under
|
|
|
|
|
;; mercurial's control and extracting the current revision should be done
|
|
|
|
|
;; without even using `hg' (this way even if you don't have `hg' installed,
|
|
|
|
|
;; Emacs is able to tell you this file is under mercurial's control).
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
|
;;; History:
|
2007-06-22 18:37:16 +00:00
|
|
|
|
;;
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(eval-when-compile
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(require 'cl-lib)
|
2008-06-25 05:35:05 +00:00
|
|
|
|
(require 'vc)
|
|
|
|
|
(require 'vc-dir))
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
|
|
;;; Customization options
|
|
|
|
|
|
2012-02-25 04:29:09 +00:00
|
|
|
|
(defgroup vc-hg nil
|
|
|
|
|
"VC Mercurial (hg) backend."
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
|
(defcustom vc-hg-global-switches nil
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Global switches to pass to any Hg command."
|
2007-06-20 05:59:41 +00:00
|
|
|
|
:type '(choice (const :tag "None" nil)
|
|
|
|
|
(string :tag "Argument String")
|
2008-12-03 07:37:39 +00:00
|
|
|
|
(repeat :tag "Argument List" :value ("") string))
|
2007-07-06 21:14:21 +00:00
|
|
|
|
:version "22.2"
|
2012-02-25 04:29:09 +00:00
|
|
|
|
:group 'vc-hg)
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
2008-12-03 07:37:39 +00:00
|
|
|
|
(defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u
|
|
|
|
|
"String or list of strings specifying switches for Hg diff under VC.
|
|
|
|
|
If nil, use the value of `vc-diff-switches'. If t, use no switches."
|
2008-11-20 02:43:45 +00:00
|
|
|
|
:type '(choice (const :tag "Unspecified" nil)
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(const :tag "None" t)
|
|
|
|
|
(string :tag "Argument String")
|
|
|
|
|
(repeat :tag "Argument List" :value ("") string))
|
2008-11-20 02:43:45 +00:00
|
|
|
|
:version "23.1"
|
2012-02-25 04:29:09 +00:00
|
|
|
|
:group 'vc-hg)
|
2008-11-20 02:43:45 +00:00
|
|
|
|
|
2015-02-26 14:46:12 +00:00
|
|
|
|
(defcustom vc-hg-annotate-switches nil
|
|
|
|
|
"String or list of strings specifying switches for hg annotate under VC.
|
|
|
|
|
If nil, use the value of `vc-annotate-switches'. If t, use no
|
|
|
|
|
switches."
|
|
|
|
|
:type '(choice (const :tag "Unspecified" nil)
|
|
|
|
|
(const :tag "None" t)
|
|
|
|
|
(string :tag "Argument String")
|
|
|
|
|
(repeat :tag "Argument List" :value ("") string))
|
|
|
|
|
:version "25.1"
|
|
|
|
|
:group 'vc-hg)
|
|
|
|
|
|
2010-11-17 14:34:28 +00:00
|
|
|
|
(defcustom vc-hg-program "hg"
|
|
|
|
|
"Name of the Mercurial executable (excluding any arguments)."
|
|
|
|
|
:type 'string
|
2012-02-25 04:29:09 +00:00
|
|
|
|
:group 'vc-hg)
|
2011-02-14 01:49:24 +00:00
|
|
|
|
|
|
|
|
|
(defcustom vc-hg-root-log-format
|
2014-06-06 16:11:53 +00:00
|
|
|
|
`(,(concat "{rev}:{ifeq(branch, 'default','', '{branch}')}"
|
|
|
|
|
":{bookmarks}:{tags}:{author|person}"
|
|
|
|
|
" {date|shortdate} {desc|firstline}\\n")
|
|
|
|
|
,(concat "^\\(?:[+@o x|-]*\\)" ;Graph data.
|
|
|
|
|
"\\([0-9]+\\):\\([^:]*\\)"
|
|
|
|
|
":\\([^:]*\\):\\([^:]*\\):\\(.*?\\)"
|
|
|
|
|
"[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)")
|
2011-02-14 01:49:24 +00:00
|
|
|
|
((1 'log-view-message-face)
|
2014-06-06 16:11:53 +00:00
|
|
|
|
(2 'change-log-file)
|
|
|
|
|
(3 'change-log-list)
|
|
|
|
|
(4 'change-log-conditionals)
|
|
|
|
|
(5 'change-log-name)
|
|
|
|
|
(6 'change-log-date)))
|
2013-04-24 07:52:00 +00:00
|
|
|
|
"Mercurial log template for `vc-hg-print-log' short format.
|
2011-02-14 01:49:24 +00:00
|
|
|
|
This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
|
|
|
|
|
is the \"--template\" argument string to pass to Mercurial,
|
|
|
|
|
REGEXP is a regular expression matching the resulting Mercurial
|
|
|
|
|
output, and KEYWORDS is a list of `font-lock-keywords' for
|
|
|
|
|
highlighting the Log View buffer."
|
|
|
|
|
:type '(list string string (repeat sexp))
|
2012-02-25 04:29:09 +00:00
|
|
|
|
:group 'vc-hg
|
2014-06-06 16:11:53 +00:00
|
|
|
|
:version "24.5")
|
2011-02-14 01:49:24 +00:00
|
|
|
|
|
2007-07-18 16:32:40 +00:00
|
|
|
|
|
|
|
|
|
;;; Properties of the backend
|
|
|
|
|
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(defvar vc-hg-history nil)
|
|
|
|
|
|
2008-05-02 17:47:25 +00:00
|
|
|
|
(defun vc-hg-revision-granularity () 'repository)
|
2012-04-26 03:18:47 +00:00
|
|
|
|
(defun vc-hg-checkout-model (_files) 'implicit)
|
2007-07-18 16:32:40 +00:00
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
|
;;; State querying functions
|
|
|
|
|
|
2007-06-22 18:37:16 +00:00
|
|
|
|
;;;###autoload (defun vc-hg-registered (file)
|
|
|
|
|
;;;###autoload "Return non-nil if FILE is registered with hg."
|
|
|
|
|
;;;###autoload (if (vc-find-root file ".hg") ; short cut
|
|
|
|
|
;;;###autoload (progn
|
2013-02-01 17:19:24 +00:00
|
|
|
|
;;;###autoload (load "vc-hg" nil t)
|
2007-06-22 18:37:16 +00:00
|
|
|
|
;;;###autoload (vc-hg-registered file))))
|
|
|
|
|
|
2008-06-27 02:41:14 +00:00
|
|
|
|
;; Modeled after the similar function in vc-bzr.el
|
2007-06-20 05:59:41 +00:00
|
|
|
|
(defun vc-hg-registered (file)
|
2007-06-20 06:32:42 +00:00
|
|
|
|
"Return non-nil if FILE is registered with hg."
|
2007-07-20 00:09:17 +00:00
|
|
|
|
(when (vc-hg-root file) ; short cut
|
2007-12-28 22:50:18 +00:00
|
|
|
|
(let ((state (vc-hg-state file))) ; expensive
|
2008-01-20 20:01:24 +00:00
|
|
|
|
(and state (not (memq state '(ignored unregistered)))))))
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
|
|
(defun vc-hg-state (file)
|
2007-06-20 06:32:42 +00:00
|
|
|
|
"Hg-specific version of `vc-state'."
|
2014-12-11 10:12:13 +00:00
|
|
|
|
(setq file (expand-file-name file))
|
2008-02-20 15:21:55 +00:00
|
|
|
|
(let*
|
2007-07-05 14:55:34 +00:00
|
|
|
|
((status nil)
|
2009-10-28 02:05:46 +00:00
|
|
|
|
(default-directory (file-name-directory file))
|
2007-07-05 14:55:34 +00:00
|
|
|
|
(out
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(with-output-to-string
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
standard-output
|
|
|
|
|
(setq status
|
|
|
|
|
(condition-case nil
|
|
|
|
|
;; Ignore all errors.
|
2009-12-07 09:02:11 +00:00
|
|
|
|
(let ((process-environment
|
2010-04-20 15:57:54 +00:00
|
|
|
|
;; Avoid localization of messages so we
|
2014-11-13 15:26:51 +00:00
|
|
|
|
;; can parse the output. Disable pager.
|
|
|
|
|
(append
|
|
|
|
|
(list "TERM=dumb" "LANGUAGE=C" "HGPLAIN=1")
|
|
|
|
|
process-environment)))
|
2014-11-22 11:37:04 +00:00
|
|
|
|
(process-file
|
|
|
|
|
vc-hg-program nil t nil
|
|
|
|
|
"--config" "alias.status=status"
|
|
|
|
|
"--config" "defaults.status="
|
|
|
|
|
"status" "-A" (file-relative-name file)))
|
2009-09-22 18:16:48 +00:00
|
|
|
|
;; Some problem happened. E.g. We can't find an `hg'
|
|
|
|
|
;; executable.
|
|
|
|
|
(error nil)))))))
|
2014-12-11 10:12:13 +00:00
|
|
|
|
(when (and (eq 0 status)
|
|
|
|
|
(> (length out) 0)
|
|
|
|
|
(null (string-match ".*: No such file or directory$" out)))
|
|
|
|
|
(let ((state (aref out 0)))
|
|
|
|
|
(cond
|
|
|
|
|
((eq state ?=) 'up-to-date)
|
|
|
|
|
((eq state ?A) 'added)
|
|
|
|
|
((eq state ?M) 'edited)
|
|
|
|
|
((eq state ?I) 'ignored)
|
|
|
|
|
((eq state ?R) 'removed)
|
|
|
|
|
((eq state ?!) 'missing)
|
|
|
|
|
((eq state ??) 'unregistered)
|
|
|
|
|
((eq state ?C) 'up-to-date) ;; Older mercurial versions use this.
|
|
|
|
|
(t 'up-to-date))))))
|
2007-07-20 00:09:17 +00:00
|
|
|
|
|
2007-10-10 18:52:45 +00:00
|
|
|
|
(defun vc-hg-working-revision (file)
|
|
|
|
|
"Hg-specific version of `vc-working-revision'."
|
2014-06-06 16:29:55 +00:00
|
|
|
|
(or (ignore-errors
|
|
|
|
|
(with-output-to-string
|
|
|
|
|
(vc-hg-command standard-output 0 file
|
|
|
|
|
"parent" "--template" "{rev}")))
|
|
|
|
|
"0"))
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
|
|
;;; History functions
|
|
|
|
|
|
2009-06-12 20:14:45 +00:00
|
|
|
|
(defcustom vc-hg-log-switches nil
|
|
|
|
|
"String or list of strings specifying switches for hg log under VC."
|
|
|
|
|
:type '(choice (const :tag "None" nil)
|
|
|
|
|
(string :tag "Argument String")
|
|
|
|
|
(repeat :tag "Argument List" :value ("") string))
|
|
|
|
|
:group 'vc-hg)
|
|
|
|
|
|
Silence the rest of vc compilation
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
2013-05-28 07:47:11 +00:00
|
|
|
|
(autoload 'vc-setup-buffer "vc-dispatcher")
|
|
|
|
|
|
2014-06-06 16:11:53 +00:00
|
|
|
|
(defvar vc-hg-log-graph nil
|
|
|
|
|
"If non-nil, use `--graph' in the short log output.")
|
|
|
|
|
|
2009-12-14 16:55:34 +00:00
|
|
|
|
(defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
|
2013-04-24 07:52:00 +00:00
|
|
|
|
"Print commit log associated with FILES into specified BUFFER.
|
|
|
|
|
If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'.
|
|
|
|
|
If START-REVISION is non-nil, it is the newest revision to show.
|
|
|
|
|
If LIMIT is non-nil, show no more than this many entries."
|
2007-06-22 17:22:17 +00:00
|
|
|
|
;; `vc-do-command' creates the buffer, but we need it before running
|
|
|
|
|
;; the command.
|
|
|
|
|
(vc-setup-buffer buffer)
|
|
|
|
|
;; If the buffer exists from a previous invocation it might be
|
|
|
|
|
;; read-only.
|
|
|
|
|
(let ((inhibit-read-only t))
|
2008-06-15 14:58:24 +00:00
|
|
|
|
(with-current-buffer
|
|
|
|
|
buffer
|
2015-07-19 17:49:59 +00:00
|
|
|
|
(apply 'vc-hg-command buffer 'async files "log"
|
2010-04-02 14:21:57 +00:00
|
|
|
|
(nconc
|
2013-04-24 07:59:29 +00:00
|
|
|
|
(when start-revision (list (format "-r%s:0" start-revision)))
|
2009-11-15 20:28:58 +00:00
|
|
|
|
(when limit (list "-l" (format "%s" limit)))
|
2014-06-06 16:11:53 +00:00
|
|
|
|
(when shortlog `(,@(if vc-hg-log-graph '("--graph"))
|
|
|
|
|
"--template"
|
|
|
|
|
,(car vc-hg-root-log-format)))
|
2009-11-15 20:28:58 +00:00
|
|
|
|
vc-hg-log-switches)))))
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
2007-06-22 02:11:59 +00:00
|
|
|
|
(defvar log-view-message-re)
|
|
|
|
|
(defvar log-view-file-re)
|
|
|
|
|
(defvar log-view-font-lock-keywords)
|
2008-06-15 14:58:24 +00:00
|
|
|
|
(defvar log-view-per-file-logs)
|
2011-02-14 01:49:24 +00:00
|
|
|
|
(defvar log-view-expanded-log-entry-function)
|
2007-06-22 02:11:59 +00:00
|
|
|
|
|
2007-08-03 04:57:05 +00:00
|
|
|
|
(define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
|
2007-08-29 18:15:16 +00:00
|
|
|
|
(require 'add-log) ;; we need the add-log faces
|
2008-06-15 14:58:24 +00:00
|
|
|
|
(set (make-local-variable 'log-view-file-re) "\\`a\\`")
|
|
|
|
|
(set (make-local-variable 'log-view-per-file-logs) nil)
|
2007-06-22 02:11:59 +00:00
|
|
|
|
(set (make-local-variable 'log-view-message-re)
|
2010-04-07 05:56:35 +00:00
|
|
|
|
(if (eq vc-log-view-type 'short)
|
2011-02-14 01:49:24 +00:00
|
|
|
|
(cadr vc-hg-root-log-format)
|
2009-09-22 18:16:48 +00:00
|
|
|
|
"^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)"))
|
2011-02-14 01:49:24 +00:00
|
|
|
|
;; Allow expanding short log entries
|
|
|
|
|
(when (eq vc-log-view-type 'short)
|
|
|
|
|
(setq truncate-lines t)
|
|
|
|
|
(set (make-local-variable 'log-view-expanded-log-entry-function)
|
|
|
|
|
'vc-hg-expanded-log-entry))
|
2007-06-22 02:11:59 +00:00
|
|
|
|
(set (make-local-variable 'log-view-font-lock-keywords)
|
2010-04-07 05:56:35 +00:00
|
|
|
|
(if (eq vc-log-view-type 'short)
|
2011-02-14 01:49:24 +00:00
|
|
|
|
(list (cons (nth 1 vc-hg-root-log-format)
|
|
|
|
|
(nth 2 vc-hg-root-log-format)))
|
|
|
|
|
(append
|
|
|
|
|
log-view-font-lock-keywords
|
|
|
|
|
'(
|
|
|
|
|
;; Handle the case:
|
|
|
|
|
;; user: FirstName LastName <foo@bar>
|
|
|
|
|
("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
|
|
|
|
|
(1 'change-log-name)
|
|
|
|
|
(2 'change-log-email))
|
|
|
|
|
;; Handle the cases:
|
|
|
|
|
;; user: foo@bar
|
|
|
|
|
;; and
|
|
|
|
|
;; user: foo
|
|
|
|
|
("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
|
|
|
|
|
(1 'change-log-email))
|
|
|
|
|
("^date: \\(.+\\)" (1 'change-log-date))
|
|
|
|
|
("^tag: +\\([^ ]+\\)$" (1 'highlight))
|
|
|
|
|
("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
|
2007-06-22 02:11:59 +00:00
|
|
|
|
|
Silence the rest of vc compilation
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
2013-05-28 07:47:11 +00:00
|
|
|
|
(autoload 'vc-switches "vc")
|
|
|
|
|
|
2014-12-14 10:49:08 +00:00
|
|
|
|
(defun vc-hg-diff (files &optional oldvers newvers buffer async)
|
2007-10-10 19:39:23 +00:00
|
|
|
|
"Get a difference report using hg between two revisions of FILES."
|
2008-06-15 14:58:24 +00:00
|
|
|
|
(let* ((firstfile (car files))
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(working (and firstfile (vc-working-revision firstfile))))
|
2008-05-10 19:10:31 +00:00
|
|
|
|
(when (and (equal oldvers working) (not newvers))
|
|
|
|
|
(setq oldvers nil))
|
|
|
|
|
(when (and (not oldvers) newvers)
|
|
|
|
|
(setq oldvers working))
|
2014-12-01 22:56:41 +00:00
|
|
|
|
(apply #'vc-hg-command
|
|
|
|
|
(or buffer "*vc-diff*")
|
|
|
|
|
(if async 'async nil)
|
|
|
|
|
files "diff"
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(append
|
|
|
|
|
(vc-switches 'hg 'diff)
|
|
|
|
|
(when oldvers
|
|
|
|
|
(if newvers
|
|
|
|
|
(list "-r" oldvers "-r" newvers)
|
|
|
|
|
(list "-r" oldvers)))))))
|
2007-06-21 05:44:54 +00:00
|
|
|
|
|
2011-02-14 01:49:24 +00:00
|
|
|
|
(defun vc-hg-expanded-log-entry (revision)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-hg-command t nil nil "log" "-r" revision)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(unless (eobp)
|
|
|
|
|
;; Indent the expanded log entry.
|
|
|
|
|
(indent-region (point-min) (point-max) 2)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(buffer-string))))
|
|
|
|
|
|
2007-10-20 01:11:18 +00:00
|
|
|
|
(defun vc-hg-revision-table (files)
|
|
|
|
|
(let ((default-directory (file-name-directory (car files))))
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(with-temp-buffer
|
2007-11-19 08:50:04 +00:00
|
|
|
|
(vc-hg-command t nil files "log" "--template" "{rev} ")
|
2008-02-20 15:21:55 +00:00
|
|
|
|
(split-string
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(buffer-substring-no-properties (point-min) (point-max))))))
|
|
|
|
|
|
2008-06-27 02:41:14 +00:00
|
|
|
|
;; Modeled after the similar function in vc-cvs.el
|
2007-10-20 01:11:18 +00:00
|
|
|
|
(defun vc-hg-revision-completion-table (files)
|
2012-04-26 03:18:47 +00:00
|
|
|
|
(letrec ((table (lazy-completion-table
|
|
|
|
|
table (lambda () (vc-hg-revision-table files)))))
|
2007-07-30 00:19:06 +00:00
|
|
|
|
table))
|
2007-07-21 16:44:56 +00:00
|
|
|
|
|
2007-10-10 19:39:23 +00:00
|
|
|
|
(defun vc-hg-annotate-command (file buffer &optional revision)
|
2007-06-21 05:44:54 +00:00
|
|
|
|
"Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
|
2007-10-10 19:39:23 +00:00
|
|
|
|
Optional arg REVISION is a revision to annotate from."
|
2015-02-26 14:46:12 +00:00
|
|
|
|
(apply #'vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow"
|
|
|
|
|
(append (vc-switches 'hg 'annotate)
|
|
|
|
|
(if revision (list (concat "-r" revision))))))
|
2007-06-21 05:44:54 +00:00
|
|
|
|
|
2015-05-01 00:06:15 +00:00
|
|
|
|
(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
|
2007-06-21 05:44:54 +00:00
|
|
|
|
|
2007-06-22 18:37:16 +00:00
|
|
|
|
;; The format for one line output by "hg annotate -d -n" looks like this:
|
|
|
|
|
;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
|
|
|
|
|
;; i.e: VERSION_NUMBER DATE: CONTENTS
|
2008-05-18 07:22:25 +00:00
|
|
|
|
;; If the user has set the "--follow" option, the output looks like:
|
|
|
|
|
;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS
|
|
|
|
|
;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
|
|
|
|
|
(defconst vc-hg-annotate-re
|
2013-04-17 00:50:44 +00:00
|
|
|
|
"^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)")
|
2007-06-21 05:44:54 +00:00
|
|
|
|
|
|
|
|
|
(defun vc-hg-annotate-time ()
|
|
|
|
|
(when (looking-at vc-hg-annotate-re)
|
|
|
|
|
(goto-char (match-end 0))
|
2007-06-22 18:37:16 +00:00
|
|
|
|
(vc-annotate-convert-time
|
2007-06-21 05:44:54 +00:00
|
|
|
|
(date-to-time (match-string-no-properties 2)))))
|
|
|
|
|
|
|
|
|
|
(defun vc-hg-annotate-extract-revision-at-line ()
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
2009-10-19 05:04:22 +00:00
|
|
|
|
(when (looking-at vc-hg-annotate-re)
|
|
|
|
|
(if (match-beginning 3)
|
|
|
|
|
(match-string-no-properties 1)
|
|
|
|
|
(cons (match-string-no-properties 1)
|
2014-06-06 16:38:44 +00:00
|
|
|
|
(expand-file-name (match-string-no-properties 4)
|
|
|
|
|
(vc-hg-root default-directory)))))))
|
|
|
|
|
|
|
|
|
|
;;; Tag system
|
|
|
|
|
|
|
|
|
|
(defun vc-hg-create-tag (dir name branchp)
|
|
|
|
|
"Attach the tag NAME to the state of the working copy."
|
|
|
|
|
(let ((default-directory dir))
|
|
|
|
|
(and (vc-hg-command nil 0 nil "status")
|
|
|
|
|
(vc-hg-command nil 0 nil (if branchp "bookmark" "tag") name))))
|
|
|
|
|
|
Remove never-used rev argument from VC's backend checkin methods.
Alters vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el,
vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el,
vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el.
Only the RCS, SCCS, and CVS back ends tried to do anything with it,
and that code was never exercised. Chiseling away the cruft of
decades...
2014-11-20 07:37:06 +00:00
|
|
|
|
(defun vc-hg-retrieve-tag (dir name _update)
|
2014-06-06 16:38:44 +00:00
|
|
|
|
"Retrieve the version tagged by NAME of all registered files at or below DIR."
|
|
|
|
|
(let ((default-directory dir))
|
|
|
|
|
(vc-hg-command nil 0 nil "update" name)
|
|
|
|
|
;; FIXME: update buffers if `update' is true
|
|
|
|
|
;; TODO: update *vc-change-log* buffer so can see @ if --graph
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
;;; Miscellaneous
|
2007-06-21 05:44:54 +00:00
|
|
|
|
|
2012-04-26 03:18:47 +00:00
|
|
|
|
(defun vc-hg-previous-revision (_file rev)
|
2007-06-21 05:44:54 +00:00
|
|
|
|
(let ((newrev (1- (string-to-number rev))))
|
|
|
|
|
(when (>= newrev 0)
|
|
|
|
|
(number-to-string newrev))))
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
2012-04-26 03:18:47 +00:00
|
|
|
|
(defun vc-hg-next-revision (_file rev)
|
2007-07-06 21:14:21 +00:00
|
|
|
|
(let ((newrev (1+ (string-to-number rev)))
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(tip-revision
|
|
|
|
|
(with-temp-buffer
|
2012-12-01 02:10:53 +00:00
|
|
|
|
(vc-hg-command t 0 nil "tip" "--style=default")
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
|
|
|
|
|
(string-to-number (match-string-no-properties 1)))))
|
2007-10-10 19:39:23 +00:00
|
|
|
|
;; We don't want to exceed the maximum possible revision number, ie
|
|
|
|
|
;; the tip revision.
|
|
|
|
|
(when (<= newrev tip-revision)
|
2007-07-06 21:14:21 +00:00
|
|
|
|
(number-to-string newrev))))
|
|
|
|
|
|
2008-06-27 02:41:14 +00:00
|
|
|
|
;; Modeled after the similar function in vc-bzr.el
|
2007-07-06 21:14:21 +00:00
|
|
|
|
(defun vc-hg-delete-file (file)
|
|
|
|
|
"Delete FILE and delete it in the hg repository."
|
|
|
|
|
(condition-case ()
|
|
|
|
|
(delete-file file)
|
|
|
|
|
(file-error nil))
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(vc-hg-command nil 0 file "remove" "--after" "--force"))
|
2007-07-06 21:14:21 +00:00
|
|
|
|
|
2008-06-27 02:41:14 +00:00
|
|
|
|
;; Modeled after the similar function in vc-bzr.el
|
2007-07-06 21:14:21 +00:00
|
|
|
|
(defun vc-hg-rename-file (old new)
|
|
|
|
|
"Rename file from OLD to NEW using `hg mv'."
|
2008-04-28 19:56:43 +00:00
|
|
|
|
(vc-hg-command nil 0 new "mv" old))
|
2007-07-06 21:14:21 +00:00
|
|
|
|
|
2014-12-01 11:23:10 +00:00
|
|
|
|
(defun vc-hg-register (files &optional _comment)
|
|
|
|
|
"Register FILES under hg. COMMENT is ignored."
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(vc-hg-command nil 0 files "add"))
|
2007-07-18 16:32:40 +00:00
|
|
|
|
|
|
|
|
|
(defun vc-hg-create-repo ()
|
|
|
|
|
"Create a new Mercurial repository."
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(vc-hg-command nil 0 nil "init"))
|
2007-06-20 06:32:42 +00:00
|
|
|
|
|
2007-07-06 21:14:21 +00:00
|
|
|
|
(defalias 'vc-hg-responsible-p 'vc-hg-root)
|
|
|
|
|
|
2014-05-11 02:01:08 +00:00
|
|
|
|
(defun vc-hg-unregister (file)
|
|
|
|
|
"Unregister FILE from hg."
|
|
|
|
|
(vc-hg-command nil 0 file "forget"))
|
2007-07-06 21:14:21 +00:00
|
|
|
|
|
2010-04-21 02:05:24 +00:00
|
|
|
|
(declare-function log-edit-extract-headers "log-edit" (headers string))
|
|
|
|
|
|
Remove never-used rev argument from VC's backend checkin methods.
Alters vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el,
vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el,
vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el.
Only the RCS, SCCS, and CVS back ends tried to do anything with it,
and that code was never exercised. Chiseling away the cruft of
decades...
2014-11-20 07:37:06 +00:00
|
|
|
|
(defun vc-hg-checkin (files comment)
|
2007-08-03 04:57:05 +00:00
|
|
|
|
"Hg-specific version of `vc-backend-checkin'.
|
2007-06-21 05:44:54 +00:00
|
|
|
|
REV is ignored."
|
2010-04-02 14:21:57 +00:00
|
|
|
|
(apply 'vc-hg-command nil 0 files
|
2010-04-21 02:05:24 +00:00
|
|
|
|
(nconc (list "commit" "-m")
|
2010-06-09 05:24:01 +00:00
|
|
|
|
(log-edit-extract-headers '(("Author" . "--user")
|
|
|
|
|
("Date" . "--date"))
|
2010-04-21 02:05:24 +00:00
|
|
|
|
comment))))
|
2007-06-21 05:44:54 +00:00
|
|
|
|
|
2007-10-10 18:52:45 +00:00
|
|
|
|
(defun vc-hg-find-revision (file rev buffer)
|
2007-06-20 06:32:42 +00:00
|
|
|
|
(let ((coding-system-for-read 'binary)
|
|
|
|
|
(coding-system-for-write 'binary))
|
|
|
|
|
(if rev
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(vc-hg-command buffer 0 file "cat" "-r" rev)
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(vc-hg-command buffer 0 file "cat"))))
|
2007-07-06 21:14:21 +00:00
|
|
|
|
|
2013-08-04 02:55:45 +00:00
|
|
|
|
(defun vc-hg-find-ignore-file (file)
|
|
|
|
|
"Return the root directory of the repository of FILE."
|
|
|
|
|
(expand-file-name ".hgignore"
|
|
|
|
|
(vc-hg-root file)))
|
2013-07-30 00:25:31 +00:00
|
|
|
|
|
2008-06-27 02:41:14 +00:00
|
|
|
|
;; Modeled after the similar function in vc-bzr.el
|
2014-11-20 08:52:24 +00:00
|
|
|
|
(defun vc-hg-checkout (file &optional rev)
|
2007-07-20 00:09:17 +00:00
|
|
|
|
"Retrieve a revision of FILE.
|
|
|
|
|
EDITABLE is ignored.
|
|
|
|
|
REV is the revision to check out into WORKFILE."
|
|
|
|
|
(let ((coding-system-for-read 'binary)
|
|
|
|
|
(coding-system-for-write 'binary))
|
|
|
|
|
(with-current-buffer (or (get-file-buffer file) (current-buffer))
|
|
|
|
|
(if rev
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(vc-hg-command t 0 file "cat" "-r" rev)
|
|
|
|
|
(vc-hg-command t 0 file "cat")))))
|
2007-06-20 06:32:42 +00:00
|
|
|
|
|
2012-12-05 01:49:31 +00:00
|
|
|
|
(defun vc-hg-resolve-when-done ()
|
|
|
|
|
"Call \"hg resolve -m\" if the conflict markers have been removed."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(unless (re-search-forward "^<<<<<<< " nil t)
|
|
|
|
|
(vc-hg-command nil 0 buffer-file-name "resolve" "-m")
|
|
|
|
|
;; Remove the hook so that it is not called multiple times.
|
|
|
|
|
(remove-hook 'after-save-hook 'vc-hg-resolve-when-done t))))
|
|
|
|
|
|
|
|
|
|
(defun vc-hg-find-file-hook ()
|
|
|
|
|
(when (and buffer-file-name
|
|
|
|
|
(file-exists-p (concat buffer-file-name ".orig"))
|
|
|
|
|
;; Hg does not seem to have a "conflict" status, eg
|
|
|
|
|
;; hg http://bz.selenic.com/show_bug.cgi?id=2724
|
|
|
|
|
(memq (vc-file-getprop buffer-file-name 'vc-state)
|
|
|
|
|
'(edited conflict))
|
|
|
|
|
;; Maybe go on to check that "hg resolve -l" says "U"?
|
|
|
|
|
;; If "hg resolve -l" says there's a conflict but there are no
|
|
|
|
|
;; conflict markers, it's not clear what we should do.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(re-search-forward "^<<<<<<< " nil t)))
|
|
|
|
|
;; Hg may not recognize "conflict" as a state, but we can do better.
|
|
|
|
|
(vc-file-setprop buffer-file-name 'vc-state 'conflict)
|
|
|
|
|
(smerge-start-session)
|
|
|
|
|
(add-hook 'after-save-hook 'vc-hg-resolve-when-done nil t)
|
|
|
|
|
(message "There are unresolved conflicts in this file")))
|
|
|
|
|
|
|
|
|
|
|
2008-06-27 02:41:14 +00:00
|
|
|
|
;; Modeled after the similar function in vc-bzr.el
|
2007-07-05 14:55:34 +00:00
|
|
|
|
(defun vc-hg-revert (file &optional contents-done)
|
|
|
|
|
(unless contents-done
|
2007-07-21 16:44:56 +00:00
|
|
|
|
(with-temp-buffer (vc-hg-command t 0 file "revert"))))
|
2007-07-05 14:55:34 +00:00
|
|
|
|
|
2007-08-29 18:15:16 +00:00
|
|
|
|
;;; Hg specific functionality.
|
|
|
|
|
|
|
|
|
|
(defvar vc-hg-extra-menu-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
map))
|
|
|
|
|
|
|
|
|
|
(defun vc-hg-extra-menu () vc-hg-extra-menu-map)
|
|
|
|
|
|
2008-02-23 06:32:12 +00:00
|
|
|
|
(defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
|
2008-02-19 07:10:33 +00:00
|
|
|
|
|
2009-10-05 15:12:29 +00:00
|
|
|
|
(defvar log-view-vc-backend)
|
2007-08-29 18:15:16 +00:00
|
|
|
|
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(cl-defstruct (vc-hg-extra-fileinfo
|
2008-05-01 06:35:09 +00:00
|
|
|
|
(:copier nil)
|
|
|
|
|
(:constructor vc-hg-create-extra-fileinfo (rename-state extra-name))
|
|
|
|
|
(:conc-name vc-hg-extra-fileinfo->))
|
|
|
|
|
rename-state ;; rename or copy state
|
2008-06-04 14:04:28 +00:00
|
|
|
|
extra-name) ;; original name for copies and rename targets, new name for
|
2008-05-01 06:35:09 +00:00
|
|
|
|
|
2008-10-27 07:21:43 +00:00
|
|
|
|
(declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
|
2008-06-24 02:41:04 +00:00
|
|
|
|
|
2008-10-27 07:21:43 +00:00
|
|
|
|
(defun vc-hg-dir-printer (info)
|
2008-05-01 06:35:09 +00:00
|
|
|
|
"Pretty-printer for the vc-dir-fileinfo structure."
|
|
|
|
|
(let ((extra (vc-dir-fileinfo->extra info)))
|
2008-10-27 07:21:43 +00:00
|
|
|
|
(vc-default-dir-printer 'Hg info)
|
2008-05-01 06:35:09 +00:00
|
|
|
|
(when extra
|
|
|
|
|
(insert (propertize
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(format " (%s %s)"
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(pcase (vc-hg-extra-fileinfo->rename-state extra)
|
|
|
|
|
(`copied "copied from")
|
|
|
|
|
(`renamed-from "renamed from")
|
|
|
|
|
(`renamed-to "renamed to"))
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(vc-hg-extra-fileinfo->extra-name extra))
|
|
|
|
|
'face 'font-lock-comment-face)))))
|
2008-05-01 06:35:09 +00:00
|
|
|
|
|
2008-04-11 15:17:59 +00:00
|
|
|
|
(defun vc-hg-after-dir-status (update-function)
|
2012-04-26 03:18:47 +00:00
|
|
|
|
(let ((file nil)
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(translation '((?= . up-to-date)
|
|
|
|
|
(?C . up-to-date)
|
|
|
|
|
(?A . added)
|
|
|
|
|
(?R . removed)
|
|
|
|
|
(?M . edited)
|
|
|
|
|
(?I . ignored)
|
|
|
|
|
(?! . missing)
|
|
|
|
|
(? . copy-rename-line)
|
|
|
|
|
(?? . unregistered)))
|
|
|
|
|
(translated nil)
|
|
|
|
|
(result nil)
|
|
|
|
|
(last-added nil)
|
|
|
|
|
(last-line-copy nil))
|
2008-01-18 23:32:58 +00:00
|
|
|
|
(goto-char (point-min))
|
2008-01-06 10:20:26 +00:00
|
|
|
|
(while (not (eobp))
|
2009-09-22 18:16:48 +00:00
|
|
|
|
(setq translated (cdr (assoc (char-after) translation)))
|
|
|
|
|
(setq file
|
|
|
|
|
(buffer-substring-no-properties (+ (point) 2)
|
|
|
|
|
(line-end-position)))
|
|
|
|
|
(cond ((not translated)
|
|
|
|
|
(setq last-line-copy nil))
|
|
|
|
|
((eq translated 'up-to-date)
|
|
|
|
|
(setq last-line-copy nil))
|
|
|
|
|
((eq translated 'copy-rename-line)
|
|
|
|
|
;; For copied files the output looks like this:
|
|
|
|
|
;; A COPIED_FILE_NAME
|
|
|
|
|
;; ORIGINAL_FILE_NAME
|
|
|
|
|
(setf (nth 2 last-added)
|
|
|
|
|
(vc-hg-create-extra-fileinfo 'copied file))
|
|
|
|
|
(setq last-line-copy t))
|
|
|
|
|
((and last-line-copy (eq translated 'removed))
|
|
|
|
|
;; For renamed files the output looks like this:
|
|
|
|
|
;; A NEW_FILE_NAME
|
|
|
|
|
;; ORIGINAL_FILE_NAME
|
|
|
|
|
;; R ORIGINAL_FILE_NAME
|
|
|
|
|
;; We need to adjust the previous entry to not think it is a copy.
|
|
|
|
|
(setf (vc-hg-extra-fileinfo->rename-state (nth 2 last-added))
|
|
|
|
|
'renamed-from)
|
|
|
|
|
(push (list file translated
|
|
|
|
|
(vc-hg-create-extra-fileinfo
|
|
|
|
|
'renamed-to (nth 0 last-added))) result)
|
|
|
|
|
(setq last-line-copy nil))
|
|
|
|
|
(t
|
|
|
|
|
(setq last-added (list file translated nil))
|
|
|
|
|
(push last-added result)
|
|
|
|
|
(setq last-line-copy nil)))
|
|
|
|
|
(forward-line))
|
2008-04-11 15:17:59 +00:00
|
|
|
|
(funcall update-function result)))
|
2008-01-18 23:32:58 +00:00
|
|
|
|
|
Silence the rest of vc compilation
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
2013-05-28 07:47:11 +00:00
|
|
|
|
;; Follows vc-hg-command (or vc-do-async-command), which uses vc-do-command
|
|
|
|
|
;; from vc-dispatcher.
|
|
|
|
|
(declare-function vc-exec-after "vc-dispatcher" (code))
|
|
|
|
|
;; Follows vc-exec-after.
|
|
|
|
|
(declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
|
|
|
|
|
|
2014-12-02 13:01:46 +00:00
|
|
|
|
(defun vc-hg-dir-status-files (dir files update-function)
|
2014-12-08 16:24:07 +00:00
|
|
|
|
(apply 'vc-hg-command (current-buffer) 'async dir "status"
|
|
|
|
|
(concat "-mardu" (if files "i"))
|
|
|
|
|
"-C" files)
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
|
(vc-run-delayed
|
2014-12-08 16:24:07 +00:00
|
|
|
|
(vc-hg-after-dir-status update-function)))
|
2008-10-03 19:04:29 +00:00
|
|
|
|
|
2008-10-27 07:21:43 +00:00
|
|
|
|
(defun vc-hg-dir-extra-header (name &rest commands)
|
2008-06-04 14:04:28 +00:00
|
|
|
|
(concat (propertize name 'face 'font-lock-type-face)
|
|
|
|
|
(propertize
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(apply 'vc-hg-command (current-buffer) 0 nil commands)
|
|
|
|
|
(buffer-substring-no-properties (point-min) (1- (point-max))))
|
|
|
|
|
'face 'font-lock-variable-name-face)))
|
|
|
|
|
|
2008-10-27 07:21:43 +00:00
|
|
|
|
(defun vc-hg-dir-extra-headers (dir)
|
2008-06-04 14:04:28 +00:00
|
|
|
|
"Generate extra status headers for a Mercurial tree."
|
|
|
|
|
(let ((default-directory dir))
|
|
|
|
|
(concat
|
2008-10-27 07:21:43 +00:00
|
|
|
|
(vc-hg-dir-extra-header "Root : " "root") "\n"
|
|
|
|
|
(vc-hg-dir-extra-header "Branch : " "id" "-b") "\n"
|
|
|
|
|
(vc-hg-dir-extra-header "Tags : " "id" "-t") ; "\n"
|
2008-06-04 14:04:28 +00:00
|
|
|
|
;; these change after each commit
|
2008-10-27 07:21:43 +00:00
|
|
|
|
;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n"
|
|
|
|
|
;; (vc-hg-dir-extra-header "Global id : " "id" "-i")
|
2008-06-04 14:04:28 +00:00
|
|
|
|
)))
|
|
|
|
|
|
2010-04-07 05:56:35 +00:00
|
|
|
|
(defun vc-hg-log-incoming (buffer remote-location)
|
|
|
|
|
(vc-hg-command buffer 1 nil "incoming" "-n" (unless (string= remote-location "")
|
|
|
|
|
remote-location)))
|
2007-08-29 18:15:16 +00:00
|
|
|
|
|
2010-04-07 05:56:35 +00:00
|
|
|
|
(defun vc-hg-log-outgoing (buffer remote-location)
|
|
|
|
|
(vc-hg-command buffer 1 nil "outgoing" "-n" (unless (string= remote-location "")
|
|
|
|
|
remote-location)))
|
2007-08-29 18:15:16 +00:00
|
|
|
|
|
2012-07-19 14:38:01 +00:00
|
|
|
|
(defvar vc-hg-error-regexp-alist nil
|
|
|
|
|
;; 'hg pull' does not list modified files, so, for now, the only
|
|
|
|
|
;; benefit of `vc-compilation-mode' is that one can get rid of
|
|
|
|
|
;; *vc-hg* buffer with 'q' or 'z'.
|
|
|
|
|
;; TODO: call 'hg incoming' before pull/merge to get the list of
|
|
|
|
|
;; modified files
|
|
|
|
|
"Value of `compilation-error-regexp-alist' in *vc-hg* buffers.")
|
|
|
|
|
|
Silence the rest of vc compilation
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
2013-05-28 07:47:11 +00:00
|
|
|
|
(autoload 'vc-do-async-command "vc-dispatcher")
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(autoload 'log-view-get-marked "log-view")
|
Silence the rest of vc compilation
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
2013-05-28 07:47:11 +00:00
|
|
|
|
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(defun vc-hg--pushpull (command prompt &optional obsolete)
|
|
|
|
|
"Run COMMAND (a string; either push or pull) on the current Hg branch.
|
|
|
|
|
If PROMPT is non-nil, prompt for the Hg command to run.
|
|
|
|
|
If OBSOLETE is non-nil, behave like the old versions of the Hg push/pull
|
|
|
|
|
commands, which only operated on marked files."
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(let (marked-list)
|
2015-05-13 00:42:42 +00:00
|
|
|
|
;; The `vc-hg-pull' and `vc-hg-push' commands existed before the
|
|
|
|
|
;; `pull'/`push' VC actions were implemented.
|
|
|
|
|
;; The following is for backwards compatibility.
|
|
|
|
|
(if (and obsolete (setq marked-list (log-view-get-marked)))
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(apply #'vc-hg-command
|
|
|
|
|
nil 0 nil
|
2015-05-13 00:42:42 +00:00
|
|
|
|
command
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(apply 'nconc
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(mapcar (lambda (arg) (list "-r" arg)) marked-list)))
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(let* ((root (vc-hg-root default-directory))
|
|
|
|
|
(buffer (format "*vc-hg : %s*" (expand-file-name root)))
|
2011-03-10 08:32:27 +00:00
|
|
|
|
(hg-program vc-hg-program)
|
2011-01-29 21:19:21 +00:00
|
|
|
|
;; Fixme: before updating the working copy to the latest
|
|
|
|
|
;; state, should check if it's visiting an old revision.
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(args (if (equal command "pull") '("-u"))))
|
2011-01-29 03:12:32 +00:00
|
|
|
|
;; If necessary, prompt for the exact command.
|
2015-05-13 00:42:42 +00:00
|
|
|
|
;; TODO if pushing, prompt if no default push location - cf bzr.
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(when prompt
|
|
|
|
|
(setq args (split-string
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(read-shell-command
|
|
|
|
|
(format "Hg %s command: " command)
|
|
|
|
|
(format "%s %s%s" hg-program command
|
|
|
|
|
(if (not args) ""
|
|
|
|
|
(concat " " (mapconcat 'identity args " "))))
|
|
|
|
|
'vc-hg-history)
|
2011-01-29 03:12:32 +00:00
|
|
|
|
" " t))
|
|
|
|
|
(setq hg-program (car args)
|
|
|
|
|
command (cadr args)
|
|
|
|
|
args (cddr args)))
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(apply 'vc-do-async-command buffer root hg-program command args)
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(vc-run-delayed (vc-compilation-mode 'hg)))
|
2011-01-29 21:19:21 +00:00
|
|
|
|
(vc-set-async-update buffer)))))
|
2011-01-29 03:12:32 +00:00
|
|
|
|
|
2015-05-13 00:42:42 +00:00
|
|
|
|
(defun vc-hg-pull (prompt)
|
|
|
|
|
"Issue a Mercurial pull command.
|
|
|
|
|
If called interactively with a set of marked Log View buffers,
|
|
|
|
|
call \"hg pull -r REVS\" to pull in the specified revisions REVS.
|
|
|
|
|
|
|
|
|
|
With a prefix argument or if PROMPT is non-nil, prompt for a
|
|
|
|
|
specific Mercurial pull command. The default is \"hg pull -u\",
|
|
|
|
|
which fetches changesets from the default remote repository and
|
|
|
|
|
then attempts to update the working directory."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(vc-hg--pushpull "pull" prompt (called-interactively-p 'interactive)))
|
|
|
|
|
|
|
|
|
|
(defun vc-hg-push (prompt)
|
|
|
|
|
"Push changes from the current Mercurial branch.
|
|
|
|
|
Normally, this runs \"hg push\". If PROMPT is non-nil, prompt
|
|
|
|
|
for the Hg command to run.
|
|
|
|
|
|
|
|
|
|
If called interactively with a set of marked Log View buffers,
|
|
|
|
|
call \"hg push -r REVS\" to push the specified revisions REVS."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(vc-hg--pushpull "push" prompt (called-interactively-p 'interactive)))
|
|
|
|
|
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(defun vc-hg-merge-branch ()
|
2011-01-29 21:19:21 +00:00
|
|
|
|
"Merge incoming changes into the current working directory.
|
|
|
|
|
This runs the command \"hg merge\"."
|
2011-01-29 03:12:32 +00:00
|
|
|
|
(let* ((root (vc-hg-root default-directory))
|
|
|
|
|
(buffer (format "*vc-hg : %s*" (expand-file-name root))))
|
2011-03-10 08:32:27 +00:00
|
|
|
|
(apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
|
(with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
|
2011-01-29 21:19:21 +00:00
|
|
|
|
(vc-set-async-update buffer)))
|
2007-08-29 18:15:16 +00:00
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
|
;;; Internal functions
|
|
|
|
|
|
2007-07-18 16:32:40 +00:00
|
|
|
|
(defun vc-hg-command (buffer okstatus file-or-list &rest flags)
|
2007-06-20 05:59:41 +00:00
|
|
|
|
"A wrapper around `vc-do-command' for use in vc-hg.el.
|
2011-02-03 07:33:16 +00:00
|
|
|
|
This function differs from vc-do-command in that it invokes
|
|
|
|
|
`vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS."
|
2010-11-17 14:34:28 +00:00
|
|
|
|
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
|
2007-06-20 05:59:41 +00:00
|
|
|
|
(if (stringp vc-hg-global-switches)
|
|
|
|
|
(cons vc-hg-global-switches flags)
|
|
|
|
|
(append vc-hg-global-switches
|
|
|
|
|
flags))))
|
|
|
|
|
|
2007-07-06 21:14:21 +00:00
|
|
|
|
(defun vc-hg-root (file)
|
|
|
|
|
(vc-find-root file ".hg"))
|
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
|
(provide 'vc-hg)
|
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
|
;;; vc-hg.el ends here
|