Mercurial > emacs
view lisp/url/url-nfs.el @ 89970:a849e5779b8c
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-35
Fix damage caused by trunk merge in emacs--unicode--0--patch-15
Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed
from tagline to explicit [because they were used as template files, and their
syntax didn't accommodate stripping comments, so the the generated files
caused id-tag conflicts when an in-tree build was done].
Unfortunately arch doesn't handle id-tag changes well, so this resulted in
the files appearing to be deleted, and then added again. When that changeset
was merged into the unicode branch, it resulted in unicode-specific changes
being dropped, and the trunk version being added.
To fix this, I restored these files to their pre-merge versions (from
emacs--unicode--0--patch-14), and then manually reapplied all changes from:
(1) the unicode branch from the bogus merge point to the current version
(emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34)
(2) the trunk from the bogus merge point to the latest version which was
merged into the unicode branch
(emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522)
and fixed any conflicts (mostly due to doubly-applied patch hunks that patch
couldn't detect).
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 05 Sep 2004 01:53:47 +0000 |
parents | 2fc584798d79 |
children | 01934125951e 625059157bad |
line wrap: on
line source
;;; url-nfs.el --- NFS URL interface ;; Copyright (c) 1996,97,98,1999,2004 Free Software Foundation, Inc. ;; Copyright (c) 1996 by William M. Perry <wmperry@cs.indiana.edu> ;; Keywords: comm, data, processes ;; This file is part of GNU Emacs. ;; ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;;; Code: (eval-when-compile (require 'cl)) (require 'url-parse) (require 'url-file) (defvar url-nfs-automounter-directory-spec "file:/net/%h%f" "*How to invoke the NFS automounter. Certain % sequences are recognized. %h -- the hostname of the NFS server %n -- the port # of the NFS server %u -- the username to use to authenticate %p -- the password to use to authenticate %f -- the filename on the remote server %% -- a literal % Each can be used any number of times.") (defun url-nfs-unescape (format host port user pass file) (save-excursion (set-buffer (get-buffer-create " *nfs-parse*")) (erase-buffer) (insert format) (goto-char (point-min)) (while (re-search-forward "%\\(.\\)" nil t) (let ((escape (aref (match-string 1) 0))) (replace-match "" t t) (case escape (?% (insert "%")) (?h (insert host)) (?n (insert (or port ""))) (?u (insert (or user ""))) (?p (insert (or pass ""))) (?f (insert (or file "/")))))) (buffer-string))) (defun url-nfs-build-filename (url) (let* ((host (url-host url)) (port (string-to-int (url-port url))) (pass (url-password url)) (user (url-user url)) (file (url-filename url))) (url-generic-parse-url (url-nfs-unescape url-nfs-automounter-directory-spec host port user pass file)))) (defun url-nfs (url callback cbargs) (url-file (url-nfs-build-filename url) callback cbargs)) (defmacro url-nfs-create-wrapper (method args) `(defun ,(intern (format "url-nfs-%s" method)) ,args ,(format "NFS URL wrapper around `%s' call." method) (setq url (url-nfs-build-filename url)) (and url (,(intern (format "url-file-%s" method)) ,@(remove '&rest (remove '&optional args)))))) (url-nfs-create-wrapper file-exists-p (url)) (url-nfs-create-wrapper file-attributes (url &optional id-format)) (url-nfs-create-wrapper file-symlink-p (url)) (url-nfs-create-wrapper file-readable-p (url)) (url-nfs-create-wrapper file-writable-p (url)) (url-nfs-create-wrapper file-executable-p (url)) (if (featurep 'xemacs) (progn (url-nfs-create-wrapper directory-files (url &optional full match nosort files-only)) (url-nfs-create-wrapper file-truename (url &optional default))) (url-nfs-create-wrapper directory-files (url &optional full match nosort)) (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs))) (provide 'url-nfs) ;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437 ;;; url-nfs.el ends here