2001-02-11 21:31:57 +00:00
|
|
|
;;; shadowfile.el --- automatic file copying
|
1993-11-23 07:00:40 +00:00
|
|
|
|
2021-01-01 01:13:56 -08:00
|
|
|
;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc.
|
1993-11-23 07:00:40 +00:00
|
|
|
|
1999-08-16 04:04:27 +00:00
|
|
|
;; Author: Boris Goldowsky <boris@gnu.org>
|
2001-02-11 21:31:57 +00:00
|
|
|
;; Keywords: comm files
|
1995-10-30 17:35:01 +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
|
1995-10-30 17:35:01 +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.
|
1995-10-30 17:35:01 +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.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1993-11-23 07:00:40 +00:00
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
;;; Commentary:
|
1993-11-23 07:00:40 +00:00
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
;; This package helps you to keep identical copies of files in more than one
|
|
|
|
;; place - possibly on different machines. When you save a file, it checks
|
|
|
|
;; whether it is on the list of files with "shadows", and if so, it tries to
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; copy it when you exit Emacs (or use the `shadow-copy-files' command).
|
1993-11-23 07:00:40 +00:00
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
;; Installation & Use:
|
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; Add clusters (if necessary) and file groups with `shadow-define-cluster',
|
|
|
|
;; `shadow-define-literal-group', and `shadow-define-regexp-group' (see the
|
2001-02-11 21:31:57 +00:00
|
|
|
;; documentation for these functions for information on how and when to use
|
|
|
|
;; them). After doing this once, everything should be automatic.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; The lists of clusters and shadows are saved in `shadow-info-file',
|
|
|
|
;; so that they can be remembered from one Emacs session to another,
|
|
|
|
;; even (as much as possible) if the Emacs session terminates
|
|
|
|
;; abnormally. The files needing to be copied are stored in
|
|
|
|
;; `shadow-todo-file'; if a file cannot be copied for any reason, it
|
|
|
|
;; will stay on the list to be tried again next time. The
|
|
|
|
;; `shadow-info-file' file should itself have shadows on all your
|
|
|
|
;; accounts so that the information in it is consistent everywhere,
|
|
|
|
;; but `shadow-todo-file' is local information and should have no
|
|
|
|
;; shadows.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
|
|
;; If you do not want to copy a particular file, you can answer "no" and
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; be asked again next time you hit "C-x 4 s" or exit Emacs. If you do not
|
|
|
|
;; want to be asked again, use "M-x shadow-cancel", and you will not be asked
|
1996-01-14 07:34:30 +00:00
|
|
|
;; until you change the file and save it again. If you do not want to
|
2014-01-26 18:02:28 -08:00
|
|
|
;; shadow that file ever again, you can edit it out of the shadows
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; buffer. Anytime you edit the shadows buffer, you must type "M-x
|
|
|
|
;; shadow-read-files" to load in the new information, or your changes will
|
1996-01-14 07:34:30 +00:00
|
|
|
;; be overwritten!
|
|
|
|
|
|
|
|
;; Bugs & Warnings:
|
|
|
|
;;
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; - It is bad to have two Emacsen both running shadowfile at the same
|
1996-01-14 07:34:30 +00:00
|
|
|
;; time. It tries to detect this condition, but is not always successful.
|
|
|
|
;;
|
|
|
|
;; - You have to be careful not to edit a file in two locations
|
|
|
|
;; before shadowfile has had a chance to copy it; otherwise
|
|
|
|
;; "updating shadows" will overwrite one of the changed versions.
|
|
|
|
;;
|
|
|
|
;; - It ought to check modification times of both files to make sure
|
|
|
|
;; it is doing the right thing. This will have to wait until
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;; `file-newer-than-file-p' works between machines.
|
1996-01-14 07:34:30 +00:00
|
|
|
;;
|
|
|
|
;; - It will not make directories for you, it just fails to copy files
|
|
|
|
;; that belong in non-existent directories.
|
1993-11-23 07:00:40 +00:00
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
|
1993-11-23 07:00:40 +00:00
|
|
|
;;; Code:
|
|
|
|
|
2013-07-11 20:54:57 -07:00
|
|
|
(require 'cl-lib)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(require 'tramp)
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; Variables
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
(defgroup shadow nil
|
|
|
|
"Automatic file copying when saving a file."
|
|
|
|
:prefix "shadow-"
|
2001-02-11 21:31:57 +00:00
|
|
|
:link '(emacs-commentary-link "shadowfile")
|
1998-03-07 18:19:38 +00:00
|
|
|
:group 'files)
|
|
|
|
|
|
|
|
(defcustom shadow-noquery nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"If t, always copy shadow files without asking.
|
2011-04-19 15:44:55 +02:00
|
|
|
If nil (the default), always ask. If not nil and not t, ask only if there
|
1998-03-07 18:19:38 +00:00
|
|
|
is no buffer currently visiting the file."
|
1998-06-24 09:23:52 +00:00
|
|
|
:type '(choice (const t) (const nil) (other :tag "Ask if no buffer" maybe))
|
1998-03-07 18:19:38 +00:00
|
|
|
:group 'shadow)
|
1993-11-23 07:00:40 +00:00
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
(defcustom shadow-inhibit-message nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"If non-nil, do not display a message when a file needs copying."
|
1998-03-07 18:19:38 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'shadow)
|
1993-11-23 07:00:40 +00:00
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
(defcustom shadow-inhibit-overload nil
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
"If non-nil, shadowfile won't redefine \\[save-buffers-kill-emacs].
|
2007-10-31 00:22:34 +00:00
|
|
|
Normally it overloads the function `save-buffers-kill-emacs' to check for
|
|
|
|
files that have been changed and need to be copied to other systems."
|
1998-03-07 18:19:38 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'shadow)
|
1993-11-23 07:00:40 +00:00
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(defcustom shadow-info-file (locate-user-emacs-file "shadows" ".shadows")
|
2001-02-11 21:31:57 +00:00
|
|
|
"File to keep shadow information in.
|
|
|
|
The `shadow-info-file' should be shadowed to all your accounts to
|
2014-01-26 18:02:28 -08:00
|
|
|
ensure consistency. Default: ~/.emacs.d/shadows"
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
:type 'file
|
|
|
|
:group 'shadow
|
|
|
|
:version "26.2")
|
1993-11-23 07:00:40 +00:00
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(defcustom shadow-todo-file
|
|
|
|
(locate-user-emacs-file "shadow_todo" ".shadow_todo")
|
1993-11-23 07:00:40 +00:00
|
|
|
"File to store the list of uncopied shadows in.
|
|
|
|
This means that if a remote system is down, or for any reason you cannot or
|
2001-02-11 21:31:57 +00:00
|
|
|
decide not to copy your shadow files at the end of one Emacs session, it will
|
|
|
|
remember and ask you again in your next Emacs session.
|
1993-11-23 07:00:40 +00:00
|
|
|
This file must NOT be shadowed to any other system, it is host-specific.
|
2014-01-26 18:02:28 -08:00
|
|
|
Default: ~/.emacs.d/shadow_todo"
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
:type 'file
|
|
|
|
:group 'shadow
|
|
|
|
:version "26.2")
|
1998-03-07 18:19:38 +00:00
|
|
|
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
;;; The following two variables should in most cases initialize themselves
|
|
|
|
;;; correctly. They are provided as variables in case the defaults are wrong
|
2011-04-19 15:44:55 +02:00
|
|
|
;;; on your machine (and for efficiency).
|
1993-11-23 07:00:40 +00:00
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(defvar shadow-system-name (concat "/" (system-name) ":")
|
|
|
|
"The identification for local files on this machine.")
|
1993-11-23 07:00:40 +00:00
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(defvar shadow-homedir "~"
|
1993-11-23 07:00:40 +00:00
|
|
|
"Your home directory on this machine.")
|
|
|
|
|
|
|
|
;;;
|
|
|
|
;;; Internal variables whose values are stored in the info and todo files:
|
|
|
|
;;;
|
|
|
|
|
|
|
|
(defvar shadow-clusters nil
|
2011-04-19 15:44:55 +02:00
|
|
|
"List of host clusters (see `shadow-define-cluster').")
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defvar shadow-literal-groups nil
|
|
|
|
"List of files that are shared between hosts.
|
|
|
|
This list contains shadow structures with literal filenames, created by
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
`shadow-define-literal-group'.")
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defvar shadow-regexp-groups nil
|
|
|
|
"List of file types that are shared between hosts.
|
2001-02-11 21:31:57 +00:00
|
|
|
This list contains shadow structures with regexps matching filenames,
|
|
|
|
created by `shadow-define-regexp-group'.")
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
;;;
|
|
|
|
;;; Other internal variables:
|
|
|
|
;;;
|
|
|
|
|
|
|
|
(defvar shadow-files-to-copy nil) ; List of files that need to
|
|
|
|
; be copied to remote hosts.
|
|
|
|
|
|
|
|
(defvar shadow-hashtable nil) ; for speed
|
|
|
|
|
|
|
|
(defvar shadow-info-buffer nil) ; buf visiting shadow-info-file
|
|
|
|
(defvar shadow-todo-buffer nil) ; buf visiting shadow-todo-file
|
|
|
|
|
2019-09-03 13:55:42 +02:00
|
|
|
(defvar shadow-debug nil
|
|
|
|
"Use for debug messages.")
|
|
|
|
|
1993-11-23 07:00:40 +00:00
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; Syntactic sugar; General list and string manipulation
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
(defun shadow-union (a b)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Add members of list A to list B if not equal to items already in B."
|
1993-11-23 07:00:40 +00:00
|
|
|
(if (null a)
|
|
|
|
b
|
|
|
|
(if (member (car a) b)
|
|
|
|
(shadow-union (cdr a) b)
|
|
|
|
(shadow-union (cdr a) (cons (car a) b)))))
|
|
|
|
|
|
|
|
(defun shadow-find (func list)
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
"If FUNC applied to some element of LIST is non-nil, return first such element."
|
1993-11-23 07:00:40 +00:00
|
|
|
(while (and list (not (funcall func (car list))))
|
|
|
|
(setq list (cdr list)))
|
|
|
|
(car list))
|
|
|
|
|
|
|
|
(defun shadow-regexp-superquote (string)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"Like `regexp-quote', but includes the \\` and \\'.
|
2001-02-11 21:31:57 +00:00
|
|
|
This makes sure regexp matches nothing but STRING."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(concat "\\`" (regexp-quote string) "\\'"))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-suffix (prefix string)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"If PREFIX begins with STRING, return the rest.
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
Return value is non-nil if PREFIX and STRING are `string=' up to the length of
|
1993-11-23 07:00:40 +00:00
|
|
|
PREFIX."
|
|
|
|
(let ((lp (length prefix))
|
|
|
|
(ls (length string)))
|
|
|
|
(if (and (>= ls lp)
|
|
|
|
(string= prefix (substring string 0 lp)))
|
|
|
|
(substring string lp))))
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; Clusters and sites
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;;; I use the term `site' to refer to a string which may be the
|
|
|
|
;;; cluster identification "/name:", a remote identification
|
2019-09-13 14:25:56 +02:00
|
|
|
;;; "/method:user@host:", or "/system-name:" (the value of
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
;;; `shadow-system-name') for the location of local files. All
|
|
|
|
;;; user-level commands should accept either.
|
1993-11-23 07:00:40 +00:00
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(cl-defstruct (shadow-cluster (:type list) :named) name primary regexp)
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-set-cluster (name primary regexp)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Put cluster NAME on the list of clusters.
|
|
|
|
Replace old definition, if any. PRIMARY and REGEXP are the
|
1993-11-23 07:00:40 +00:00
|
|
|
information defining the cluster. For interactive use, call
|
2001-02-11 21:31:57 +00:00
|
|
|
`shadow-define-cluster' instead."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(let ((rest (cl-remove-if (lambda (x) (equal name (shadow-cluster-name x)))
|
2013-07-11 20:54:57 -07:00
|
|
|
shadow-clusters)))
|
2001-02-11 21:31:57 +00:00
|
|
|
(setq shadow-clusters
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(cons (make-shadow-cluster :name name :primary primary :regexp regexp)
|
1993-11-23 07:00:40 +00:00
|
|
|
rest))))
|
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(defun shadow-get-cluster (name)
|
1993-11-23 07:00:40 +00:00
|
|
|
"Return cluster named NAME, or nil."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(shadow-find
|
|
|
|
(lambda (x) (string-equal (shadow-cluster-name x) name))
|
|
|
|
shadow-clusters))
|
|
|
|
|
|
|
|
;;; SITES
|
|
|
|
|
|
|
|
(defun shadow-site-name (site)
|
|
|
|
"Return name if SITE has the form \"/name:\", otherwise SITE."
|
2018-07-21 12:29:06 +02:00
|
|
|
(if (string-match "\\`/\\([-.[:word:]]+\\):\\'" site)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(match-string 1 site) site))
|
|
|
|
|
|
|
|
(defun shadow-name-site (name)
|
|
|
|
"Return \"/name:\" if NAME has word syntax, otherwise NAME."
|
2018-07-21 12:29:06 +02:00
|
|
|
(if (string-match "\\`[-.[:word:]]+\\'" name)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(format "/%s:"name) name))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-site-primary (site)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"If SITE is a cluster, return primary identification, otherwise return SITE."
|
|
|
|
(let ((cluster (shadow-get-cluster (shadow-site-name site))))
|
|
|
|
(if cluster
|
|
|
|
(shadow-cluster-primary cluster)
|
1993-11-23 07:00:40 +00:00
|
|
|
site)))
|
|
|
|
|
|
|
|
(defun shadow-site-cluster (site)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"Given a SITE, return cluster it is in, or nil."
|
|
|
|
(or (shadow-get-cluster (shadow-site-name site))
|
1993-11-23 07:00:40 +00:00
|
|
|
(shadow-find
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(lambda (x)
|
|
|
|
(string-match (shadow-cluster-regexp x) (shadow-name-site site)))
|
1993-11-23 07:00:40 +00:00
|
|
|
shadow-clusters)))
|
|
|
|
|
|
|
|
(defun shadow-read-site ()
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"Read a cluster name or host identification from the minibuffer."
|
|
|
|
(let ((ans (completing-read "Host identification or cluster name: "
|
1993-11-23 07:00:40 +00:00
|
|
|
shadow-clusters)))
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(when (or (shadow-get-cluster (shadow-site-name ans))
|
|
|
|
(string-equal ans shadow-system-name)
|
|
|
|
(string-equal ans (shadow-site-name shadow-system-name))
|
|
|
|
(setq ans (file-remote-p ans)))
|
1993-11-23 07:00:40 +00:00
|
|
|
ans)))
|
|
|
|
|
|
|
|
(defun shadow-site-match (site1 site2)
|
2007-08-08 07:40:09 +00:00
|
|
|
"Non-nil if SITE1 is or includes SITE2.
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
Each may be a host or cluster name; if they are clusters, regexp of SITE1 will
|
|
|
|
be matched against the primary of SITE2."
|
1993-11-23 07:00:40 +00:00
|
|
|
(or (string-equal site1 site2) ; quick check
|
|
|
|
(let* ((cluster1 (shadow-get-cluster site1))
|
|
|
|
(primary2 (shadow-site-primary site2)))
|
|
|
|
(if cluster1
|
|
|
|
(string-match (shadow-cluster-regexp cluster1) primary2)
|
|
|
|
(string-equal site1 primary2)))))
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; Filename manipulation
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
2003-04-03 23:11:06 +00:00
|
|
|
(defun shadow-parse-name (name)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"Parse any NAME into a `tramp-file-name' structure.
|
|
|
|
Argument can be a simple name, remote file name, or already a
|
|
|
|
`tramp-file-name' structure."
|
|
|
|
(cond
|
|
|
|
((null name) nil)
|
|
|
|
((tramp-file-name-p name) name)
|
|
|
|
((file-remote-p name) (tramp-dissect-file-name name))
|
|
|
|
((shadow-local-file name)
|
|
|
|
(make-tramp-file-name
|
|
|
|
:host (shadow-site-name shadow-system-name)
|
|
|
|
:localname (shadow-local-file name)))
|
|
|
|
;; Cluster name.
|
|
|
|
((string-match "^/\\([^:/]+\\):\\([^:]*\\)$" name)
|
|
|
|
(let ((name (match-string 1 name))
|
|
|
|
(file (match-string 2 name)))
|
|
|
|
(when (shadow-get-cluster name)
|
|
|
|
(make-tramp-file-name :host name :localname file))))))
|
|
|
|
|
|
|
|
(defsubst shadow-make-fullname (hup &optional host name)
|
|
|
|
"Make a Tramp style fullname out of HUP, a `tramp-file-name' structure.
|
|
|
|
Replace HOST, and NAME when non-nil."
|
|
|
|
(let ((hup (copy-tramp-file-name hup)))
|
|
|
|
(when host (setf (tramp-file-name-host hup) host))
|
|
|
|
(when name (setf (tramp-file-name-localname hup) name))
|
|
|
|
(if (null (tramp-file-name-method hup))
|
|
|
|
(format
|
|
|
|
"/%s:%s" (tramp-file-name-host hup) (tramp-file-name-localname hup))
|
2018-07-25 13:18:46 +02:00
|
|
|
(tramp-make-tramp-file-name hup))))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
2003-04-03 23:11:06 +00:00
|
|
|
(defun shadow-replace-name-component (fullname newname)
|
|
|
|
"Return FULLNAME with the name component changed to NEWNAME."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(concat (file-remote-p fullname) newname))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-local-file (file)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"If FILE is not remote, return it.
|
|
|
|
If it refers to a different system, return nil."
|
|
|
|
(cond
|
|
|
|
((null file) nil)
|
|
|
|
;; `tramp-file-name' structure.
|
|
|
|
((and (tramp-file-name-p file) (null (tramp-file-name-method file)))
|
|
|
|
(tramp-file-name-localname file))
|
|
|
|
((tramp-file-name-p file) nil)
|
|
|
|
;; Local host name.
|
|
|
|
((string-match
|
|
|
|
(format "^%s\\([^:]*\\)$" (regexp-quote shadow-system-name)) file)
|
|
|
|
(match-string 1 file))
|
|
|
|
;; Cluster name.
|
|
|
|
((and (string-match "^/\\([^:/]+\\):\\([^:]*\\)$" file)
|
|
|
|
(shadow-get-cluster (match-string 1 file)))
|
|
|
|
(let ((file (match-string 2 file))
|
|
|
|
(primary
|
|
|
|
(shadow-cluster-primary
|
|
|
|
(shadow-get-cluster (match-string 1 file)))))
|
|
|
|
(when (string-equal primary shadow-system-name) (setq primary nil))
|
|
|
|
(shadow-local-file (concat primary file))))
|
|
|
|
;; Local name.
|
|
|
|
((null (file-remote-p file)) file)))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-expand-cluster-in-file-name (file)
|
2001-02-11 21:31:57 +00:00
|
|
|
"If hostname part of FILE is a cluster, expand it to cluster's primary hostname.
|
2003-04-03 23:11:06 +00:00
|
|
|
Will return the name bare if it is a local file."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(when (stringp file)
|
|
|
|
(cond
|
|
|
|
;; Local file.
|
|
|
|
((shadow-local-file file))
|
|
|
|
;; Cluster name.
|
|
|
|
((string-match "^\\(/[^:/]+:\\)[^:]*$" file)
|
|
|
|
(let ((primary
|
|
|
|
(save-match-data
|
|
|
|
(shadow-cluster-primary
|
|
|
|
(shadow-get-cluster
|
|
|
|
(shadow-site-name (match-string 1 file)))))))
|
|
|
|
(if (not primary)
|
|
|
|
file
|
|
|
|
(setq file (replace-match primary nil nil file 1))
|
|
|
|
(or (shadow-local-file file) file))))
|
|
|
|
(t file))))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-expand-file-name (file &optional default)
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
"Expand file name and get FILE's true name."
|
1993-11-23 07:00:40 +00:00
|
|
|
(file-truename (expand-file-name file default)))
|
|
|
|
|
|
|
|
(defun shadow-contract-file-name (file)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Simplify FILE.
|
|
|
|
Do so by replacing (when possible) home directory with ~, and hostname
|
|
|
|
with cluster name that includes it. Filename should be absolute and
|
|
|
|
true."
|
2003-04-03 23:11:06 +00:00
|
|
|
(let* ((hup (shadow-parse-name file))
|
1993-11-23 07:00:40 +00:00
|
|
|
(homedir (if (shadow-local-file hup)
|
|
|
|
shadow-homedir
|
|
|
|
(file-name-as-directory
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(file-local-name
|
|
|
|
(expand-file-name (shadow-make-fullname hup nil "~"))))))
|
|
|
|
(suffix (shadow-suffix homedir (tramp-file-name-localname hup)))
|
|
|
|
(cluster (shadow-site-cluster (shadow-make-fullname hup nil ""))))
|
|
|
|
(when cluster
|
|
|
|
(setf (tramp-file-name-method hup) nil
|
|
|
|
(tramp-file-name-host hup) (shadow-cluster-name cluster)))
|
2003-04-03 23:11:06 +00:00
|
|
|
(shadow-make-fullname
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
hup nil
|
2001-02-11 21:31:57 +00:00
|
|
|
(if suffix
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(concat "~/" suffix)
|
|
|
|
(tramp-file-name-localname hup)))))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-same-site (pattern file)
|
|
|
|
"True if the site of PATTERN and of FILE are on the same site.
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
PATTERN and FILE may be Tramp vectors, or remote file names.
|
|
|
|
FILE may also be just a local filename."
|
|
|
|
(let ((pattern-sup (shadow-parse-name pattern))
|
2003-04-03 23:11:06 +00:00
|
|
|
(file-sup (shadow-parse-name file)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(and
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(shadow-site-match
|
|
|
|
(tramp-file-name-host pattern-sup) (tramp-file-name-host file-sup))
|
|
|
|
(or (null (tramp-file-name-user pattern-sup))
|
|
|
|
(string-equal
|
|
|
|
(tramp-file-name-user pattern-sup)
|
|
|
|
(tramp-file-name-user file-sup))))))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-file-match (pattern file &optional regexp)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Return t if PATTERN matches FILE.
|
2003-04-03 23:11:06 +00:00
|
|
|
If REGEXP is supplied and non-nil, the file part of the pattern is a regular
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
expression, otherwise it must match exactly. The sites must
|
|
|
|
match---see `shadow-same-site'. The pattern must be in full Tramp format,
|
2007-10-31 00:22:34 +00:00
|
|
|
but the file can be any valid filename. This function does not do any
|
|
|
|
filename expansion or contraction, you must do that yourself first."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(let* ((pattern-sup (shadow-parse-name pattern))
|
2003-04-03 23:11:06 +00:00
|
|
|
(file-sup (shadow-parse-name file)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(and (shadow-same-site pattern-sup file-sup)
|
2001-02-11 21:31:57 +00:00
|
|
|
(if regexp
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(string-match
|
|
|
|
(tramp-file-name-localname pattern-sup)
|
|
|
|
(tramp-file-name-localname file-sup))
|
|
|
|
(string-equal
|
|
|
|
(tramp-file-name-localname pattern-sup)
|
2019-10-17 02:08:43 +02:00
|
|
|
(tramp-file-name-localname file-sup)))
|
|
|
|
t)))
|
2003-02-04 12:29:42 +00:00
|
|
|
|
1993-11-23 07:00:40 +00:00
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; User-level Commands
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
;;;###autoload
|
1993-11-23 07:00:40 +00:00
|
|
|
(defun shadow-define-cluster (name)
|
2011-04-19 15:44:55 +02:00
|
|
|
"Edit (or create) the definition of a cluster NAME.
|
1993-11-23 07:00:40 +00:00
|
|
|
This is a group of hosts that share directories, so that copying to or from
|
|
|
|
one of them is sufficient to update the file on all of them. Clusters are
|
2011-04-19 15:44:55 +02:00
|
|
|
defined by a name, the network address of a primary host (the one we copy
|
2007-10-31 00:22:34 +00:00
|
|
|
files to), and a regular expression that matches the hostnames of all the
|
|
|
|
sites in the cluster."
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(interactive (list (completing-read "Cluster name: " shadow-clusters)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(let* ((old (shadow-get-cluster name))
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(primary (let (try-primary)
|
|
|
|
(while (not
|
|
|
|
(or
|
|
|
|
(string-equal
|
|
|
|
(setq try-primary
|
2001-02-11 21:31:57 +00:00
|
|
|
(read-string
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
"Primary host: "
|
|
|
|
(if old (shadow-cluster-primary old)
|
|
|
|
name)))
|
|
|
|
shadow-system-name)
|
|
|
|
(file-remote-p try-primary)))
|
|
|
|
(message "Not a valid primary!")
|
|
|
|
(sit-for 2))
|
|
|
|
try-primary))
|
|
|
|
(regexp (let (try-regexp)
|
|
|
|
(while (not
|
|
|
|
(string-match
|
|
|
|
(setq try-regexp
|
|
|
|
(read-string
|
|
|
|
"Regexp matching all host names: "
|
|
|
|
(if old (shadow-cluster-regexp old)
|
|
|
|
(shadow-regexp-superquote primary))))
|
|
|
|
primary))
|
|
|
|
(message "Regexp doesn't include the primary host!")
|
|
|
|
(sit-for 2))
|
|
|
|
try-regexp)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(shadow-set-cluster name primary regexp)))
|
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
;;;###autoload
|
1993-11-23 07:00:40 +00:00
|
|
|
(defun shadow-define-literal-group ()
|
|
|
|
"Declare a single file to be shared between sites.
|
|
|
|
It may have different filenames on each site. When this file is edited, the
|
|
|
|
new version will be copied to each of the other locations. Sites can be
|
2011-04-19 15:44:55 +02:00
|
|
|
specific hostnames, or names of clusters (see `shadow-define-cluster')."
|
1993-11-23 07:00:40 +00:00
|
|
|
(interactive)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(let* ((hup (shadow-parse-name
|
2014-11-04 21:08:12 -08:00
|
|
|
(shadow-contract-file-name (buffer-file-name))))
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(name (tramp-file-name-localname hup))
|
|
|
|
site group)
|
1993-11-23 07:00:40 +00:00
|
|
|
(while (setq site (shadow-read-site))
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(setq name (read-string "Filename: " name)
|
|
|
|
hup (shadow-parse-name (shadow-contract-file-name name))
|
|
|
|
group (cons (shadow-make-fullname hup site) group)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(setq shadow-literal-groups (cons group shadow-literal-groups)))
|
|
|
|
(shadow-write-info-file))
|
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
;;;###autoload
|
1993-11-23 07:00:40 +00:00
|
|
|
(defun shadow-define-regexp-group ()
|
|
|
|
"Make each of a group of files be shared between hosts.
|
|
|
|
Prompts for regular expression; files matching this are shared between a list
|
2001-02-11 21:31:57 +00:00
|
|
|
of sites, which are also prompted for. The filenames must be identical on all
|
2011-04-19 15:44:55 +02:00
|
|
|
hosts (if they aren't, use `shadow-define-literal-group' instead of this
|
|
|
|
function). Each site can be either a hostname or the name of a cluster (see
|
2001-02-11 21:31:57 +00:00
|
|
|
`shadow-define-cluster')."
|
1993-11-23 07:00:40 +00:00
|
|
|
(interactive)
|
2001-02-11 21:31:57 +00:00
|
|
|
(let ((regexp (read-string
|
|
|
|
"Filename regexp: "
|
1993-11-23 07:00:40 +00:00
|
|
|
(if (buffer-file-name)
|
|
|
|
(shadow-regexp-superquote
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(file-local-name (buffer-file-name))))))
|
|
|
|
site sites)
|
1993-11-23 07:00:40 +00:00
|
|
|
(while (setq site (shadow-read-site))
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(setq sites (cons site sites)))
|
2001-02-11 21:31:57 +00:00
|
|
|
(setq shadow-regexp-groups
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(cons (shadow-make-group regexp sites)
|
1993-11-23 07:00:40 +00:00
|
|
|
shadow-regexp-groups))
|
|
|
|
(shadow-write-info-file)))
|
2003-02-04 12:29:42 +00:00
|
|
|
|
1993-11-23 07:00:40 +00:00
|
|
|
(defun shadow-shadows ()
|
|
|
|
;; Mostly for debugging.
|
|
|
|
"Interactive function to display shadows of a buffer."
|
|
|
|
(interactive)
|
2007-10-31 10:24:20 +00:00
|
|
|
(let ((msg (mapconcat #'cdr (shadow-shadows-of (buffer-file-name)) " ")))
|
1996-01-25 01:16:55 +00:00
|
|
|
(message "%s"
|
2001-02-11 21:31:57 +00:00
|
|
|
(if (zerop (length msg))
|
1993-11-23 07:00:40 +00:00
|
|
|
"No shadows."
|
|
|
|
msg))))
|
|
|
|
|
|
|
|
(defun shadow-copy-files (&optional arg)
|
|
|
|
"Copy all pending shadow files.
|
|
|
|
With prefix argument, copy all pending files without query.
|
2001-02-11 21:31:57 +00:00
|
|
|
Pending copies are stored in variable `shadow-files-to-copy', and in
|
|
|
|
`shadow-todo-file' if necessary. This function is invoked by
|
|
|
|
`shadow-save-buffers-kill-emacs', so it is not usually necessary to
|
1993-11-23 07:00:40 +00:00
|
|
|
call it manually."
|
|
|
|
(interactive "P")
|
2004-10-27 17:41:24 +00:00
|
|
|
(if (not shadow-files-to-copy)
|
2009-10-02 03:48:36 +00:00
|
|
|
(if (called-interactively-p 'interactive)
|
2004-10-27 17:41:24 +00:00
|
|
|
(message "No files need to be shadowed."))
|
1993-11-23 07:00:40 +00:00
|
|
|
(save-excursion
|
2020-11-14 17:04:23 +01:00
|
|
|
(map-y-or-n-p (lambda (pair)
|
|
|
|
(or arg shadow-noquery
|
|
|
|
(format "Copy shadow file %s? " (cdr pair))))
|
1993-11-23 07:00:40 +00:00
|
|
|
(function shadow-copy-file)
|
|
|
|
shadow-files-to-copy
|
|
|
|
'("shadow" "shadows" "copy"))
|
|
|
|
(shadow-write-todo-file t))))
|
|
|
|
|
|
|
|
(defun shadow-cancel ()
|
|
|
|
"Cancel the instruction to copy some files.
|
|
|
|
Prompts for which copy operations to cancel. You will not be asked to copy
|
|
|
|
them again, unless you make more changes to the files. To cancel a shadow
|
2001-02-11 21:31:57 +00:00
|
|
|
permanently, remove the group from `shadow-literal-groups' or
|
|
|
|
`shadow-regexp-groups'."
|
1993-11-23 07:00:40 +00:00
|
|
|
(interactive)
|
2020-11-12 22:06:47 +01:00
|
|
|
(map-y-or-n-p (lambda (pair)
|
|
|
|
(format "Cancel copying %s to %s? "
|
|
|
|
(car pair) (cdr pair)))
|
|
|
|
(lambda (pair)
|
|
|
|
(shadow-remove-from-todo pair))
|
1993-11-23 07:00:40 +00:00
|
|
|
shadow-files-to-copy
|
|
|
|
'("shadow" "shadows" "cancel copy"))
|
2001-02-11 21:31:57 +00:00
|
|
|
(message "There are %d shadows to be updated."
|
1996-01-25 01:16:55 +00:00
|
|
|
(length shadow-files-to-copy))
|
1993-11-23 07:00:40 +00:00
|
|
|
(shadow-write-todo-file))
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; Internal functions
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(defun shadow-make-group (regexp sites)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Make a description of a file group---
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
actually a list of regexp Tramp file names---from REGEXP (name of file to
|
lisp/*.el: Fix typos and other trivial doc fixes
* lisp/allout-widgets.el (allout-widgets-auto-activation)
(allout-current-decorated-p):
* lisp/auth-source.el (auth-source-protocols):
* lisp/autorevert.el (auto-revert-set-timer):
* lisp/battery.el (battery-mode-line-limit):
* lisp/calc/calcalg3.el (math-map-binop):
* lisp/calendar/cal-dst.el (calendar-dst-find-startend):
* lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute):
* lisp/calendar/calendar.el (calendar-date-echo-text)
(calendar-generate-month, calendar-string-spread)
(calendar-cursor-to-date, calendar-read, calendar-read-date)
(calendar-mark-visible-date, calendar-dayname-on-or-before):
* lisp/calendar/diary-lib.el (diary-ordinal-suffix):
* lisp/cedet/ede/autoconf-edit.el (autoconf-new-program)
(autoconf-find-last-macro, autoconf-parameter-strip):
* lisp/cedet/ede/config.el (ede-target-with-config-build):
* lisp/cedet/ede/linux.el (ede-linux--detect-architecture)
(ede-linux--get-architecture):
* lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache)
(semantic-displayer-abstract, semantic-displayer-point-position):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic-format-tag-short-doc):
* lisp/cedet/semantic/fw.el (semantic-find-file-noselect):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time)
(semantic-idle-breadcrumbs-display-function)
(semantic-idle-breadcrumbs-format-tag-list-function):
* lisp/cedet/semantic/lex.el (semantic-lex-map-types)
(define-lex, define-lex-block-type-analyzer):
* lisp/cedet/semantic/senator.el (senator-search-default-tag-filter):
* lisp/cedet/semantic/symref.el (semantic-symref-result)
(semantic-symref-hit-to-tag-via-db):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-new-variable)
(semantic-tag-new-include, semantic-tag-new-package)
(semantic-tag-set-faux, semantic-create-tag-proxy)
(semantic-tag-function-parent)
(semantic-tag-components-with-overlays):
* lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces)
(srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary)
(srecode-dictionary-add-entries, srecode-dictionary-lookup-name)
(srecode-create-dictionaries-from-tags):
* lisp/cmuscheme.el (scheme-compile-region):
* lisp/color.el (color-lab-to-lch):
* lisp/doc-view.el (doc-view-image-width)
(doc-view-set-up-single-converter):
* lisp/dynamic-setting.el (font-setting-change-default-font)
(dynamic-setting-handle-config-changed-event):
* lisp/elec-pair.el (electric-pair-text-pairs)
(electric-pair-skip-whitespace-function)
(electric-pair-string-bound-function):
* lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance)
(avl-tree-member, avl-tree-mapcar, avl-tree-iter):
* lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree):
* lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag)
(checkdoc-spellcheck-documentation-flag, checkdoc-ispell)
(checkdoc-ispell-current-buffer, checkdoc-ispell-interactive)
(checkdoc-ispell-message-interactive)
(checkdoc-ispell-message-text, checkdoc-ispell-start)
(checkdoc-ispell-continue, checkdoc-ispell-comments)
(checkdoc-ispell-defun):
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method):
* lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group):
* lisp/emacs-lisp/lisp.el (forward-sexp, up-list):
* lisp/emacs-lisp/package-x.el (package--archive-contents-from-file):
* lisp/emacs-lisp/package.el (package-desc)
(package--make-autoloads-and-stuff, package-hidden-regexps):
* lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup):
* lisp/emacs-lisp/testcover.el (testcover-nohits)
(testcover-1value):
* lisp/epg.el (epg-receive-keys, epg-start-edit-key):
* lisp/erc/erc-backend.el (erc-server-processing-p)
(erc-split-line-length, erc-server-coding-system)
(erc-server-send, erc-message):
* lisp/erc/erc-button.el (erc-button-face, erc-button-alist)
(erc-browse-emacswiki):
* lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login):
* lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation):
* lisp/erc/erc-log.el (erc-current-logfile):
* lisp/erc/erc-match.el (erc-log-match-format)
(erc-text-matched-hook):
* lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug):
* lisp/erc/erc-networks.el (erc-server-alist)
(erc-networks-alist, erc-current-network):
* lisp/erc/erc-ring.el (erc-input-ring-index):
* lisp/erc/erc-speedbar.el (erc-speedbar)
(erc-speedbar-update-channel):
* lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag):
* lisp/erc/erc-track.el (erc-track-position-in-mode-line)
(erc-track-remove-from-mode-line, erc-modified-channels-update)
(erc-track-last-non-erc-buffer, erc-track-sort-by-importance)
(erc-track-get-active-buffer):
* lisp/erc/erc.el (erc-get-channel-user-list)
(erc-echo-notice-hook, erc-echo-notice-always-hook)
(erc-wash-quit-reason, erc-format-@nick):
* lisp/ffap.el (ffap-latex-mode):
* lisp/files.el (abort-if-file-too-large)
(dir-locals--get-sort-score, buffer-stale--default-function):
* lisp/filesets.el (filesets-tree-max-level, filesets-data)
(filesets-update-pre010505):
* lisp/gnus/gnus-agent.el (gnus-agent-flush-cache):
* lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol)
(gnus-button-prefer-mid-or-mail):
* lisp/gnus/gnus-cus.el (gnus-group-parameters):
* lisp/gnus/gnus-demon.el (gnus-demon-handlers)
(gnus-demon-run-callback):
* lisp/gnus/gnus-dired.el (gnus-dired-print):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer):
* lisp/gnus/gnus-range.el (gnus-range-normalize):
* lisp/gnus/gnus-spec.el (gnus-pad-form):
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
(gnus-server-opened, gnus-server-closed, gnus-server-denied)
(gnus-server-offline):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir)
(gnus-refer-thread-limit-to-thread)
(gnus-summary-limit-include-thread, gnus-summary-refer-thread)
(gnus-summary-find-matching):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server):
* lisp/gnus/mail-source.el (mail-source-incoming-file-prefix):
* lisp/gnus/message.el (message-cite-reply-position)
(message-cite-style-outlook, message-cite-style-thunderbird)
(message-cite-style-gmail, message--send-mail-maybe-partially):
* lisp/gnus/mm-extern.el (mm-inline-external-body):
* lisp/gnus/mm-partial.el (mm-inline-partial):
* lisp/gnus/mml-sec.el (mml-secure-message-sign)
(mml-secure-message-sign-encrypt, mml-secure-message-encrypt):
* lisp/gnus/mml2015.el (mml2015-epg-key-image)
(mml2015-epg-key-image-to-string):
* lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail):
* lisp/gnus/nnheader.el (nnheader-directory-files-is-safe):
* lisp/gnus/nnir.el (nnir-search-history)
(nnir-imap-search-other, nnir-artlist-length)
(nnir-artlist-article, nnir-artitem-group, nnir-artitem-number)
(nnir-artitem-rsv, nnir-article-group, nnir-article-number)
(nnir-article-rsv, nnir-article-ids, nnir-categorize)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-hyrex-additional-switches)
(gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms)
(nnir-read-parm, nnir-read-server-parm, nnir-search-thread):
* lisp/gnus/nnmairix.el (nnmairix-default-group)
(nnmairix-propagate-marks):
* lisp/gnus/smime.el (smime-keys, smime-crl-check)
(smime-verify-buffer, smime-noverify-buffer):
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url):
* lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header)
(spam-spamassassin-spam-status-header, spam-sa-learn-rebuild)
(spam-classifications, spam-check-stat, spam-spamassassin-score):
* lisp/help.el (describe-minor-mode-from-symbol):
* lisp/hippie-exp.el (hippie-expand-ignore-buffers):
* lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face)
(hfy-begin-span):
* lisp/ibuf-ext.el (ibuffer-update-saved-filters-format)
(ibuffer-saved-filters, ibuffer-old-saved-filters-warning)
(ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters)
(eval, ibuffer-unary-operand, file-extension, directory):
* lisp/image-dired.el (image-dired-cmd-pngcrush-options):
* lisp/image-mode.el (image-toggle-display):
* lisp/international/ccl.el (ccl-compile-read-multibyte-character)
(ccl-compile-write-multibyte-character):
* lisp/international/kkc.el (kkc-save-init-file):
* lisp/international/latin1-disp.el (latin1-display):
* lisp/international/ogonek.el (ogonek-name-encoding-alist)
(ogonek-information, ogonek-lookup-encoding)
(ogonek-deprefixify-region):
* lisp/isearch.el (isearch-filter-predicate)
(isearch--momentary-message):
* lisp/jsonrpc.el (jsonrpc-connection-send)
(jsonrpc-process-connection, jsonrpc-shutdown)
(jsonrpc--async-request-1):
* lisp/language/tibet-util.el (tibetan-char-p):
* lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date)
(feedmail-last-chance-hook, feedmail-before-fcc-hook)
(feedmail-send-it-immediately-wrapper, feedmail-find-eoh):
* lisp/mail/hashcash.el (hashcash-generate-payment)
(hashcash-generate-payment-async, hashcash-insert-payment)
(hashcash-verify-payment):
* lisp/mail/rmail.el (rmail-movemail-variant-in-use)
(rmail-get-attr-value):
* lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime):
* lisp/mail/rmailsum.el (rmail-summary-show-message):
* lisp/mail/supercite.el (sc-raw-mode-toggle):
* lisp/man.el (Man-start-calling):
* lisp/mh-e/mh-acros.el (mh-do-at-event-location)
(mh-iterate-on-messages-in-region, mh-iterate-on-range):
* lisp/mh-e/mh-alias.el (mh-alias-system-aliases)
(mh-alias-reload, mh-alias-ali)
(mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file)
(mh-alias-add-alias):
* lisp/mouse.el (mouse-save-then-kill):
* lisp/net/browse-url.el (browse-url-default-macosx-browser):
* lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value)
(eudc-variable-server-value, eudc-update-variable)
(eudc-expand-inline):
* lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
* lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list):
* lisp/net/pop3.el (pop3-list):
* lisp/net/soap-client.el (soap-namespace-put)
(soap-xs-parse-sequence, soap-parse-envelope):
* lisp/net/soap-inspect.el (soap-inspect-xs-complex-type):
* lisp/nxml/rng-xsd.el (rng-xsd-date-to-days):
* lisp/org/ob-C.el (org-babel-prep-session:C)
(org-babel-load-session:C):
* lisp/org/ob-J.el (org-babel-execute:J):
* lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* lisp/org/ob-core.el (org-babel-process-file-name):
* lisp/org/ob-ebnf.el (org-babel-execute:ebnf):
* lisp/org/ob-forth.el (org-babel-execute:forth):
* lisp/org/ob-fortran.el (org-babel-execute:fortran)
(org-babel-prep-session:fortran, org-babel-load-session:fortran):
* lisp/org/ob-groovy.el (org-babel-execute:groovy):
* lisp/org/ob-io.el (org-babel-execute:io):
* lisp/org/ob-js.el (org-babel-execute:js):
* lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond)
(org-babel-lilypond-compile-post-tangle)
(org-babel-lilypond-display-pdf-post-tangle)
(org-babel-lilypond-tangle)
(org-babel-lilypond-execute-tangled-ly)
(org-babel-lilypond-compile-lilyfile)
(org-babel-lilypond-check-for-compile-error)
(org-babel-lilypond-process-compile-error)
(org-babel-lilypond-mark-error-line)
(org-babel-lilypond-parse-error-line)
(org-babel-lilypond-attempt-to-open-pdf)
(org-babel-lilypond-attempt-to-play-midi)
(org-babel-lilypond-switch-extension)
(org-babel-lilypond-set-header-args):
* lisp/org/ob-lua.el (org-babel-prep-session:lua):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-processing.el (org-babel-prep-session:processing):
* lisp/org/ob-python.el (org-babel-prep-session:python):
* lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message)
(org-babel-scheme-execute-with-geiser, org-babel-execute:scheme):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/org-agenda.el (org-agenda-entry-types)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-time-grid, org-agenda-sorting-strategy)
(org-agenda-filter-by-category, org-agenda-forward-block):
* lisp/org/org-colview.el (org-columns--overlay-text):
* lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces):
* lisp/org/org-indent.el (org-indent-set-line-properties):
* lisp/org/org-macs.el (org-get-limited-outline-regexp):
* lisp/org/org-mobile.el (org-mobile-files):
* lisp/org/org.el (org-use-fast-todo-selection)
(org-extend-today-until, org-use-property-inheritance)
(org-refresh-effort-properties, org-open-at-point-global)
(org-track-ordered-property-with-tag, org-shiftright):
* lisp/org/ox-html.el (org-html-checkbox-type):
* lisp/org/ox-man.el (org-man-source-highlight)
(org-man-verse-block):
* lisp/org/ox-publish.el (org-publish-sitemap-default):
* lisp/outline.el (outline-head-from-level):
* lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-calc-command-indent, dcl-indent-to):
* lisp/progmodes/flymake.el (flymake-make-diagnostic)
(flymake--overlays, flymake-diagnostic-functions)
(flymake-diagnostic-types-alist, flymake--backend-state)
(flymake-is-running, flymake--collect, flymake-mode):
* lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop)
(gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer):
* lisp/progmodes/grep.el (grep-error-screen-columns):
* lisp/progmodes/gud.el (gud-prev-expr):
* lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column)
(ps-run-goto-error):
* lisp/progmodes/python.el (python-eldoc-get-doc)
(python-eldoc-function-timeout-permanent, python-eldoc-function):
* lisp/shadowfile.el (shadow-make-group):
* lisp/speedbar.el (speedbar-obj-do-check):
* lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook):
* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib):
* lisp/textmodes/reftex-index.el (reftex-index-goto-entry)
(reftex-index-kill, reftex-index-undo):
* lisp/textmodes/reftex-parse.el (reftex-context-substring):
* lisp/textmodes/reftex.el (reftex-TeX-master-file):
* lisp/textmodes/rst.el (rst-next-hdr, rst-toc)
(rst-uncomment-region, rst-font-lock-extend-region-internal):
* lisp/thumbs.el (thumbs-mode):
* lisp/vc/ediff-util.el (ediff-restore-diff):
* lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag):
* lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p):
* lisp/wid-edit.el (widget-field-value-set, string):
* lisp/x-dnd.el (x-dnd-version-from-flags)
(x-dnd-more-than-3-from-flags): Assorted docfixes.
2019-09-21 00:27:53 +02:00
|
|
|
be shadowed), and list of SITES."
|
1993-11-23 07:00:40 +00:00
|
|
|
(if sites
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(cons (shadow-make-fullname
|
|
|
|
(shadow-parse-name (shadow-site-primary (car sites))) nil regexp)
|
|
|
|
(shadow-make-group regexp (cdr sites)))
|
1993-11-23 07:00:40 +00:00
|
|
|
nil))
|
|
|
|
|
|
|
|
(defun shadow-copy-file (s)
|
|
|
|
"Copy one shadow file."
|
2001-02-11 21:31:57 +00:00
|
|
|
(let* ((buffer
|
|
|
|
(cond ((get-file-buffer
|
1993-12-23 03:45:09 +00:00
|
|
|
(abbreviate-file-name (shadow-expand-file-name (car s)))))
|
1993-11-23 07:00:40 +00:00
|
|
|
((not (file-readable-p (car s)))
|
|
|
|
(if (y-or-n-p
|
2001-02-11 21:31:57 +00:00
|
|
|
(format "Cannot find file %s--cancel copy request? "
|
1993-11-23 07:00:40 +00:00
|
|
|
(car s)))
|
|
|
|
(shadow-remove-from-todo s))
|
|
|
|
nil)
|
1993-12-23 03:45:09 +00:00
|
|
|
((or (eq t shadow-noquery)
|
2001-02-11 21:31:57 +00:00
|
|
|
(y-or-n-p
|
|
|
|
(format "No buffer for %s -- update shadow anyway? "
|
1993-12-23 03:45:09 +00:00
|
|
|
(car s))))
|
1993-11-23 07:00:40 +00:00
|
|
|
(find-file-noselect (car s)))))
|
|
|
|
(to (shadow-expand-cluster-in-file-name (cdr s))))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when buffer
|
1993-11-23 07:00:40 +00:00
|
|
|
(set-buffer buffer)
|
2011-04-19 15:44:55 +02:00
|
|
|
(condition-case nil
|
2008-12-22 20:20:25 +00:00
|
|
|
(progn
|
2008-12-25 08:08:46 +00:00
|
|
|
(write-region nil nil to)
|
2008-05-28 17:35:34 +00:00
|
|
|
(shadow-remove-from-todo s))
|
|
|
|
(error (message "Shadow %s not updated!" (cdr s)))))))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-shadows-of (file)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Return copy operations needed to update FILE.
|
|
|
|
Filename should have clusters expanded, but otherwise can have any format.
|
2011-04-19 15:44:55 +02:00
|
|
|
Return value is a list of dotted pairs like (from . to), where from
|
1993-11-23 07:00:40 +00:00
|
|
|
and to are absolute file names."
|
|
|
|
(or (symbol-value (intern-soft file shadow-hashtable))
|
|
|
|
(let* ((absolute-file (shadow-expand-file-name
|
|
|
|
(or (shadow-local-file file) file)
|
|
|
|
shadow-homedir))
|
|
|
|
(canonical-file (shadow-contract-file-name absolute-file))
|
2001-02-11 21:31:57 +00:00
|
|
|
(shadows
|
2020-11-12 22:06:47 +01:00
|
|
|
(mapcar (lambda (shadow)
|
|
|
|
(cons absolute-file shadow))
|
1993-11-23 07:00:40 +00:00
|
|
|
(append
|
|
|
|
(shadow-shadows-of-1
|
|
|
|
canonical-file shadow-literal-groups nil)
|
|
|
|
(shadow-shadows-of-1
|
|
|
|
canonical-file shadow-regexp-groups t)))))
|
2019-09-13 14:25:56 +02:00
|
|
|
(when shadow-debug
|
|
|
|
(message
|
|
|
|
"shadow-shadows-of: %s %s %s %s %s"
|
|
|
|
file (shadow-local-file file) shadow-homedir
|
|
|
|
absolute-file canonical-file))
|
1993-11-23 07:00:40 +00:00
|
|
|
(set (intern file shadow-hashtable) shadows))))
|
|
|
|
|
|
|
|
(defun shadow-shadows-of-1 (file groups regexp)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Return list of FILE's shadows in GROUPS.
|
|
|
|
Consider them as regular expressions if third arg REGEXP is true."
|
1993-11-23 07:00:40 +00:00
|
|
|
(if groups
|
|
|
|
(let ((nonmatching
|
2013-07-11 20:54:57 -07:00
|
|
|
(cl-remove-if (lambda (x) (shadow-file-match x file regexp))
|
|
|
|
(car groups))))
|
1993-11-23 07:00:40 +00:00
|
|
|
(append (cond ((equal nonmatching (car groups)) nil)
|
2001-02-11 21:31:57 +00:00
|
|
|
(regexp
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(let ((realname
|
|
|
|
(tramp-file-name-localname
|
|
|
|
(shadow-parse-name file))))
|
2019-09-13 14:25:56 +02:00
|
|
|
(when shadow-debug
|
|
|
|
(message
|
2019-09-13 14:33:06 +02:00
|
|
|
"shadow-shadows-of-1: %s %s %s"
|
2019-09-13 14:25:56 +02:00
|
|
|
file (shadow-parse-name file) realname))
|
2001-02-11 21:31:57 +00:00
|
|
|
(mapcar
|
2020-11-14 17:04:23 +01:00
|
|
|
(lambda (x)
|
|
|
|
(shadow-replace-name-component x realname))
|
1993-11-23 07:00:40 +00:00
|
|
|
nonmatching)))
|
|
|
|
(t nonmatching))
|
|
|
|
(shadow-shadows-of-1 file (cdr groups) regexp)))))
|
|
|
|
|
|
|
|
(defun shadow-add-to-todo ()
|
2001-02-11 21:31:57 +00:00
|
|
|
"If current buffer has shadows, add them to the list needing to be copied."
|
2019-09-13 14:25:56 +02:00
|
|
|
(when shadow-debug
|
|
|
|
(message
|
|
|
|
"shadow-add-to-todo: %s %s"
|
|
|
|
(buffer-file-name (current-buffer))
|
|
|
|
(shadow-expand-file-name (buffer-file-name (current-buffer)))))
|
2001-02-11 21:31:57 +00:00
|
|
|
(let ((shadows (shadow-shadows-of
|
|
|
|
(shadow-expand-file-name
|
1993-11-23 07:00:40 +00:00
|
|
|
(buffer-file-name (current-buffer))))))
|
2019-09-07 12:31:31 +02:00
|
|
|
(when shadow-debug
|
|
|
|
(message
|
|
|
|
"shadow-add-to-todo: %s %s\n%s"
|
|
|
|
shadows shadow-files-to-copy (with-output-to-string (backtrace))))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when shadows
|
1993-11-23 07:00:40 +00:00
|
|
|
(setq shadow-files-to-copy
|
|
|
|
(shadow-union shadows shadow-files-to-copy))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when (not shadow-inhibit-message)
|
1996-01-25 01:16:55 +00:00
|
|
|
(message "%s" (substitute-command-keys
|
|
|
|
"Use \\[shadow-copy-files] to update shadows."))
|
1993-11-23 07:00:40 +00:00
|
|
|
(sit-for 1))
|
2018-08-12 17:38:24 +02:00
|
|
|
(shadow-write-todo-file)))
|
2007-10-31 10:24:20 +00:00
|
|
|
nil) ; Return nil for write-file-functions
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-remove-from-todo (pair)
|
2001-02-11 21:31:57 +00:00
|
|
|
"Remove PAIR from `shadow-files-to-copy'.
|
2007-10-31 00:22:34 +00:00
|
|
|
PAIR must be `eq' to one of the elements of that list."
|
2019-09-07 12:31:31 +02:00
|
|
|
(when shadow-debug
|
|
|
|
(message
|
|
|
|
"shadow-remove-from-todo: %s %s\n%s"
|
|
|
|
pair shadow-files-to-copy (with-output-to-string (backtrace))))
|
2001-02-11 21:31:57 +00:00
|
|
|
(setq shadow-files-to-copy
|
2013-07-11 20:54:57 -07:00
|
|
|
(cl-remove-if (lambda (s) (eq s pair)) shadow-files-to-copy)))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-read-files ()
|
2001-02-11 21:31:57 +00:00
|
|
|
"Visit and load `shadow-info-file' and `shadow-todo-file'.
|
|
|
|
Thus restores shadowfile's state from your last Emacs session.
|
2007-10-31 00:22:34 +00:00
|
|
|
Return t unless files were locked; then return nil."
|
1993-11-23 07:00:40 +00:00
|
|
|
(interactive)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(if (or (stringp (file-locked-p shadow-info-file))
|
|
|
|
(stringp (file-locked-p shadow-todo-file)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(progn
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
(message "Shadowfile is running in another Emacs; can't have two.")
|
1993-11-23 07:00:40 +00:00
|
|
|
(beep)
|
|
|
|
(sit-for 3)
|
|
|
|
nil)
|
2013-03-11 22:08:21 -04:00
|
|
|
(save-current-buffer
|
2000-02-12 19:47:18 +00:00
|
|
|
(when shadow-info-file
|
1993-11-23 07:00:40 +00:00
|
|
|
(set-buffer (setq shadow-info-buffer
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(find-file-noselect shadow-info-file 'nowarn)))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when (and (not (buffer-modified-p))
|
|
|
|
(file-newer-than-file-p (make-auto-save-file-name)
|
|
|
|
shadow-info-file))
|
1993-11-23 07:00:40 +00:00
|
|
|
(erase-buffer)
|
2001-02-11 21:31:57 +00:00
|
|
|
(message "Data recovered from %s."
|
1993-11-23 07:00:40 +00:00
|
|
|
(car (insert-file-contents (make-auto-save-file-name))))
|
|
|
|
(sit-for 1))
|
2005-05-18 10:17:59 +00:00
|
|
|
(eval-buffer))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when shadow-todo-file
|
2001-02-11 21:31:57 +00:00
|
|
|
(set-buffer (setq shadow-todo-buffer
|
2019-09-03 13:55:42 +02:00
|
|
|
(find-file-noselect shadow-todo-file 'nowarn)))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when (and (not (buffer-modified-p))
|
|
|
|
(file-newer-than-file-p (make-auto-save-file-name)
|
|
|
|
shadow-todo-file))
|
1993-11-23 07:00:40 +00:00
|
|
|
(erase-buffer)
|
2001-02-11 21:31:57 +00:00
|
|
|
(message "Data recovered from %s."
|
1993-11-23 07:00:40 +00:00
|
|
|
(car (insert-file-contents (make-auto-save-file-name))))
|
|
|
|
(sit-for 1))
|
2005-05-18 10:17:59 +00:00
|
|
|
(eval-buffer nil))
|
1993-11-23 07:00:40 +00:00
|
|
|
(shadow-invalidate-hashtable))
|
|
|
|
t))
|
|
|
|
|
|
|
|
(defun shadow-write-info-file ()
|
2001-02-11 21:31:57 +00:00
|
|
|
"Write out information to `shadow-info-file'.
|
|
|
|
Also clear `shadow-hashtable', since when there are new shadows
|
|
|
|
defined, the old hashtable info is invalid."
|
1993-11-23 07:00:40 +00:00
|
|
|
(shadow-invalidate-hashtable)
|
|
|
|
(if shadow-info-file
|
2013-03-11 22:08:21 -04:00
|
|
|
(save-current-buffer
|
1993-11-23 07:00:40 +00:00
|
|
|
(if (not shadow-info-buffer)
|
|
|
|
(setq shadow-info-buffer (find-file-noselect shadow-info-file)))
|
|
|
|
(set-buffer shadow-info-buffer)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(setq buffer-read-only nil)
|
1993-11-23 07:00:40 +00:00
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
(shadow-insert-var 'shadow-clusters)
|
|
|
|
(shadow-insert-var 'shadow-literal-groups)
|
|
|
|
(shadow-insert-var 'shadow-regexp-groups))))
|
|
|
|
|
|
|
|
(defun shadow-write-todo-file (&optional save)
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
"Write out information to `shadow-todo-file'.
|
|
|
|
With non-nil argument also saves the buffer."
|
1993-11-23 07:00:40 +00:00
|
|
|
(save-excursion
|
|
|
|
(if (not shadow-todo-buffer)
|
|
|
|
(setq shadow-todo-buffer (find-file-noselect shadow-todo-file)))
|
|
|
|
(set-buffer shadow-todo-buffer)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(setq buffer-read-only nil)
|
1993-11-23 07:00:40 +00:00
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
(shadow-insert-var 'shadow-files-to-copy)
|
2018-08-12 17:38:24 +02:00
|
|
|
(if save (shadow-save-todo-file))))
|
1993-11-23 07:00:40 +00:00
|
|
|
|
|
|
|
(defun shadow-save-todo-file ()
|
2019-09-07 12:31:31 +02:00
|
|
|
(when shadow-debug
|
|
|
|
(message "shadow-save-todo-file:\n%s" (with-output-to-string (backtrace))))
|
1993-11-23 07:00:40 +00:00
|
|
|
(if (and shadow-todo-buffer (buffer-modified-p shadow-todo-buffer))
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
(with-current-buffer shadow-todo-buffer
|
2018-08-12 17:38:24 +02:00
|
|
|
(condition-case nil ; have to continue even in case of
|
1993-11-23 07:00:40 +00:00
|
|
|
(basic-save-buffer) ; error, otherwise kill-emacs might
|
|
|
|
(error ; not work!
|
|
|
|
(message "WARNING: Can't save shadow todo file; it is locked!")
|
|
|
|
(sit-for 1))))))
|
|
|
|
|
|
|
|
(defun shadow-invalidate-hashtable ()
|
|
|
|
(setq shadow-hashtable (make-vector 37 0)))
|
|
|
|
|
|
|
|
(defun shadow-insert-var (variable)
|
2007-10-31 00:22:34 +00:00
|
|
|
"Build a `setq' to restore VARIABLE.
|
|
|
|
Prettily insert a `setq' command which, when later evaluated,
|
|
|
|
will restore VARIABLE to its current setting.
|
(shadow-define-regexp-group, shadow-literal-groups, shadow-insert-var):
Doc fixes.
(shadow-read-files): Fix typo in message.
(shadow-inhibit-overload, shadow-find, shadow-suffix, shadow-site-match,
shadow-write-todo-file, shadow-insert-var, shadow-suffix, shadow-site-match,
shadow-expand-file-name, shadow-file-match): Fix typos in docstrings.
2006-11-06 02:40:18 +00:00
|
|
|
VARIABLE must be the name of a variable whose value is a list."
|
1993-11-23 07:00:40 +00:00
|
|
|
(let ((standard-output (current-buffer)))
|
|
|
|
(insert (format "(setq %s" variable))
|
|
|
|
(cond ((consp (eval variable))
|
2001-02-11 21:31:57 +00:00
|
|
|
(insert "\n '(")
|
1993-11-23 07:00:40 +00:00
|
|
|
(prin1 (car (eval variable)))
|
|
|
|
(let ((rest (cdr (eval variable))))
|
|
|
|
(while rest
|
|
|
|
(insert "\n ")
|
|
|
|
(prin1 (car rest))
|
|
|
|
(setq rest (cdr rest)))
|
|
|
|
(insert "))\n\n")))
|
|
|
|
(t (insert " ")
|
|
|
|
(prin1 (eval variable))
|
|
|
|
(insert ")\n\n")))))
|
|
|
|
|
|
|
|
(defun shadow-save-buffers-kill-emacs (&optional arg)
|
|
|
|
"Offer to save each buffer and copy shadows, then kill this Emacs process.
|
|
|
|
With prefix arg, silently save all file-visiting buffers, then kill.
|
|
|
|
|
|
|
|
Extended by shadowfile to automatically save `shadow-todo-file' and
|
|
|
|
look for files that have been changed and need to be copied to other systems."
|
|
|
|
;; This function is necessary because we need to get control and save
|
|
|
|
;; the todo file /after/ saving other files, but /before/ the warning
|
|
|
|
;; message about unsaved buffers (because it can get modified by the
|
|
|
|
;; action of saving other buffers). `kill-emacs-hook' is no good
|
|
|
|
;; because it is not called at the correct time, and also because it is
|
|
|
|
;; called when the terminal is disconnected and we cannot ask whether
|
|
|
|
;; to copy files.
|
|
|
|
(interactive "P")
|
|
|
|
(shadow-save-todo-file)
|
|
|
|
(save-some-buffers arg t)
|
|
|
|
(shadow-copy-files)
|
|
|
|
(shadow-save-todo-file)
|
2020-11-14 17:04:23 +01:00
|
|
|
(and (or (not (memq t (mapcar (lambda (buf) (and (buffer-file-name buf)
|
|
|
|
(buffer-modified-p buf)))
|
1993-11-23 07:00:40 +00:00
|
|
|
(buffer-list))))
|
|
|
|
(yes-or-no-p "Modified buffers exist; exit anyway? "))
|
|
|
|
(or (not (fboundp 'process-list))
|
2019-09-07 12:31:31 +02:00
|
|
|
;; `process-list' is not defined on MSDOS.
|
1993-11-23 07:00:40 +00:00
|
|
|
(let ((processes (process-list))
|
|
|
|
active)
|
|
|
|
(while processes
|
2002-03-17 20:32:20 +00:00
|
|
|
(and (memq (process-status (car processes)) '(run stop open listen))
|
|
|
|
(process-query-on-exit-flag (car processes))
|
1993-11-23 07:00:40 +00:00
|
|
|
(setq active t))
|
|
|
|
(setq processes (cdr processes)))
|
|
|
|
(or (not active)
|
|
|
|
(yes-or-no-p "Active processes exist; kill them and exit anyway? "))))
|
|
|
|
(kill-emacs)))
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;; Hook us up
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
;;;###autoload
|
1993-11-23 07:00:40 +00:00
|
|
|
(defun shadow-initialize ()
|
2001-02-11 21:31:57 +00:00
|
|
|
"Set up file shadowing."
|
|
|
|
(interactive)
|
Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
* etc/NEWS: Mention changes in shadowfile.el.
* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
(shadow-cluster): New defstruct.
(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
(shadow-cluster-regexp, shadow-get-user)
(shadow-parse-fullname): Remove.
(shadow-info-file, shadow-todo-file, shadow-system-name)
(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
(shadow-name-site, shadow-site-primary, shadow-site-cluster)
(shadow-read-site, shadow-parse-name, shadow-make-fullname)
(shadow-replace-name-component, shadow-local-file)
(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
(shadow-same-site, shadow-file-match, shadow-define-cluster)
(shadow-define-literal-group, shadow-define-regexp-group)
(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
(shadow-write-info-file, shadow-write-todo-file)
(shadow-initialize): Adapt variables and functions.
* test/lisp/shadowfile-tests.el: New file.
2018-07-18 16:51:56 +02:00
|
|
|
(setq shadow-homedir
|
|
|
|
(file-name-as-directory (shadow-expand-file-name shadow-homedir))
|
|
|
|
shadow-info-file (shadow-expand-file-name shadow-info-file)
|
|
|
|
shadow-todo-file (shadow-expand-file-name shadow-todo-file))
|
1993-11-23 07:00:40 +00:00
|
|
|
(if (not (shadow-read-files))
|
|
|
|
(progn
|
|
|
|
(message "Shadowfile information files not found - aborting")
|
|
|
|
(beep)
|
|
|
|
(sit-for 3))
|
2000-02-12 19:47:18 +00:00
|
|
|
(when (and (not shadow-inhibit-overload)
|
|
|
|
(not (fboundp 'shadow-orig-save-buffers-kill-emacs)))
|
2001-02-11 21:31:57 +00:00
|
|
|
(defalias 'shadow-orig-save-buffers-kill-emacs
|
|
|
|
(symbol-function 'save-buffers-kill-emacs))
|
|
|
|
(defalias 'save-buffers-kill-emacs 'shadow-save-buffers-kill-emacs))
|
2007-10-31 10:24:20 +00:00
|
|
|
(add-hook 'write-file-functions 'shadow-add-to-todo)
|
1993-11-23 07:00:40 +00:00
|
|
|
(define-key ctl-x-4-map "s" 'shadow-copy-files)))
|
|
|
|
|
2007-10-31 10:24:20 +00:00
|
|
|
(defun shadowfile-unload-function ()
|
|
|
|
(substitute-key-definition 'shadow-copy-files nil ctl-x-4-map)
|
|
|
|
(when (fboundp 'shadow-orig-save-buffers-kill-emacs)
|
|
|
|
(fset 'save-buffers-kill-emacs
|
|
|
|
(symbol-function 'shadow-orig-save-buffers-kill-emacs)))
|
|
|
|
;; continue standard unloading
|
|
|
|
nil)
|
2004-10-17 06:55:46 +00:00
|
|
|
|
2001-02-11 21:31:57 +00:00
|
|
|
(provide 'shadowfile)
|
|
|
|
|
1993-11-23 07:00:40 +00:00
|
|
|
;;; shadowfile.el ends here
|