123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773 |
- ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*-
- ;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
- ;; Author: Ivan Kanis
- ;; Maintainer: emacs-devel@gnu.org
- ;; Keywords: vc tools
- ;; Package: vc
- ;; This file is part of GNU Emacs.
- ;; GNU Emacs is free software: you can redistribute it and/or modify
- ;; it under the terms of the GNU General Public License as published by
- ;; the Free Software Foundation, either version 3 of the License, or
- ;; (at your option) any later version.
- ;; 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.
- ;; You should have received a copy of the GNU General Public License
- ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
- ;;; Commentary:
- ;; This is a mercurial version control backend
- ;;; Thanks:
- ;;; Bugs:
- ;;; Installation:
- ;;; Todo:
- ;; 1) Implement the rest of the vc interface. See the comment at the
- ;; beginning of vc.el. The current status is:
- ;; FUNCTION NAME STATUS
- ;; BACKEND PROPERTIES
- ;; * revision-granularity OK
- ;; STATE-QUERYING FUNCTIONS
- ;; * registered (file) OK
- ;; * state (file) OK
- ;; - dir-status-files (dir files uf) OK
- ;; - dir-extra-headers (dir) OK
- ;; - dir-printer (fileinfo) OK
- ;; * working-revision (file) OK
- ;; * checkout-model (files) OK
- ;; - mode-line-string (file) NOT NEEDED
- ;; STATE-CHANGING FUNCTIONS
- ;; * register (files &optional rev comment) OK
- ;; * create-repo () OK
- ;; - responsible-p (file) OK
- ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
- ;; - unregister (file) OK
- ;; * checkin (files rev comment) OK
- ;; * find-revision (file rev buffer) OK
- ;; * checkout (file &optional rev) OK
- ;; * revert (file &optional contents-done) OK
- ;; - merge (file rev1 rev2) NEEDED
- ;; - merge-news (file) NEEDED
- ;; - steal-lock (file &optional revision) NOT NEEDED
- ;; HISTORY FUNCTIONS
- ;; * print-log (files buffer &optional shortlog start-revision limit) OK
- ;; - log-view-mode () OK
- ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD
- ;; - comment-history (file) NOT NEEDED
- ;; - update-changelog (files) NOT NEEDED
- ;; * diff (files &optional rev1 rev2 buffer) OK
- ;; - revision-completion-table (files) OK?
- ;; - annotate-command (file buf &optional rev) OK
- ;; - annotate-time () OK
- ;; - annotate-current-time () NOT NEEDED
- ;; - annotate-extract-revision-at-line () OK
- ;; TAG SYSTEM
- ;; - create-tag (dir name branchp) OK
- ;; - retrieve-tag (dir name update) OK FIXME UPDATE BUFFERS
- ;; MISCELLANEOUS
- ;; - make-version-backups-p (file) ??
- ;; - previous-revision (file rev) OK
- ;; - next-revision (file rev) OK
- ;; - check-headers () ??
- ;; - delete-file (file) TEST IT
- ;; - rename-file (old new) OK
- ;; - find-file-hook () added for bug#10709
- ;; 2) Implement Stefan Monnier's advice:
- ;; vc-hg-registered and vc-hg-state
- ;; Both of those functions should be super extra careful to fail gracefully in
- ;; unexpected circumstances. The reason this is important is that any error
- ;; 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).
- ;;; History:
- ;;
- ;;; Code:
- (eval-when-compile
- (require 'cl-lib)
- (require 'vc)
- (require 'vc-dir))
- ;;; Customization options
- (defgroup vc-hg nil
- "VC Mercurial (hg) backend."
- :version "24.1"
- :group 'vc)
- (defcustom vc-hg-global-switches nil
- "Global switches to pass to any Hg command."
- :type '(choice (const :tag "None" nil)
- (string :tag "Argument String")
- (repeat :tag "Argument List" :value ("") string))
- :version "22.2"
- :group 'vc-hg)
- (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."
- :type '(choice (const :tag "Unspecified" nil)
- (const :tag "None" t)
- (string :tag "Argument String")
- (repeat :tag "Argument List" :value ("") string))
- :version "23.1"
- :group 'vc-hg)
- (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)
- (defcustom vc-hg-program "hg"
- "Name of the Mercurial executable (excluding any arguments)."
- :type 'string
- :group 'vc-hg)
- (defcustom vc-hg-root-log-format
- `(,(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\\}\\)")
- ((1 'log-view-message-face)
- (2 'change-log-file)
- (3 'change-log-list)
- (4 'change-log-conditionals)
- (5 'change-log-name)
- (6 'change-log-date)))
- "Mercurial log template for `vc-hg-print-log' short format.
- 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))
- :group 'vc-hg
- :version "24.5")
- ;;; Properties of the backend
- (defvar vc-hg-history nil)
- (defun vc-hg-revision-granularity () 'repository)
- (defun vc-hg-checkout-model (_files) 'implicit)
- ;;; State querying functions
- ;;;###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
- ;;;###autoload (load "vc-hg" nil t)
- ;;;###autoload (vc-hg-registered file))))
- ;; Modeled after the similar function in vc-bzr.el
- (defun vc-hg-registered (file)
- "Return non-nil if FILE is registered with hg."
- (when (vc-hg-root file) ; short cut
- (let ((state (vc-hg-state file))) ; expensive
- (and state (not (memq state '(ignored unregistered)))))))
- (defun vc-hg-state (file)
- "Hg-specific version of `vc-state'."
- (setq file (expand-file-name file))
- (let*
- ((status nil)
- (default-directory (file-name-directory file))
- (out
- (with-output-to-string
- (with-current-buffer
- standard-output
- (setq status
- (condition-case nil
- ;; Ignore all errors.
- (let ((process-environment
- ;; Avoid localization of messages so we
- ;; can parse the output. Disable pager.
- (append
- (list "TERM=dumb" "LANGUAGE=C" "HGPLAIN=1")
- process-environment)))
- (process-file
- vc-hg-program nil t nil
- "--config" "alias.status=status"
- "--config" "defaults.status="
- "status" "-A" (file-relative-name file)))
- ;; Some problem happened. E.g. We can't find an `hg'
- ;; executable.
- (error nil)))))))
- (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))))))
- (defun vc-hg-working-revision (file)
- "Hg-specific version of `vc-working-revision'."
- (or (ignore-errors
- (with-output-to-string
- (vc-hg-command standard-output 0 file
- "parent" "--template" "{rev}")))
- "0"))
- ;;; History functions
- (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)
- (autoload 'vc-setup-buffer "vc-dispatcher")
- (defvar vc-hg-log-graph nil
- "If non-nil, use `--graph' in the short log output.")
- (defvar vc-hg-log-format (concat "changeset: {rev}:{node|short}\n"
- "{tags % 'tag: {tag}\n'}"
- "{if(parents, 'parents: {parents}\n')}"
- "user: {author}\n"
- "Date: {date|date}\n"
- "summary: {desc|tabindent}\n\n")
- "Mercurial log template for `vc-hg-print-log' long format.")
- (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
- "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."
- ;; `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))
- (with-current-buffer
- buffer
- (apply 'vc-hg-command buffer 'async files "log"
- (nconc
- (when start-revision (list (format "-r%s:0" start-revision)))
- (when limit (list "-l" (format "%s" limit)))
- (if shortlog
- `(,@(if vc-hg-log-graph '("--graph"))
- "--template"
- ,(car vc-hg-root-log-format))
- `("--template" ,vc-hg-log-format))
- vc-hg-log-switches)))))
- (defvar log-view-message-re)
- (defvar log-view-file-re)
- (defvar log-view-font-lock-keywords)
- (defvar log-view-per-file-logs)
- (defvar log-view-expanded-log-entry-function)
- (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
- (require 'add-log) ;; we need the add-log faces
- (set (make-local-variable 'log-view-file-re) "\\`a\\`")
- (set (make-local-variable 'log-view-per-file-logs) nil)
- (set (make-local-variable 'log-view-message-re)
- (if (eq vc-log-view-type 'short)
- (cadr vc-hg-root-log-format)
- "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)"))
- (set (make-local-variable 'tab-width) 2)
- ;; 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))
- (set (make-local-variable 'log-view-font-lock-keywords)
- (if (eq vc-log-view-type 'short)
- (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)))))))
- (autoload 'vc-switches "vc")
- (defun vc-hg-diff (files &optional oldvers newvers buffer async)
- "Get a difference report using hg between two revisions of FILES."
- (let* ((firstfile (car files))
- (working (and firstfile (vc-working-revision firstfile))))
- (when (and (equal oldvers working) (not newvers))
- (setq oldvers nil))
- (when (and (not oldvers) newvers)
- (setq oldvers working))
- (apply #'vc-hg-command
- (or buffer "*vc-diff*")
- (if async 'async nil)
- files "diff"
- (append
- (vc-switches 'hg 'diff)
- (when oldvers
- (if newvers
- (list "-r" oldvers "-r" newvers)
- (list "-r" oldvers)))))))
- (defun vc-hg-expanded-log-entry (revision)
- (with-temp-buffer
- (vc-hg-command t nil nil "log" "-r" revision "--template" vc-hg-log-format)
- (goto-char (point-min))
- (unless (eobp)
- ;; Indent the expanded log entry.
- (indent-region (point-min) (point-max) 2)
- (goto-char (point-max))
- (buffer-string))))
- (defun vc-hg-revision-table (files)
- (let ((default-directory (file-name-directory (car files))))
- (with-temp-buffer
- (vc-hg-command t nil files "log" "--template" "{rev} ")
- (split-string
- (buffer-substring-no-properties (point-min) (point-max))))))
- ;; Modeled after the similar function in vc-cvs.el
- (defun vc-hg-revision-completion-table (files)
- (letrec ((table (lazy-completion-table
- table (lambda () (vc-hg-revision-table files)))))
- table))
- (defun vc-hg-annotate-command (file buffer &optional revision)
- "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
- Optional arg REVISION is a revision to annotate from."
- (apply #'vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow"
- (append (vc-switches 'hg 'annotate)
- (if revision (list (concat "-r" revision))))))
- (declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
- ;; 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
- ;; 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
- "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)")
- (defun vc-hg-annotate-time ()
- (when (looking-at vc-hg-annotate-re)
- (goto-char (match-end 0))
- (vc-annotate-convert-time
- (date-to-time (match-string-no-properties 2)))))
- (defun vc-hg-annotate-extract-revision-at-line ()
- (save-excursion
- (beginning-of-line)
- (when (looking-at vc-hg-annotate-re)
- (if (match-beginning 3)
- (match-string-no-properties 1)
- (cons (match-string-no-properties 1)
- (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))))
- (defun vc-hg-retrieve-tag (dir name _update)
- "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
- (defun vc-hg-previous-revision (_file rev)
- (let ((newrev (1- (string-to-number rev))))
- (when (>= newrev 0)
- (number-to-string newrev))))
- (defun vc-hg-next-revision (_file rev)
- (let ((newrev (1+ (string-to-number rev)))
- (tip-revision
- (with-temp-buffer
- (vc-hg-command t 0 nil "tip" "--style=default")
- (goto-char (point-min))
- (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
- (string-to-number (match-string-no-properties 1)))))
- ;; We don't want to exceed the maximum possible revision number, ie
- ;; the tip revision.
- (when (<= newrev tip-revision)
- (number-to-string newrev))))
- ;; Modeled after the similar function in vc-bzr.el
- (defun vc-hg-delete-file (file)
- "Delete FILE and delete it in the hg repository."
- (condition-case ()
- (delete-file file)
- (file-error nil))
- (vc-hg-command nil 0 file "remove" "--after" "--force"))
- ;; Modeled after the similar function in vc-bzr.el
- (defun vc-hg-rename-file (old new)
- "Rename file from OLD to NEW using `hg mv'."
- (vc-hg-command nil 0 new "mv" old))
- (defun vc-hg-register (files &optional _comment)
- "Register FILES under hg. COMMENT is ignored."
- (vc-hg-command nil 0 files "add"))
- (defun vc-hg-create-repo ()
- "Create a new Mercurial repository."
- (vc-hg-command nil 0 nil "init"))
- (defalias 'vc-hg-responsible-p 'vc-hg-root)
- (defun vc-hg-unregister (file)
- "Unregister FILE from hg."
- (vc-hg-command nil 0 file "forget"))
- (declare-function log-edit-extract-headers "log-edit" (headers string))
- (defun vc-hg-checkin (files comment &optional _rev)
- "Hg-specific version of `vc-backend-checkin'.
- REV is ignored."
- (apply 'vc-hg-command nil 0 files
- (nconc (list "commit" "-m")
- (log-edit-extract-headers '(("Author" . "--user")
- ("Date" . "--date"))
- comment))))
- (defun vc-hg-find-revision (file rev buffer)
- (let ((coding-system-for-read 'binary)
- (coding-system-for-write 'binary))
- (if rev
- (vc-hg-command buffer 0 file "cat" "-r" rev)
- (vc-hg-command buffer 0 file "cat"))))
- (defun vc-hg-find-ignore-file (file)
- "Return the root directory of the repository of FILE."
- (expand-file-name ".hgignore"
- (vc-hg-root file)))
- ;; Modeled after the similar function in vc-bzr.el
- (defun vc-hg-checkout (file &optional rev)
- "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
- (vc-hg-command t 0 file "cat" "-r" rev)
- (vc-hg-command t 0 file "cat")))))
- (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)
- (vc-message-unresolved-conflicts buffer-file-name)))
- ;; Modeled after the similar function in vc-bzr.el
- (defun vc-hg-revert (file &optional contents-done)
- (unless contents-done
- (with-temp-buffer (vc-hg-command t 0 file "revert"))))
- ;;; 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)
- (defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
- (defvar log-view-vc-backend)
- (cl-defstruct (vc-hg-extra-fileinfo
- (:copier nil)
- (:constructor vc-hg-create-extra-fileinfo (rename-state extra-name))
- (:conc-name vc-hg-extra-fileinfo->))
- rename-state ;; rename or copy state
- extra-name) ;; original name for copies and rename targets, new name for
- (declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
- (defun vc-hg-dir-printer (info)
- "Pretty-printer for the vc-dir-fileinfo structure."
- (let ((extra (vc-dir-fileinfo->extra info)))
- (vc-default-dir-printer 'Hg info)
- (when extra
- (insert (propertize
- (format " (%s %s)"
- (pcase (vc-hg-extra-fileinfo->rename-state extra)
- (`copied "copied from")
- (`renamed-from "renamed from")
- (`renamed-to "renamed to"))
- (vc-hg-extra-fileinfo->extra-name extra))
- 'face 'font-lock-comment-face)))))
- (defun vc-hg-after-dir-status (update-function)
- (let ((file nil)
- (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))
- (goto-char (point-min))
- (while (not (eobp))
- (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))
- (funcall update-function result)))
- ;; 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))
- (defun vc-hg-dir-status-files (dir files update-function)
- (apply 'vc-hg-command (current-buffer) 'async dir "status"
- (concat "-mardu" (if files "i"))
- "-C" files)
- (vc-run-delayed
- (vc-hg-after-dir-status update-function)))
- (defun vc-hg-dir-extra-header (name &rest commands)
- (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)))
- (defun vc-hg-dir-extra-headers (dir)
- "Generate extra status headers for a Mercurial tree."
- (let ((default-directory dir))
- (concat
- (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"
- ;; these change after each commit
- ;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n"
- ;; (vc-hg-dir-extra-header "Global id : " "id" "-i")
- )))
- (defun vc-hg-log-incoming (buffer remote-location)
- (vc-hg-command buffer 1 nil "incoming" "-n" (unless (string= remote-location "")
- remote-location)))
- (defun vc-hg-log-outgoing (buffer remote-location)
- (vc-hg-command buffer 1 nil "outgoing" "-n" (unless (string= remote-location "")
- remote-location)))
- (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.")
- (autoload 'vc-do-async-command "vc-dispatcher")
- (autoload 'log-view-get-marked "log-view")
- (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."
- (let (marked-list)
- ;; 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)))
- (apply #'vc-hg-command
- nil 0 nil
- command
- (apply 'nconc
- (mapcar (lambda (arg) (list "-r" arg)) marked-list)))
- (let* ((root (vc-hg-root default-directory))
- (buffer (format "*vc-hg : %s*" (expand-file-name root)))
- (hg-program vc-hg-program)
- ;; Fixme: before updating the working copy to the latest
- ;; state, should check if it's visiting an old revision.
- (args (if (equal command "pull") '("-u"))))
- ;; If necessary, prompt for the exact command.
- ;; TODO if pushing, prompt if no default push location - cf bzr.
- (when prompt
- (setq args (split-string
- (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)
- " " t))
- (setq hg-program (car args)
- command (cadr args)
- args (cddr args)))
- (apply 'vc-do-async-command buffer root hg-program command args)
- (with-current-buffer buffer
- (vc-run-delayed (vc-compilation-mode 'hg)))
- (vc-set-async-update buffer)))))
- (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)))
- (defun vc-hg-merge-branch ()
- "Merge incoming changes into the current working directory.
- This runs the command \"hg merge\"."
- (let* ((root (vc-hg-root default-directory))
- (buffer (format "*vc-hg : %s*" (expand-file-name root))))
- (apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
- (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
- (vc-set-async-update buffer)))
- ;;; Internal functions
- (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
- "A wrapper around `vc-do-command' for use in vc-hg.el.
- This function differs from vc-do-command in that it invokes
- `vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS."
- (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
- (if (stringp vc-hg-global-switches)
- (cons vc-hg-global-switches flags)
- (append vc-hg-global-switches
- flags))))
- (defun vc-hg-root (file)
- (vc-find-root file ".hg"))
- (provide 'vc-hg)
- ;;; vc-hg.el ends here
|