You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
(35) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(31) |
Feb
(4) |
Mar
(10) |
Apr
(7) |
May
(5) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Kai Gro?j. <ka...@us...> - 2002-01-06 14:02:41
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv31358/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-handle-file-truename): Use `tramp-method-for-buffer' to make sure that log messages end up in the right buffer. Correct braino in symlink handling. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.64 retrieving revision 2.65 diff -C2 -d -r2.64 -r2.65 *** ChangeLog 2002/01/05 12:27:57 2.64 --- ChangeLog 2002/01/06 14:02:38 2.65 *************** *** 1,2 **** --- 1,8 ---- + 2002-01-06 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-handle-file-truename): Use + `tramp-method-for-buffer' to make sure that log messages end up + in the right buffer. Correct braino in symlink handling. + 2002-01-05 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.67 retrieving revision 2.68 diff -C2 -d -r2.67 -r2.68 *** tramp.el 2002/01/05 12:27:57 2.67 --- tramp.el 2002/01/06 14:02:38 2.68 *************** *** 1377,1387 **** (curstri "") symlink-target) ! (tramp-message 10 "Finding true name for `%s'" filename) (while (and steps (< numchase numchase-limit)) (setq thisstep (pop steps)) ! (tramp-message 10 "Check %s" ! (mapconcat 'identity ! (append '("") (reverse result) (list thisstep)) ! "/")) (setq symlink-target (nth 0 (tramp-handle-file-attributes --- 1377,1391 ---- (curstri "") symlink-target) ! (tramp-message-for-buffer ! multi-method method user host ! 10 "Finding true name for `%s'" filename) (while (and steps (< numchase numchase-limit)) (setq thisstep (pop steps)) ! (tramp-message-for-buffer ! multi-method method user host ! 10 "Check %s" ! (mapconcat 'identity ! (append '("") (reverse result) (list thisstep)) ! "/")) (setq symlink-target (nth 0 (tramp-handle-file-attributes *************** *** 1392,1408 **** "/"))))) (cond ((string= "." thisstep) ! (tramp-message 10 "Ignoring step `.'")) ((string= ".." thisstep) ! (tramp-message 10 "Processing step `..'") (pop result)) ((stringp symlink-target) ;; It's a symlink, follow it. ! (tramp-message 10 "Follow symlink to %s" symlink-target) (setq numchase (1+ numchase)) (setq steps ! (if (file-name-absolute-p symlink-target) ! (tramp-split-string symlink-target "/") ! (append (tramp-split-string symlink-target "/") steps)))) (t ;; It's a file. --- 1396,1415 ---- "/"))))) (cond ((string= "." thisstep) ! (tramp-message-for-buffer multi-method method user host ! 10 "Ignoring step `.'")) ((string= ".." thisstep) ! (tramp-message-for-buffer multi-method method user host ! 10 "Processing step `..'") (pop result)) ((stringp symlink-target) ;; It's a symlink, follow it. ! (tramp-message-for-buffer ! multi-method method user host 10 "Follow symlink to %s" symlink-target) (setq numchase (1+ numchase)) + (when (file-name-absolute-p symlink-target) + (setq result nil)) (setq steps ! (append (tramp-split-string symlink-target "/") steps))) (t ;; It's a file. *************** *** 1411,1415 **** (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) (setq result (reverse result)) ! (tramp-message 10 "True name of `%s' is `%s'" filename (mapconcat 'identity (cons "" result) "/")) --- 1418,1423 ---- (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) (setq result (reverse result)) ! (tramp-message-for-buffer ! multi-method method user host 10 "True name of `%s' is `%s'" filename (mapconcat 'identity (cons "" result) "/")) |
From: Kai Gro?j. <ka...@us...> - 2002-01-05 12:28:00
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv9989/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-split-string): New compat function. (tramp-handle-file-truename): Use it. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.63 retrieving revision 2.64 diff -C2 -d -r2.63 -r2.64 *** ChangeLog 2002/01/04 17:55:12 2.63 --- ChangeLog 2002/01/05 12:27:57 2.64 *************** *** 1,2 **** --- 1,7 ---- + 2002-01-05 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-split-string): New compat function. + (tramp-handle-file-truename): Use it. + 2002-01-04 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.66 retrieving revision 2.67 diff -C2 -d -r2.66 -r2.67 *** tramp.el 2002/01/04 17:55:24 2.66 --- tramp.el 2002/01/05 12:27:57 2.67 *************** *** 1370,1374 **** (host (tramp-file-name-host v)) (path (tramp-file-name-path v)) ! (steps (split-string path "/")) (thisstep nil) (numchase 0) --- 1370,1374 ---- (host (tramp-file-name-host v)) (path (tramp-file-name-path v)) ! (steps (tramp-split-string path "/")) (thisstep nil) (numchase 0) *************** *** 1403,1408 **** (setq steps (if (file-name-absolute-p symlink-target) ! (split-string symlink-target "/") ! (append (split-string symlink-target "/") steps)))) (t ;; It's a file. --- 1403,1408 ---- (setq steps (if (file-name-absolute-p symlink-target) ! (tramp-split-string symlink-target "/") ! (append (tramp-split-string symlink-target "/") steps)))) (t ;; It's a file. *************** *** 4671,4674 **** --- 4671,4685 ---- "`dos', `unix', or `mac'")))))) (t (error "Can't change EOL conversion -- is MULE missing?")))) + + (defun tramp-split-string (string pattern) + "Like `split-string' but omit empty strings. + In Emacs, (split-string \"/foo/bar\" \"/\") returns (\"foo\" \"bar\"). + This is, the first, empty, element is omitted. In XEmacs, the first + element is not omitted. + + Note: this function has been written for `tramp-handle-file-truename'. + If you want to use it for something else, you'll have to check whether + it does the right thing." + (delete "" (split-string string pattern))) ;; ------------------------------------------------------------ |
From: Kai Gro?j. <ka...@us...> - 2002-01-04 17:55:26
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv22236/tramp/lisp Modified Files: tramp.el Log Message: (tramp-find-shell): If starting bash for tilde expansion, provide `--norc' argument. (tramp-handle-file-truename): More debugging output. More Obiwan errors. Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.65 retrieving revision 2.66 diff -C2 -d -r2.65 -r2.66 *** tramp.el 2002/01/04 17:28:52 2.65 --- tramp.el 2002/01/04 17:55:24 2.66 *************** *** 1379,1396 **** (tramp-message 10 "Finding true name for `%s'" filename) (while (and steps (< numchase numchase-limit)) ! (setq thisstep (car steps)) (setq symlink-target (nth 0 (tramp-handle-file-attributes (tramp-make-tramp-file-name multi-method method user host ! (concat "/" (mapconcat 'identity (reverse steps) "/") ! "/" thisstep))))) (cond ((string= "." thisstep) ! (pop steps)) ((string= ".." thisstep) ! (pop steps) (pop result)) ((stringp symlink-target) ;; It's a symlink, follow it. (setq numchase (1+ numchase)) (setq steps --- 1379,1403 ---- (tramp-message 10 "Finding true name for `%s'" filename) (while (and steps (< numchase numchase-limit)) ! (setq thisstep (pop steps)) ! (tramp-message 10 "Check %s" ! (mapconcat 'identity ! (append '("") (reverse result) (list thisstep)) ! "/")) (setq symlink-target (nth 0 (tramp-handle-file-attributes (tramp-make-tramp-file-name multi-method method user host ! (mapconcat 'identity ! (append '("") (reverse result) (list thisstep)) ! "/"))))) (cond ((string= "." thisstep) ! (tramp-message 10 "Ignoring step `.'")) ((string= ".." thisstep) ! (tramp-message 10 "Processing step `..'") (pop result)) ((stringp symlink-target) ;; It's a symlink, follow it. + (tramp-message + 10 "Follow symlink to %s" symlink-target) (setq numchase (1+ numchase)) (setq steps *************** *** 1400,1412 **** (t ;; It's a file. - (pop steps) (setq result (cons thisstep result))))) (when (>= numchase numchase-limit) (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) ! (tramp-message 10 "True name of `%s' is `%s'" ! filename (mapconcat 'identity (reverse result) "/")) (tramp-make-tramp-file-name multi-method method user host ! (concat "/" (mapconcat 'identity (reverse result) "/"))))) ;; Basic functions. --- 1407,1420 ---- (t ;; It's a file. (setq result (cons thisstep result))))) (when (>= numchase numchase-limit) (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) ! (setq result (reverse result)) ! (tramp-message ! 10 "True name of `%s' is `%s'" ! filename (mapconcat 'identity (cons "" result) "/")) (tramp-make-tramp-file-name multi-method method user host ! (mapconcat 'identity (cons "" result) "/")))) ;; Basic functions. |
From: Kai Gro?j. <ka...@us...> - 2002-01-04 17:55:15
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv22196/tramp/lisp Modified Files: ChangeLog Log Message: (tramp-find-shell): If starting bash for tilde expansion, provide `--norc' argument. (tramp-handle-file-truename): More debugging output. More Obiwan errors. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.62 retrieving revision 2.63 diff -C2 -d -r2.62 -r2.63 *** ChangeLog 2002/01/04 17:28:52 2.62 --- ChangeLog 2002/01/04 17:55:12 2.63 *************** *** 3,6 **** --- 3,8 ---- * tramp.el (tramp-find-shell): If starting bash for tilde expansion, provide `--norc' argument. + (tramp-handle-file-truename): More debugging output. More Obiwan + errors. 2002-01-03 Steve Youngs <yo...@xe...> |
From: Kai Gro?j. <ka...@us...> - 2002-01-04 17:28:55
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv13840/tramp/lisp Modified Files: tramp.el ChangeLog Log Message: (tramp-find-shell): If starting bash for tilde expansion, provide `--norc' argument. Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.64 retrieving revision 2.65 diff -C2 -d -r2.64 -r2.65 *** tramp.el 2002/01/02 16:51:08 2.64 --- tramp.el 2002/01/04 17:28:52 2.65 *************** *** 1374,1412 **** (numchase 0) (numchase-limit 100) (curstri "") symlink-target) (while (and steps (< numchase numchase-limit)) (setq thisstep (car steps)) (cond ((string= "." thisstep) (pop steps)) ((string= ".." thisstep) ! (if (string-match "\\`(.*)/" curstri) ! (setq curstri (match-string 1 curstri)) ! (setq curstri "")) ! (pop steps)) (t ! (setq symlink-target ! (nth 0 (file-attributes (tramp-make-tramp-file-name ! multi-method method user host ! (concat curstri "/" thisstep))))) ! (if (not (stringp symlink-target)) ! ;; It's not a symlink; do next loop iteration. ! (progn ! (pop steps) ! (setq curstri (concat curstri "/" thisstep))) ! ;; It's a symlink. ! (pop steps) ! (when (or (string= curstri symlink-target) ! (string= thisstep symlink-target)) ! (error "Link `%s' points to itself" curstri)) ! (setq steps (append (split-string symlink-target "/") steps) ! numchase (1+ numchase)) ! ;; For absolute symlink targets, drop current prefix. ! (when (file-name-absolute-p symlink-target) ! (setq curstri "")))))) (when (>= numchase numchase-limit) (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) ! (tramp-make-tramp-file-name multi-method method user host ! curstri))) ;; Basic functions. --- 1374,1412 ---- (numchase 0) (numchase-limit 100) + (result nil) ;result steps in reverse order (curstri "") symlink-target) + (tramp-message 10 "Finding true name for `%s'" filename) (while (and steps (< numchase numchase-limit)) (setq thisstep (car steps)) + (setq symlink-target + (nth 0 (tramp-handle-file-attributes + (tramp-make-tramp-file-name + multi-method method user host + (concat "/" (mapconcat 'identity (reverse steps) "/") + "/" thisstep))))) (cond ((string= "." thisstep) (pop steps)) ((string= ".." thisstep) ! (pop steps) ! (pop result)) ! ((stringp symlink-target) ! ;; It's a symlink, follow it. ! (setq numchase (1+ numchase)) ! (setq steps ! (if (file-name-absolute-p symlink-target) ! (split-string symlink-target "/") ! (append (split-string symlink-target "/") steps)))) (t ! ;; It's a file. ! (pop steps) ! (setq result (cons thisstep result))))) (when (>= numchase numchase-limit) (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) ! (tramp-message 10 "True name of `%s' is `%s'" ! filename (mapconcat 'identity (reverse result) "/")) ! (tramp-make-tramp-file-name ! multi-method method user host ! (concat "/" (mapconcat 'identity (reverse result) "/"))))) ;; Basic functions. *************** *** 2275,2278 **** --- 2275,2281 ---- (host (tramp-file-name-host v)) (path (tramp-file-name-path v))) + (tramp-message-for-buffer multi-method method user host + 10 "Expand file name `%s' in dir `%s'" + name dir) (unless (file-name-absolute-p path) (setq path (concat "~/" path))) *************** *** 2292,2296 **** (goto-char (point-min)) (setq uname (buffer-substring (point) (tramp-line-end-position))) ! (setq path (concat uname fname)))) ;) ;; No tilde characters in file name, do normal ;; expand-file-name (this does "/./" and "/../"). --- 2295,2299 ---- (goto-char (point-min)) (setq uname (buffer-substring (point) (tramp-line-end-position))) ! (setq path (concat uname fname)))) ;; No tilde characters in file name, do normal ;; expand-file-name (this does "/./" and "/../"). *************** *** 3040,3044 **** (unless shell (error "Couldn't find a shell which groks tilde expansion")) ! (tramp-message 5 "Starting remote shell `%s' for tilde expansion..." shell) (tramp-send-command multi-method method user host --- 3043,3052 ---- (unless shell (error "Couldn't find a shell which groks tilde expansion")) ! ;; Hack: avoid reading of ~/.bashrc. What we should do is have an ! ;; alist for extra args to give to each shell... ! (when (string-match "/bash\\'" shell) ! (setq shell (concat shell " --norc"))) ! (tramp-message ! 5 "Starting remote shell `%s' for tilde expansion..." shell) (tramp-send-command multi-method method user host Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.61 retrieving revision 2.62 diff -C2 -d -r2.61 -r2.62 *** ChangeLog 2002/01/02 16:51:08 2.61 --- ChangeLog 2002/01/04 17:28:52 2.62 *************** *** 1,2 **** --- 1,7 ---- + 2002-01-04 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-find-shell): If starting bash for tilde + expansion, provide `--norc' argument. + 2002-01-03 Steve Youngs <yo...@xe...> |
From: Steve Y. <yo...@us...> - 2002-01-02 16:51:12
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv19563/lisp Modified Files: ChangeLog tramp.el Log Message: 2002-01-03 Steve Youngs <yo...@xe...> * tramp.el (tramp-find-shell): Change order for choice of shell, put bash first. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.60 retrieving revision 2.61 diff -C2 -d -r2.60 -r2.61 *** ChangeLog 2002/01/02 14:14:28 2.60 --- ChangeLog 2002/01/02 16:51:08 2.61 *************** *** 1,2 **** --- 1,7 ---- + 2002-01-03 Steve Youngs <yo...@xe...> + + * tramp.el (tramp-find-shell): Change order for choice of shell, + put bash first. + 2002-01-02 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.63 retrieving revision 2.64 diff -C2 -d -r2.63 -r2.64 *** tramp.el 2002/01/02 14:14:28 2.63 --- tramp.el 2002/01/02 16:51:08 2.64 *************** *** 3035,3041 **** (setq shell (or (tramp-find-executable multi-method method user host ! "ksh" tramp-remote-path t) (tramp-find-executable multi-method method user host ! "bash" tramp-remote-path t))) (unless shell (error "Couldn't find a shell which groks tilde expansion")) --- 3035,3041 ---- (setq shell (or (tramp-find-executable multi-method method user host ! "bash" tramp-remote-path t) (tramp-find-executable multi-method method user host ! "ksh" tramp-remote-path t))) (unless shell (error "Couldn't find a shell which groks tilde expansion")) |
From: Kai Gro?j. <ka...@us...> - 2002-01-02 14:14:31
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv8367/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-handle-file-truename): Another Obiwan error. For relative symlinks "/a/b" pointing to "c/d", the "b" part should not be part of the truename. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.59 retrieving revision 2.60 diff -C2 -d -r2.59 -r2.60 *** ChangeLog 2002/01/01 19:51:18 2.59 --- ChangeLog 2002/01/02 14:14:28 2.60 *************** *** 1,2 **** --- 1,8 ---- + 2002-01-02 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-handle-file-truename): Another Obiwan error. + For relative symlinks "/a/b" pointing to "c/d", the "b" part + should not be part of the truename. + 2002-01-01 Kai Grossjohann <ka...@ls...> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.62 retrieving revision 2.63 diff -C2 -d -r2.62 -r2.63 *** tramp.el 2002/01/01 19:51:18 2.62 --- tramp.el 2002/01/02 14:14:28 2.63 *************** *** 1386,1400 **** (pop steps)) (t - (setq curstri (concat curstri "/" thisstep)) (setq symlink-target (nth 0 (file-attributes (tramp-make-tramp-file-name multi-method method user host ! curstri)))) (if (not (stringp symlink-target)) ;; It's not a symlink; do next loop iteration. ! (pop steps) ;; It's a symlink. (pop steps) ! (when (string= curstri symlink-target) (error "Link `%s' points to itself" curstri)) (setq steps (append (split-string symlink-target "/") steps) --- 1386,1402 ---- (pop steps)) (t (setq symlink-target (nth 0 (file-attributes (tramp-make-tramp-file-name multi-method method user host ! (concat curstri "/" thisstep))))) (if (not (stringp symlink-target)) ;; It's not a symlink; do next loop iteration. ! (progn ! (pop steps) ! (setq curstri (concat curstri "/" thisstep))) ;; It's a symlink. (pop steps) ! (when (or (string= curstri symlink-target) ! (string= thisstep symlink-target)) (error "Link `%s' points to itself" curstri)) (setq steps (append (split-string symlink-target "/") steps) |
From: Kai Gro?j. <ka...@us...> - 2002-01-02 13:55:18
|
Update of /cvsroot/tramp/tramp/contrib In directory usw-pr-cvs1:/tmp/cvs-serv3618/tramp/contrib Modified Files: Makefile Log Message: (clean): Add target. (all): Ditto. Index: Makefile =================================================================== RCS file: /cvsroot/tramp/tramp/contrib/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 2001/12/06 12:18:12 1.1 --- Makefile 2002/01/02 13:55:15 1.2 *************** *** 2,5 **** --- 2,10 ---- # $Id$ + clean: + $(RM) *.elc + + all: base64.elc format-spec.elc + base64.elc: base64.el $(EMACS) -batch -f batch-byte-compile base64.el |
From: Kai Gro?j. <ka...@us...> - 2002-01-02 13:55:18
|
Update of /cvsroot/tramp/tramp In directory usw-pr-cvs1:/tmp/cvs-serv3618/tramp Modified Files: ChangeLog Log Message: (clean): Add target. (all): Ditto. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChangeLog 2001/12/06 12:47:32 1.6 --- ChangeLog 2002/01/02 13:55:15 1.7 *************** *** 1,2 **** --- 1,7 ---- + 2002-01-02 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * contrib/Makefile (clean): Add target. + (all): Ditto. + 2001-12-06 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> |
From: Kai Gro?j. <ka...@us...> - 2002-01-01 19:51:21
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv9711/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-handle-file-truename): Obiwan error. (tramp-process-actions): New function. Doesn't do anything yet. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.58 retrieving revision 2.59 diff -C2 -d -r2.58 -r2.59 *** ChangeLog 2001/12/30 20:06:06 2.58 --- ChangeLog 2002/01/01 19:51:18 2.59 *************** *** 1,2 **** --- 1,7 ---- + 2002-01-01 Kai Grossjohann <ka...@ls...> + + * tramp.el (tramp-handle-file-truename): Obiwan error. + (tramp-process-actions): New function. Doesn't do anything yet. + 2001-12-30 Kai Großjohann <gro...@ls...> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.61 retrieving revision 2.62 diff -C2 -d -r2.61 -r2.62 *** tramp.el 2001/12/30 16:57:23 2.61 --- tramp.el 2002/01/01 19:51:18 2.62 *************** *** 1395,1398 **** --- 1395,1399 ---- (pop steps) ;; It's a symlink. + (pop steps) (when (string= curstri symlink-target) (error "Link `%s' points to itself" curstri)) *************** *** 3110,3113 **** --- 3111,3122 ---- ;; -- Functions for establishing connection -- ;; ------------------------------------------------------------ + + (defun tramp-process-actions + (multi-method method user host actions &optional timeout) + "Process given ACTIONS for login specified via first four args. + ACTIONS is a list of items (REGEXP FUN), where REGEXP specifies what + output from the remote end to look for, and FUN specifies the action + to take when the regexp matches." + nil) (defun tramp-open-connection-telnet (multi-method method user host) |
From: Kai Gro?j. <ka...@us...> - 2001-12-30 20:06:11
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv4772/tramp/lisp Modified Files: ChangeLog Removed Files: base64.el format-spec.el Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.57 retrieving revision 2.58 diff -C2 -d -r2.57 -r2.58 *** ChangeLog 2001/12/30 16:57:23 2.57 --- ChangeLog 2001/12/30 20:06:06 2.58 *************** *** 1,2 **** --- 1,7 ---- + 2001-12-30 Kai Großjohann <gro...@ls...> + + * base64.el: Moved to contrib directory. + * format-spec.el: Ditto. + 2001-12-30 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> --- base64.el DELETED --- --- format-spec.el DELETED --- |
From: Kai Gro?j. <ka...@us...> - 2001-12-30 16:57:26
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv9055/tramp/lisp Modified Files: tramp.el ChangeLog Log Message: (tramp-remote-path): Add /usr/contrib/bin. Reported by Jason Mastaler. Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.60 retrieving revision 2.61 diff -C2 -d -r2.60 -r2.61 *** tramp.el 2001/12/30 16:53:34 2.60 --- tramp.el 2001/12/30 16:57:23 2.61 *************** *** 717,721 **** '("/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin" "/usr/ccs/bin" "/local/bin" "/local/freeware/bin" "/local/gnu/bin" ! "/usr/freeware/bin" "/usr/pkg/bin") "*List of directories to search for executables on remote host. Please notify me about other semi-standard directories to include here. --- 717,721 ---- '("/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin" "/usr/ccs/bin" "/local/bin" "/local/freeware/bin" "/local/gnu/bin" ! "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin") "*List of directories to search for executables on remote host. Please notify me about other semi-standard directories to include here. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.56 retrieving revision 2.57 diff -C2 -d -r2.56 -r2.57 *** ChangeLog 2001/12/30 16:53:34 2.56 --- ChangeLog 2001/12/30 16:57:23 2.57 *************** *** 5,8 **** --- 5,10 ---- Without the parens, /bin/sh as of BSD/OS 4.x crashes. Reported by Jason Mastaler. + (tramp-remote-path): Add /usr/contrib/bin. + Reported by Jason Mastaler. 2001-12-29 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> |
From: Kai Gro?j. <ka...@us...> - 2001-12-30 16:53:38
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv8399/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-post-connection): Use parens around "test / -nt /" command to find out if `test' supports the `-nt' switch. Without the parens, /bin/sh as of BSD/OS 4.x crashes. Reported by Jason Mastaler. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.55 retrieving revision 2.56 diff -C2 -d -r2.55 -r2.56 *** ChangeLog 2001/12/29 22:06:29 2.55 --- ChangeLog 2001/12/30 16:53:34 2.56 *************** *** 1,2 **** --- 1,9 ---- + 2001-12-30 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-post-connection): Use parens around "test / -nt + /" command to find out if `test' supports the `-nt' switch. + Without the parens, /bin/sh as of BSD/OS 4.x crashes. + Reported by Jason Mastaler. + 2001-12-29 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.59 retrieving revision 2.60 diff -C2 -d -r2.59 -r2.60 *** tramp.el 2001/12/29 21:21:57 2.59 --- tramp.el 2001/12/30 16:53:34 2.60 *************** *** 3854,3862 **** (tramp-wait-for-output) ;; Does `test A -nt B' work? Use abominable `find' construct if it ! ;; doesn't. (erase-buffer) (make-local-variable 'tramp-test-groks-nt) (tramp-send-command multi-method method user host ! "test / -nt /") (tramp-wait-for-output) (goto-char (point-min)) --- 3854,3863 ---- (tramp-wait-for-output) ;; Does `test A -nt B' work? Use abominable `find' construct if it ! ;; doesn't. BSD/OS 4.0 wants the parentheses around the command, ! ;; for otherwise the shell crashes. (erase-buffer) (make-local-variable 'tramp-test-groks-nt) (tramp-send-command multi-method method user host ! "( test / -nt / )") (tramp-wait-for-output) (goto-char (point-min)) |
From: Kai Gro?j. <ka...@us...> - 2001-12-29 22:06:32
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv14570/tramp/lisp Modified Files: ChangeLog Makefile tramp-util.el tramp-vc.el Log Message: * Makefile (tramp.elc): Remove superfluous dependencies. * tramp-vc.el (tramp-vc-workfile-unchanged-p): Supply two args to vc-default-workfile-unchanged-p. * tramp-util.el (tramp): Require tramp. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.54 retrieving revision 2.55 diff -C2 -d -r2.54 -r2.55 *** ChangeLog 2001/12/29 21:21:57 2.54 --- ChangeLog 2001/12/29 22:06:29 2.55 *************** *** 1,4 **** --- 1,11 ---- 2001-12-29 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + * Makefile (tramp.elc): Remove superfluous dependencies. + + * tramp-vc.el (tramp-vc-workfile-unchanged-p): Supply two args to + vc-default-workfile-unchanged-p. + + * tramp-util.el (tramp): Require tramp. + * tramp.el (tramp-check-ls-command): Return status of command to check if ls supports the `-n' option should be zero, not non-nil. Index: Makefile =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/Makefile,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** Makefile 2001/12/06 12:34:38 2.2 --- Makefile 2001/12/29 22:06:29 2.3 *************** *** 7,11 **** tramp: tramp.elc tramp-vc.elc tramp-util.elc ! tramp.elc: tramp.el base64.elc format-spec.elc $(EMACS) -batch --eval "(add-to-list 'load-path \".\")" \ -f batch-byte-compile tramp.el --- 7,11 ---- tramp: tramp.elc tramp-vc.elc tramp-util.elc ! tramp.elc: tramp.el $(EMACS) -batch --eval "(add-to-list 'load-path \".\")" \ -f batch-byte-compile tramp.el Index: tramp-util.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp-util.el,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** tramp-util.el 2001/11/08 16:46:57 2.4 --- tramp-util.el 2001/12/29 22:06:29 2.5 *************** *** 29,32 **** --- 29,33 ---- (require 'compile) + (require 'tramp) (defun tramp-compile (command) Index: tramp-vc.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp-vc.el,v retrieving revision 2.0 retrieving revision 2.1 diff -C2 -d -r2.0 -r2.1 *** tramp-vc.el 2001/02/28 10:39:27 2.0 --- tramp-vc.el 2001/12/29 22:06:29 2.1 *************** *** 321,325 **** (zerop status)) ;; New VC. Call `vc-default-workfile-unchanged-p'. ! (vc-default-workfile-unchanged-p filename))) (defadvice vc-workfile-unchanged-p --- 321,325 ---- (zerop status)) ;; New VC. Call `vc-default-workfile-unchanged-p'. ! (vc-default-workfile-unchanged-p (vc-backend file) filename))) (defadvice vc-workfile-unchanged-p |
From: Kai Gro?j. <ka...@us...> - 2001-12-29 21:22:00
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv5989/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-find-ls-command): Look for `gls' in addition to `ls' and `gnuls' binaries. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -d -r2.53 -r2.54 *** ChangeLog 2001/12/29 21:13:39 2.53 --- ChangeLog 2001/12/29 21:21:57 2.54 *************** *** 3,6 **** --- 3,8 ---- * tramp.el (tramp-check-ls-command): Return status of command to check if ls supports the `-n' option should be zero, not non-nil. + (tramp-find-ls-command): Look for `gls' in addition to `ls' and + `gnuls' binaries. 2001-12-28 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.58 retrieving revision 2.59 diff -C2 -d -r2.58 -r2.59 *** tramp.el 2001/12/29 21:13:39 2.58 --- tramp.el 2001/12/29 21:21:57 2.59 *************** *** 3104,3108 **** (or (tramp-check-ls-commands multi-method method user host "ls" tramp-remote-path) ! (tramp-check-ls-commands multi-method method user host "gnuls" tramp-remote-path))) ;; ------------------------------------------------------------ --- 3104,3109 ---- (or (tramp-check-ls-commands multi-method method user host "ls" tramp-remote-path) ! (tramp-check-ls-commands multi-method method user host "gnuls" tramp-remote-path) ! (tramp-check-ls-commands multi-method method user host "gls" tramp-remote-path))) ;; ------------------------------------------------------------ |
From: Kai Gro?j. <ka...@us...> - 2001-12-29 21:13:42
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv4163/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-check-ls-command): Return status of command to check if ls supports the `-n' option should be zero, not non-nil. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.52 retrieving revision 2.53 diff -C2 -d -r2.52 -r2.53 *** ChangeLog 2001/12/28 21:52:46 2.52 --- ChangeLog 2001/12/29 21:13:39 2.53 *************** *** 1,2 **** --- 1,7 ---- + 2001-12-29 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-check-ls-command): Return status of command to + check if ls supports the `-n' option should be zero, not non-nil. + 2001-12-28 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.57 retrieving revision 2.58 diff -C2 -d -r2.57 -r2.58 *** tramp.el 2001/12/28 21:57:06 2.57 --- tramp.el 2001/12/29 21:13:39 2.58 *************** *** 3081,3086 **** (tramp-message 7 "Testing remote command `%s' for -n...%s" cmd ! (if result "okay" "failed")) ! result))) (defun tramp-check-ls-commands (multi-method method user host cmd dirlist) --- 3081,3086 ---- (tramp-message 7 "Testing remote command `%s' for -n...%s" cmd ! (if (zerop result) "okay" "failed")) ! (zerop result)))) (defun tramp-check-ls-commands (multi-method method user host cmd dirlist) |
From: Kai Gro?j. <ka...@us...> - 2001-12-28 21:57:09
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv5184 Modified Files: tramp.el Log Message: Don't print message for checking decoding/encoding commands, unless that check actually happens. Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.56 retrieving revision 2.57 diff -C2 -d -r2.56 -r2.57 *** tramp.el 2001/12/28 21:56:12 2.56 --- tramp.el 2001/12/28 21:57:06 2.57 *************** *** 3930,3939 **** (encoding (tramp-get-encoding-command multi-method method)) (magic-string "xyzzy")) - (tramp-message - 5 "Checking to see if encoding and decoding commands work on remote host.") (when (and (or decoding encoding) (not (and decoding encoding))) (error "Must give both decoding and encoding command in method definition")) (when (and decoding encoding) (tramp-send-command multi-method method user host --- 3930,3940 ---- (encoding (tramp-get-encoding-command multi-method method)) (magic-string "xyzzy")) (when (and (or decoding encoding) (not (and decoding encoding))) (error "Must give both decoding and encoding command in method definition")) (when (and decoding encoding) + (tramp-message + 5 + "Checking to see if encoding and decoding commands work on remote host.") (tramp-send-command multi-method method user host |
From: Kai Gro?j. <ka...@us...> - 2001-12-28 21:56:15
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv4828 Modified Files: tramp.el Log Message: tramp-post-connection: Small comment change. Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.55 retrieving revision 2.56 diff -C2 -d -r2.55 -r2.56 *** tramp.el 2001/12/28 21:52:46 2.55 --- tramp.el 2001/12/28 21:56:12 2.56 *************** *** 3925,3928 **** --- 3925,3930 ---- multi-method method user host) ;; If encoding/decoding command are given, test to see if they work. + ;; CCC: Maybe it would be useful to run the encoder both locally and + ;; remotely to see if they produce the same result. (let ((decoding (tramp-get-decoding-command multi-method method)) (encoding (tramp-get-encoding-command multi-method method)) |
From: Kai Gro?j. <ka...@us...> - 2001-12-28 21:52:51
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv3841/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-post-connection): Move comment. Check to see if decoding and encoding commands work, if given in method definition. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.51 retrieving revision 2.52 diff -C2 -d -r2.51 -r2.52 *** ChangeLog 2001/12/28 07:07:46 2.51 --- ChangeLog 2001/12/28 21:52:46 2.52 *************** *** 1,2 **** --- 1,8 ---- + 2001-12-28 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-post-connection): Move comment. Check to see if + decoding and encoding commands work, if given in method + definition. + 2001-12-28 Kai Grossjohann <ka...@ls...> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.54 retrieving revision 2.55 diff -C2 -d -r2.54 -r2.55 *** tramp.el 2001/12/28 07:07:46 2.54 --- tramp.el 2001/12/28 21:52:46 2.55 *************** *** 1148,1154 **** (defconst tramp-file-name-handler-alist '( - ;; these aren't implemented yet (load . tramp-handle-load) - ;; these are implemented (make-symbolic-link . tramp-handle-make-symbolic-link) (file-name-directory . tramp-handle-file-name-directory) --- 1148,1152 ---- *************** *** 3831,3836 **** (tramp-message 5 "Using remote command `%s' for getting directory listings" tramp-ls-command) - ;; Tell remote shell to use standard time format, needed for - ;; parsing `ls -l' output. (tramp-send-command multi-method method user host (concat "tramp_set_exit_status () {" tramp-rsh-end-of-line --- 3829,3832 ---- *************** *** 3840,3843 **** --- 3836,3841 ---- ;; Set remote PATH variable. (tramp-set-remote-path multi-method method user host "PATH" tramp-remote-path) + ;; Tell remote shell to use standard time format, needed for + ;; parsing `ls -l' output. (tramp-send-command multi-method method user host "LC_TIME=C; export LC_TIME; echo huhu") *************** *** 3925,3929 **** (tramp-find-executable multi-method method user host "ln" tramp-remote-path nil) ! multi-method method user host)) --- 3923,3945 ---- (tramp-find-executable multi-method method user host "ln" tramp-remote-path nil) ! multi-method method user host) ! ;; If encoding/decoding command are given, test to see if they work. ! (let ((decoding (tramp-get-decoding-command multi-method method)) ! (encoding (tramp-get-encoding-command multi-method method)) ! (magic-string "xyzzy")) ! (tramp-message ! 5 "Checking to see if encoding and decoding commands work on remote host.") ! (when (and (or decoding encoding) (not (and decoding encoding))) ! (error ! "Must give both decoding and encoding command in method definition")) ! (when (and decoding encoding) ! (tramp-send-command ! multi-method method user host ! (format "echo %s | %s | %s" ! (tramp-shell-quote-argument magic-string) encoding decoding)) ! (tramp-wait-for-output) ! (unless (looking-at (regexp-quote magic-string)) ! (error "Remote host cannot execute de/encoding commands. See buffer `%s' for details" ! (buffer-name)))))) |
From: Kai Gro?j. <ka...@us...> - 2001-12-28 07:07:49
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv11482/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-file-name-handler-alist): New entry for `file-truename'. (tramp-handle-file-truename): New function. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.50 retrieving revision 2.51 diff -C2 -d -r2.50 -r2.51 *** ChangeLog 2001/12/27 17:28:08 2.50 --- ChangeLog 2001/12/28 07:07:46 2.51 *************** *** 1,2 **** --- 1,8 ---- + 2001-12-28 Kai Grossjohann <ka...@ls...> + + * tramp.el (tramp-file-name-handler-alist): New entry for + `file-truename'. + (tramp-handle-file-truename): New function. + 2001-12-27 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -d -r2.53 -r2.54 *** tramp.el 2001/12/27 17:28:08 2.53 --- tramp.el 2001/12/28 07:07:46 2.54 *************** *** 1154,1157 **** --- 1154,1158 ---- (file-name-directory . tramp-handle-file-name-directory) (file-name-nondirectory . tramp-handle-file-name-nondirectory) + (file-truename . tramp-handle-file-truename) (file-exists-p . tramp-handle-file-exists-p) (file-directory-p . tramp-handle-file-directory-p) *************** *** 1362,1366 **** (let ((v (tramp-dissect-file-name file))) (file-name-nondirectory (tramp-file-name-path v)))) ! ;; Basic functions. --- 1363,1411 ---- (let ((v (tramp-dissect-file-name file))) (file-name-nondirectory (tramp-file-name-path v)))) ! ! (defun tramp-handle-file-truename (filename &optional counter prev-dirs) ! "Like `file-truename' for tramp files." ! (let* ((v (tramp-dissect-file-name (tramp-handle-expand-file-name filename))) ! (multi-method (tramp-file-name-multi-method v)) ! (method (tramp-file-name-method v)) ! (user (tramp-file-name-user v)) ! (host (tramp-file-name-host v)) ! (path (tramp-file-name-path v)) ! (steps (split-string path "/")) ! (thisstep nil) ! (numchase 0) ! (numchase-limit 100) ! (curstri "") ! symlink-target) ! (while (and steps (< numchase numchase-limit)) ! (setq thisstep (car steps)) ! (cond ((string= "." thisstep) ! (pop steps)) ! ((string= ".." thisstep) ! (if (string-match "\\`(.*)/" curstri) ! (setq curstri (match-string 1 curstri)) ! (setq curstri "")) ! (pop steps)) ! (t ! (setq curstri (concat curstri "/" thisstep)) ! (setq symlink-target ! (nth 0 (file-attributes (tramp-make-tramp-file-name ! multi-method method user host ! curstri)))) ! (if (not (stringp symlink-target)) ! ;; It's not a symlink; do next loop iteration. ! (pop steps) ! ;; It's a symlink. ! (when (string= curstri symlink-target) ! (error "Link `%s' points to itself" curstri)) ! (setq steps (append (split-string symlink-target "/") steps) ! numchase (1+ numchase)) ! ;; For absolute symlink targets, drop current prefix. ! (when (file-name-absolute-p symlink-target) ! (setq curstri "")))))) ! (when (>= numchase numchase-limit) ! (error "Maximum number (%d) of symlinks exceeded" numchase-limit)) ! (tramp-make-tramp-file-name multi-method method user host ! curstri))) ;; Basic functions. |
From: Kai Gro?j. <ka...@us...> - 2001-12-27 17:28:12
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv13627/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-handle-set-visited-file-modtime): More error checking. If `file-attributes' returns modtime (0 0), then assume modtime isn't known and revert to using `ls -ild'. Previously, we checked if Perl was available. (tramp-handle-verify-visited-file-modtime): Check for modtime being (0 0), rather than Perl being available. (tramp-handle-write-region): Some sanity checking: make sure that current buffer isn't changed while the function runs. (Maybe this is not necessary now?) Only set-visited-file-modtime if VISIT is t (used to check for non-nil). (tramp-make-auto-save-file-name): Construct a local filename, then run `make-auto-save-file-name' on it. This makes sure that no filename handlers will be run on that file. (Specifically, this avoids jka-compr -- we want auto-save files to be saved quickly. This fixes the change from 2001-12-07 which aimed at doing the same thing, but failed.) Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.49 retrieving revision 2.50 diff -C2 -d -r2.49 -r2.50 *** ChangeLog 2001/12/27 16:21:26 2.49 --- ChangeLog 2001/12/27 17:28:08 2.50 *************** *** 4,7 **** --- 4,23 ---- Instead, make sure that jka-compr comes first in file-name-handler-alist. + (tramp-handle-set-visited-file-modtime): More error checking. If + `file-attributes' returns modtime (0 0), then assume modtime isn't + known and revert to using `ls -ild'. Previously, we checked if + Perl was available. + (tramp-handle-verify-visited-file-modtime): Check for modtime + being (0 0), rather than Perl being available. + (tramp-handle-write-region): Some sanity checking: make sure that + current buffer isn't changed while the function runs. (Maybe this + is not necessary now?) Only set-visited-file-modtime if VISIT is + t (used to check for non-nil). + (tramp-make-auto-save-file-name): Construct a local filename, then + run `make-auto-save-file-name' on it. This makes sure that no + filename handlers will be run on that file. (Specifically, this + avoids jka-compr -- we want auto-save files to be saved quickly. + This fixes the change from 2001-12-07 which aimed at doing the + same thing, but failed.) 2001-12-26 Kai Grossjohann <ka...@ls...> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.52 retrieving revision 2.53 diff -C2 -d -r2.52 -r2.53 *** tramp.el 2001/12/27 16:21:26 2.52 --- tramp.el 2001/12/27 17:28:08 2.53 *************** *** 1501,1510 **** result)) - ;; This function assumes that we can get the precise modtime iff Perl - ;; is present. When we change Tramp to use the fstat(1) program, then - ;; we need to change this assumtion. Maybe we should just check for a - ;; sentinel value in the return value of `file-attributes'? (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for tramp files." (let* ((f (buffer-file-name)) (v (tramp-dissect-file-name f)) --- 1501,1509 ---- result)) (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for tramp files." + (unless (buffer-file-name) + (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file" + (buffer-name))) (let* ((f (buffer-file-name)) (v (tramp-dissect-file-name f)) *************** *** 1516,1520 **** (attr (file-attributes f)) (modtime (nth 5 attr))) ! (if (tramp-get-remote-perl multi-method method user host) (tramp-run-real-handler 'set-visited-file-modtime (list modtime)) (save-excursion --- 1515,1521 ---- (attr (file-attributes f)) (modtime (nth 5 attr))) ! ;; We use '(0 0) as a don't-know value. See also ! ;; `tramp-handle-file-attributes-with-ls'. ! (if (not (equal modtime '(0 0))) (tramp-run-real-handler 'set-visited-file-modtime (list modtime)) (save-excursion *************** *** 1544,1548 **** (attr (file-attributes f)) (modtime (nth 5 attr))) ! (if nil ;(tramp-get-remote-perl multi-method method user host) ;; Why does `file-attributes' return a list (HIGH LOW), but ;; `visited-file-modtime' returns a cons (HIGH . LOW)? --- 1545,1549 ---- (attr (file-attributes f)) (modtime (nth 5 attr))) ! (if (not (equal modtime '(0 0))) ;; Why does `file-attributes' return a list (HIGH LOW), but ;; `visited-file-modtime' returns a cons (HIGH . LOW)? *************** *** 2467,2471 **** filename)) (error "File not overwritten"))) ! (let* ((v (tramp-dissect-file-name filename)) (multi-method (tramp-file-name-multi-method v)) (method (tramp-file-name-method v)) --- 2468,2473 ---- filename)) (error "File not overwritten"))) ! (let* ((curbuf (current-buffer)) ! (v (tramp-dissect-file-name filename)) (multi-method (tramp-file-name-multi-method v)) (method (tramp-file-name-method v)) *************** *** 2625,2629 **** (when (boundp 'last-coding-system-used) (setq last-coding-system-used coding-system-used)) ! (when visit (set-visited-file-modtime)) (when (or (eq visit t) --- 2627,2634 ---- (when (boundp 'last-coding-system-used) (setq last-coding-system-used coding-system-used)) ! (unless (equal curbuf (current-buffer)) ! (error "Buffer has changed from `%s' to `%s'" ! curbuf (current-buffer))) ! (when (eq visit t) (set-visited-file-modtime)) (when (or (eq visit t) *************** *** 4469,4482 **** ;; file name we make sure that jka-compr isn't used for the ;; auto-save file. ! (expand-file-name ! (concat (tramp-subst-strs-in-string '(("_" . "|") ! ("/" . "_a") ! (":" . "_b") ! ("|" . "__") ! ("[" . "_l") ! ("]" . "_r")) ! fn) ! "~") ! tramp-auto-save-directory)) (defadvice make-auto-save-file-name --- 4474,4487 ---- ;; file name we make sure that jka-compr isn't used for the ;; auto-save file. ! (let ((buffer-file-name (expand-file-name ! (tramp-subst-strs-in-string '(("_" . "|") ! ("/" . "_a") ! (":" . "_b") ! ("|" . "__") ! ("[" . "_l") ! ("]" . "_r")) ! fn) ! tramp-auto-save-directory))) ! (make-auto-save-file-name))) (defadvice make-auto-save-file-name |
From: Kai Gro?j. <ka...@us...> - 2001-12-27 16:21:29
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv28103/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (toplevel): Don't barf if jka-compr is already loaded. Instead, make sure that jka-compr comes first in file-name-handler-alist. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.48 retrieving revision 2.49 diff -C2 -d -r2.48 -r2.49 *** ChangeLog 2001/12/26 19:35:13 2.48 --- ChangeLog 2001/12/27 16:21:26 2.49 *************** *** 1,2 **** --- 1,8 ---- + 2001-12-27 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (toplevel): Don't barf if jka-compr is already loaded. + Instead, make sure that jka-compr comes first in + file-name-handler-alist. + 2001-12-26 Kai Grossjohann <ka...@ls...> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.51 retrieving revision 2.52 diff -C2 -d -r2.51 -r2.52 *** tramp.el 2001/12/26 19:35:13 2.51 --- tramp.el 2001/12/27 16:21:26 2.52 *************** *** 86,96 **** (require 'efs)) - ;; It does not work to load Tramp after loading jka-compr. Emacs 21.2 - ;; might have a fix for this, so this code can be disabled in the - ;; future. - (when (and (boundp 'auto-compression-mode) - (symbol-value 'auto-compression-mode)) - (error "Must load Tramp before enabling `auto-compression-mode'.")) - (eval-when-compile (require 'cl) --- 86,89 ---- *************** *** 1551,1555 **** (attr (file-attributes f)) (modtime (nth 5 attr))) ! (if (tramp-get-remote-perl multi-method method user host) ;; Why does `file-attributes' return a list (HIGH LOW), but ;; `visited-file-modtime' returns a cons (HIGH . LOW)? --- 1544,1548 ---- (attr (file-attributes f)) (modtime (nth 5 attr))) ! (if nil ;(tramp-get-remote-perl multi-method method user host) ;; Why does `file-attributes' return a list (HIGH LOW), but ;; `visited-file-modtime' returns a cons (HIGH . LOW)? *************** *** 2686,2689 **** --- 2679,2690 ---- (add-to-list 'file-name-handler-alist (cons tramp-file-name-regexp 'tramp-file-name-handler)) + + ;; If jka-compr is already loaded, move it to the front of + ;; `file-name-handler-alist'. On Emacs 21.3 or so this will not be + ;; necessary anymore. + (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist))) + (when jka + (setq file-name-handler-alist + (cons jka (delete jka file-name-handler-alist))))) ;;; Interactions with other packages: |
From: Kai Gro?j. <ka...@us...> - 2001-12-26 19:35:17
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv2321/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-buffer-file-attributes): Doc string fix. (tramp-handle-set-visited-file-modtime): Don't barf if called without arguments. Use output of "ls -ild", not return value of file-attributes, for tramp-buffer-file-attributes. (tramp-handle-verify-visited-file-modtime): Use output of "ls -ild", not return value of file-attributes, for tramp-buffer-file-attributes. (tramp-handle-insert-file-contents): Call set-visited-file-modtime without args. (tramp-handle-insert-file-contents): Ditto. (tramp-handle-write-region): Pass VISIT arg on to call of real handler. (The old code of passing the `no-message' symbol instead was a little strange -- an XEmacsism?) (tramp-handle-write-region): Call set-visited-file-modtime, if VISIT. Remove some todo items. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.47 retrieving revision 2.48 diff -C2 -d -r2.47 -r2.48 *** ChangeLog 2001/12/25 21:38:53 2.47 --- ChangeLog 2001/12/26 19:35:13 2.48 *************** *** 1,2 **** --- 1,21 ---- + 2001-12-26 Kai Grossjohann <ka...@ls...> + + * tramp.el (tramp-buffer-file-attributes): Doc string fix. + (tramp-handle-set-visited-file-modtime): Don't barf if called + without arguments. Use output of "ls -ild", not return value of + file-attributes, for tramp-buffer-file-attributes. + (tramp-handle-verify-visited-file-modtime): Use output of "ls + -ild", not return value of file-attributes, for + tramp-buffer-file-attributes. + (tramp-handle-insert-file-contents): Call set-visited-file-modtime + without args. + (tramp-handle-insert-file-contents): Ditto. + (tramp-handle-write-region): Pass VISIT arg on to call of real + handler. (The old code of passing the `no-message' symbol instead + was a little strange -- an XEmacsism?) + (tramp-handle-write-region): Call set-visited-file-modtime, if + VISIT. + Remove some todo items. + 2001-12-25 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.50 retrieving revision 2.51 diff -C2 -d -r2.50 -r2.51 *** tramp.el 2001/12/25 21:38:53 2.50 --- tramp.el 2001/12/26 19:35:13 2.51 *************** *** 947,951 **** (defvar tramp-buffer-file-attributes nil ! "Holds the `ls -li' output for the current buffer. This variable is local to each buffer. It is not used if the remote machine groks Perl. If it is used, it's used as an emulation for --- 947,951 ---- (defvar tramp-buffer-file-attributes nil ! "Holds the `ls -ild' output for the current buffer. This variable is local to each buffer. It is not used if the remote machine groks Perl. If it is used, it's used as an emulation for *************** *** 1514,1519 **** (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for tramp files." - (when time-list - (error "Use set-visited-file-modtime directly with a time-list")) (let* ((f (buffer-file-name)) (v (tramp-dissect-file-name f)) --- 1514,1517 ---- *************** *** 1526,1530 **** (modtime (nth 5 attr))) (if (tramp-get-remote-perl multi-method method user host) ! (set-visited-file-modtime modtime) (setq tramp-buffer-file-attributes attr)) nil)) --- 1524,1537 ---- (modtime (nth 5 attr))) (if (tramp-get-remote-perl multi-method method user host) ! (tramp-run-real-handler 'set-visited-file-modtime (list modtime)) ! (save-excursion ! (tramp-send-command ! multi-method method user host ! (format "%s -ild %s" ! (tramp-get-ls-command multi-method method user host) ! (tramp-shell-quote-argument path))) ! (tramp-wait-for-output) ! (setq attr (buffer-substring (point) ! (progn (end-of-line) (point))))) (setq tramp-buffer-file-attributes attr)) nil)) *************** *** 1549,1552 **** --- 1556,1568 ---- (and (equal (car (visited-file-modtime)) (nth 0 modtime)) (equal (cdr (visited-file-modtime)) (nth 1 modtime))) + (save-excursion + (tramp-send-command + multi-method method user host + (format "%s -ild %s" + (tramp-get-ls-command multi-method method user host) + (tramp-shell-quote-argument path))) + (tramp-wait-for-output) + (setq attr (buffer-substring (point) + (progn (end-of-line) (point))))) (equal tramp-buffer-file-attributes attr))))) *************** *** 2417,2421 **** (when visit (setq buffer-file-name filename) ! (set-visited-file-modtime '(0 0)) (set-buffer-modified-p nil)) (signal 'file-error --- 2433,2437 ---- (when visit (setq buffer-file-name filename) ! (set-visited-file-modtime) (set-buffer-modified-p nil)) (signal 'file-error *************** *** 2426,2430 **** (when visit (setq buffer-file-name filename) ! (set-visited-file-modtime '(0 0)) (set-buffer-modified-p nil)) (tramp-message 9 "Inserting local temp file `%s'..." local-copy) --- 2442,2446 ---- (when visit (setq buffer-file-name filename) ! (set-visited-file-modtime) (set-buffer-modified-p nil)) (tramp-message 9 "Inserting local temp file `%s'..." local-copy) *************** *** 2482,2490 **** ;; because this makes the logic simpler. (setq tmpfil (tramp-make-temp-file)) (tramp-run-real-handler 'write-region (if confirm ; don't pass this arg unless defined for backward compat. ! (list start end tmpfil append 'no-message lockname confirm) ! (list start end tmpfil append 'no-message lockname))) ;; Now, `last-coding-system-used' has the right value. Remember it. (when (boundp 'last-coding-system-used) --- 2498,2508 ---- ;; because this makes the logic simpler. (setq tmpfil (tramp-make-temp-file)) + ;; We used to pass 'no-message instead of visit in the following + ;; call. Why? 2001-12-26 grossjoh (tramp-run-real-handler 'write-region (if confirm ; don't pass this arg unless defined for backward compat. ! (list start end tmpfil append visit lockname confirm) ! (list start end tmpfil append visit lockname))) ;; Now, `last-coding-system-used' has the right value. Remember it. (when (boundp 'last-coding-system-used) *************** *** 2614,2617 **** --- 2632,2637 ---- (when (boundp 'last-coding-system-used) (setq last-coding-system-used coding-system-used)) + (when visit + (set-visited-file-modtime)) (when (or (eq visit t) (eq visit nil) *************** *** 4791,4799 **** ;; get-file-buffer -- use primitive ;; load - ;; set-visited-file-modtime - ;; shell-command ;; unhandled-file-name-directory ;; vc-registered - ;; verify-visited-file-modtime ;;; tramp.el ends here --- 4811,4816 ---- |
From: Kai Gro?j. <ka...@us...> - 2001-12-25 21:38:56
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv31296/tramp/lisp Modified Files: ChangeLog tramp.el Log Message: (tramp-buffer-file-attributes): New variable. (tramp-handle-set-visited-file-modtime): Use it in case the remote end does not give us the right modtime. (tramp-handle-verify-visited-file-modtime): Implementation. Index: ChangeLog =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v retrieving revision 2.46 retrieving revision 2.47 diff -C2 -d -r2.46 -r2.47 *** ChangeLog 2001/12/07 12:00:39 2.46 --- ChangeLog 2001/12/25 21:38:53 2.47 *************** *** 1,2 **** --- 1,9 ---- + 2001-12-25 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * tramp.el (tramp-buffer-file-attributes): New variable. + (tramp-handle-set-visited-file-modtime): Use it in case the + remote end does not give us the right modtime. + (tramp-handle-verify-visited-file-modtime): Implementation. + 2001-12-07 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.49 retrieving revision 2.50 diff -C2 -d -r2.49 -r2.50 *** tramp.el 2001/12/25 20:54:05 2.49 --- tramp.el 2001/12/25 21:38:53 2.50 *************** *** 946,949 **** --- 946,956 ---- ;;; Internal Variables: + (defvar tramp-buffer-file-attributes nil + "Holds the `ls -li' output for the current buffer. + This variable is local to each buffer. It is not used if the remote + machine groks Perl. If it is used, it's used as an emulation for + the visited file modtime.") + (make-variable-buffer-local 'tramp-buffer-file-attributes) + (defvar tramp-end-of-output "/////" "String used to recognize end of output.") *************** *** 1501,1504 **** --- 1508,1515 ---- result)) + ;; This function assumes that we can get the precise modtime iff Perl + ;; is present. When we change Tramp to use the fstat(1) program, then + ;; we need to change this assumtion. Maybe we should just check for a + ;; sentinel value in the return value of `file-attributes'? (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for tramp files." *************** *** 1511,1525 **** (user (tramp-file-name-user v)) (host (tramp-file-name-host v)) ! (path (tramp-file-name-path v))) (if (tramp-get-remote-perl multi-method method user host) ! (let ((attr (file-attributes f))) ! (set-visited-file-modtime (nth 5 attr))) ! ;;CCC continue here ! nil))) (defun tramp-handle-verify-visited-file-modtime (buf) "Like `verify-visited-file-modtime' for tramp files." ! nil) ! (defun tramp-handle-set-file-modes (filename mode) --- 1522,1553 ---- (user (tramp-file-name-user v)) (host (tramp-file-name-host v)) ! (path (tramp-file-name-path v)) ! (attr (file-attributes f)) ! (modtime (nth 5 attr))) (if (tramp-get-remote-perl multi-method method user host) ! (set-visited-file-modtime modtime) ! (setq tramp-buffer-file-attributes attr)) ! nil)) + ;; This function makes the same assumption as + ;; `tramp-handle-set-visited-file-modtime'. (defun tramp-handle-verify-visited-file-modtime (buf) "Like `verify-visited-file-modtime' for tramp files." ! (with-current-buffer buf ! (let* ((f (buffer-file-name)) ! (v (tramp-dissect-file-name f)) ! (multi-method (tramp-file-name-multi-method v)) ! (method (tramp-file-name-method v)) ! (user (tramp-file-name-user v)) ! (host (tramp-file-name-host v)) ! (path (tramp-file-name-path v)) ! (attr (file-attributes f)) ! (modtime (nth 5 attr))) ! (if (tramp-get-remote-perl multi-method method user host) ! ;; Why does `file-attributes' return a list (HIGH LOW), but ! ;; `visited-file-modtime' returns a cons (HIGH . LOW)? ! (and (equal (car (visited-file-modtime)) (nth 0 modtime)) ! (equal (cdr (visited-file-modtime)) (nth 1 modtime))) ! (equal tramp-buffer-file-attributes attr))))) (defun tramp-handle-set-file-modes (filename mode) |
From: Kai Gro?j. <ka...@us...> - 2001-12-25 20:54:10
|
Update of /cvsroot/tramp/tramp/lisp In directory usw-pr-cvs1:/tmp/cvs-serv25240/tramp/lisp Modified Files: tramp.el Log Message: New todo item. Index: tramp.el =================================================================== RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v retrieving revision 2.48 retrieving revision 2.49 diff -C2 -d -r2.48 -r2.49 *** tramp.el 2001/12/07 12:00:39 2.48 --- tramp.el 2001/12/25 20:54:05 2.49 *************** *** 4669,4672 **** --- 4669,4674 ---- ;;; TODO: + ;; * In Emacs 21, `insert-directory' shows total number of bytes used + ;; by the files in that directory. Add this here. ;; * Avoid screen blanking when hitting `g' in dired. (Eli Tziperman) ;; * Make ffap.el grok Tramp filenames. (Eli Tziperman) |