bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

Recipe from "emacs -Q":

1. Eval: (cd "/usr@host:/path-0/").
2. Eval: (diff "/usr@host:/path-1/file-1" "/usr@host:/path-2/file-2")
3. In the *Diff* buffer, move point to a hunk and type "C-c C-c".
4. In the "Use file" prompt, accept the default (i.e., just type RET).

--> Expected result: File "/usr@host:/path-2/file-2" is visited.
--> Observed result: A *Completions* buffer is created.


Notes:
* "usr@host" stands for a user account in a remote host.
* "path-<n>" stands for valid directories (in that remote host).
* "file-1" and "file-2" stands for valid files that are not equal.


In GNU Emacs 24.0.91.1 (i386-mingw-nt5.1.2600)
 of 2011-11-22 on MARVIN
Windowing system distributor `Microsoft Corp.', version 5.1.2600
configured using `configure --with-gcc (4.6) --no-opt --cflags
-ID:/devel/emacs/libs/libXpm-3.5.8/include
-ID:/devel/emacs/libs/libXpm-3.5.8/src
-ID:/devel/emacs/libs/libpng-dev_1.4.3-1/include
-ID:/devel/emacs/libs/zlib-dev_1.2.5-2/include
-ID:/devel/emacs/libs/giflib-4.1.4-1/include
-ID:/devel/emacs/libs/jpeg-6b-4/include
-ID:/devel/emacs/libs/tiff-3.8.2-1/include
-ID:/devel/emacs/libs/gnutls-2.10.1/include --ldflags
-LD:/devel/emacs/libs/gnutls-2.10.1/lib'

-- 
Dani Moncayo

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

> Recipe from "emacs -Q":
>
> 1. Eval: (cd "/usr@host:/path-0/").
> 2. Eval: (diff "/usr@host:/path-1/file-1" "/usr@host:/path-2/file-2")
> 3. In the *Diff* buffer, move point to a hunk and type "C-c C-c".
> 4. In the "Use file" prompt, accept the default (i.e., just type RET).
>
> --> Expected result: File "/usr@host:/path-2/file-2" is visited.
> --> Observed result: A *Completions* buffer is created.

I cannot reproduce it. As step 4, I get the message "Hunk already
applied". File "/usr@host:/path-2/file-2" is visited.

> In GNU Emacs 24.0.91.1 (i386-mingw-nt5.1.2600)
>  of 2011-11-22 on MARVIN

I do not use the latest snapshot, but the pretest version:

In GNU Emacs 24.0.91.1 (i386-mingw-nt5.1.2600)
 of 2011-10-31 on MARVIN

Does this make a difference?

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

> I do not use the latest snapshot, but the pretest version:
>
> In GNU Emacs 24.0.91.1 (i386-mingw-nt5.1.2600)
>  of 2011-10-31 on MARVIN
>
> Does this make a difference?

No, it doesn't.  (I've just repeated the recipe with that version).

At step #4, I see this in the minibuffer:
"Use file /usr@host:/path-2/file-2: /usr@host:/path-0//usr@host:/path-2/file-2"

That default path is wrong.

In this case, Emacs should give a correct default path, which could be
one of these two:
a. "/usr@host:/path-0///usr@host:/path-2/file-2" (with 3 "/" instead of 2).
b. "/usr@host:/path-0//path-2/file-2" (removing the second "/usr@host:").


-- 
Dani Moncayo

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

> At step #4, I see this in the minibuffer:
> "Use file /usr@host:/path-2/file-2: /usr@host:/path-0//usr@host:/path-2/file-2"

And BTW, I don't understand why the path "/usr@host:/path-2/file-2" is
shown in the prompt message, when it is already pre-loaded in the
minibuffer.


-- 
Dani Moncayo

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

>> I do not use the latest snapshot, but the pretest version:
>>
>> In GNU Emacs 24.0.91.1 (i386-mingw-nt5.1.2600)
>>  of 2011-10-31 on MARVIN
>>
>> Does this make a difference?
>
> No, it doesn't.  (I've just repeated the recipe with that version).
>
> At step #4, I see this in the minibuffer:
> "Use file /usr@host:/path-2/file-2: /usr@host:/path-0//usr@host:/path-2/file-2"

I'm not able to reproduce the problem. I'm always presented with the
message "Hunk already applied".

Could you, please, give me an example of two files which apply for your scenario?

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

>> At step #4, I see this in the minibuffer:
>> "Use file /usr@host:/path-2/file-2: /usr@host:/path-0//usr@host:/path-2/file-2"
>
> I'm not able to reproduce the problem. I'm always presented with the
> message "Hunk already applied".
>
> Could you, please, give me an example of two files which apply for your scenario?

The concrete files used seem to be unrelated to the problem.  In any
case, I'm attaching two example files (f1,f2) which I've just used to
reproduce the problem.

I'm attaching also a screenshot of the *Diff* buffer and the
minibuffer, in the moment of the fail.

BTW, I'm using the "diff" program that comes with MinGW (its MSYS
package), since windows doesn't provides such program.

-- 
Dani Moncayo

[-- Attachment #2: img.PNG --]
[-- Type: image/png, Size: 20509 bytes --]

[-- Attachment #3: f1 --]
[-- Type: application/octet-stream, Size: 195 bytes --]

;; This buffer is for notes you don't want to save, and for Lisp evaluation.
;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.


[-- Attachment #4: f2 --]
[-- Type: application/octet-stream, Size: 246 bytes --]

;; This buffer is for notes you don't want to save, and for Lisp evaluation.
;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.
;; then enter the text in that file's own buffer.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

> The concrete files used seem to be unrelated to the problem.  In any
> case, I'm attaching two example files (f1,f2) which I've just used to
> reproduce the problem.

Thanks.

> I'm attaching also a screenshot of the *Diff* buffer and the
> minibuffer, in the moment of the fail.

What surprises me are ange-ftp temporary files mentioned in this
screenshot. Are you using FTP for the connection? This would change my
test cases.

> BTW, I'm using the "diff" program that comes with MinGW (its MSYS
> package), since windows doesn't provides such program.

I hope it is not related to the problem. I'm not using MS Windows, and I
have only restricted access to such systems for test. Installing MinGW
would be out of my permissions.

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

>> I'm attaching also a screenshot of the *Diff* buffer and the
>> minibuffer, in the moment of the fail.
>
> What surprises me are ange-ftp temporary files mentioned in this
> screenshot. Are you using FTP for the connection? This would change my
> test cases.

It seems so.  The given recipe is from recent builds of emacs-trunk on
MS-Windows, i.e., fact that my Emacs is using ange-ftp under the hood
is something I've not decided.


-- 
Dani Moncayo

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

> It seems so.  The given recipe is from recent builds of emacs-trunk on
> MS-Windows, i.e., fact that my Emacs is using ange-ftp under the hood
> is something I've not decided.

What happens, if you specify an explicit method, like "plink" or "pscp"?
This requires PuTTY on your machine, 'tho.

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

>> It seems so.  The given recipe is from recent builds of emacs-trunk on
>> MS-Windows, i.e., fact that my Emacs is using ange-ftp under the hood
>> is something I've not decided.
>
> What happens, if you specify an explicit method, like "plink" or "pscp"?
> This requires PuTTY on your machine, 'tho.

* I've downloaded "plink.exe", "pscp.exe" and "putty.exe".
* I've moved them to a directory included in my PATH environment variable.

But when I try to eval (cd "/plink:usr@host:~/") or (cd
"/pscp:usr@host:~/"), Emacs hangs after I supply the password.

Maybe the server doesn't support those protocols.  Dunno.  In any
case, I'm able to open files in that server, if I let Emacs choose the
method, i.e., doing exactly what the OP says.

-- 
Dani Moncayo

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

> But when I try to eval (cd "/plink:usr@host:~/") or (cd
> "/pscp:usr@host:~/"), Emacs hangs after I supply the password.

There were reports that it might be necessary to access a remote server
at least once by the PuTTY GUI, before using with Tramp. Or it even
might be necessary to configure a PuTTY session.

Don't know, I'm not using Windows.

Best regards, Michael.

(I'll continue to check the ange-ftp case by tomorrow, when I have
access to such a mysterious machine, again)

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Eli Zaretskii]

> Date: Mon, 28 Nov 2011 15:01:00 +0100
> Cc: 10124@debbugs.gnu.org
> 
> > BTW, I'm using the "diff" program that comes with MinGW (its MSYS
> > package), since windows doesn't provides such program.
> 
> I hope it is not related to the problem.

It very much could be.  I would suggest to try the version from
GnuWin32 before ruling that out.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Eli Zaretskii <eliz@gnu.org> writes:

>> > BTW, I'm using the "diff" program that comes with MinGW (its MSYS
>> > package), since windows doesn't provides such program.
>> 
>> I hope it is not related to the problem.
>
> It very much could be.  I would suggest to try the version from
> GnuWin32 before ruling that out.

Fortunately, it isn't related to the diff program in use. I could
reproduce it on a Windows XP machine, using the ftp access
method, and a GnuWin32 diff.exe:

(executable-find "diff.exe") => "c:/Program Files/GnuWin32/bin/diff.exe"

I'll work on a patch.

Worse: When I check it with a local RHEL5 machine, the test scenario
from Dani results in

if: Not a Tramp file name:
/ftp\:slbhao\:/home/albinus/src/tramp/lisp/tramp.el

So we seem to have also a quoting problem. Grrr.

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Michael Albinus <michael.albinus@gmx.de> writes:

> Fortunately, it isn't related to the diff program in use. I could
> reproduce it on a Windows XP machine, using the ftp access
> method, and a GnuWin32 diff.exe:
>
> (executable-find "diff.exe") => "c:/Program Files/GnuWin32/bin/diff.exe"
>
> I'll work on a patch.

Dani, could you, please, check this patch:

--8<---------------cut here---------------start------------->8---
*** /home/albinus/src/emacs/lisp/vc/diff-mode.el.~106543~	2011-11-29 11:43:26.039703592 +0100
--- /home/albinus/src/emacs/lisp/vc/diff-mode.el	2011-11-29 11:42:27.087411264 +0100
***************
*** 815,823 ****
  	    (diff-find-file-name old noprompt (match-string 1)))
         ;; if all else fails, ask the user
         (unless noprompt
!          (let ((file (read-file-name (format "Use file %s: "
!                                              (or (first fs) ""))
!                                      nil (first fs) t (first fs))))
             (set (make-local-variable 'diff-remembered-files-alist)
                  (cons (cons fs file) diff-remembered-files-alist))
             file))))))
--- 815,825 ----
  	    (diff-find-file-name old noprompt (match-string 1)))
         ;; if all else fails, ask the user
         (unless noprompt
!          (let ((file (expand-file-name (or (first fs) "")))
! 	       (default-directory "/"))
! 	   (setq file
! 		 (read-file-name (format "Use file %s: " file)
! 				 nil file t file))
             (set (make-local-variable 'diff-remembered-files-alist)
                  (cons (cons fs file) diff-remembered-files-alist))
             file))))))
--8<---------------cut here---------------end--------------->8---

> Worse: When I check it with a local RHEL5 machine, the test scenario
> from Dani results in
>
> if: Not a Tramp file name:
> /ftp\:slbhao\:/home/albinus/src/tramp/lisp/tramp.el
>
> So we seem to have also a quoting problem. Grrr.

For this one, I'll write a new bug report.

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

> Dani, could you, please, check this patch:

It still fails :(

I'm attaching a screenshot of the aspect of the minibuffer after
typing "C-c C-c" in the *Diff* buffer (with your patch applied, of
course).

It seems that:
* There should be only one "/" at the beginning of the path.
* The prompt text should not show any path (it should be just "Use
file: "), because the default value is already pre-loaded in the
editable part.


-- 
Dani Moncayo

[-- Attachment #2: img2.PNG --]
[-- Type: image/png, Size: 2999 bytes --]

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

> It still fails :(

Sure? Have you tried to type RET, opening that file?

> I'm attaching a screenshot of the aspect of the minibuffer after
> typing "C-c C-c" in the *Diff* buffer (with your patch applied, of
> course).
>
> It seems that:
> * There should be only one "/" at the beginning of the path.

read-file-name prepends the default directory to the initial file
name. That's why I set default-directory temporary to "/", with the
result you see. That shall work.

> * The prompt text should not show any path (it should be just "Use
> file: "), because the default value is already pre-loaded in the
> editable part.

Maybe. But I don't know why it has been added there (for another use
cases?), and it doesn't hurt. Being so close to the release of Emacs
24.1, I would prefer to change only what is absolutely necessary.

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

>> It still fails :(
>
> Sure? Have you tried to type RET, opening that file?

Yes, I'm afraid.  Typing RET makes Emacs to create a *Completions*
Buffer (as in the OP). As you can see in the screenshot, only the
first "/" is digested by Emacs.

-- 
Dani Moncayo

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

>>> It still fails :(
>>
>> Sure? Have you tried to type RET, opening that file?
>
> Yes, I'm afraid.  Typing RET makes Emacs to create a *Completions*
> Buffer (as in the OP). As you can see in the screenshot, only the
> first "/" is digested by Emacs.

Ah, you are right. Try this one instead:

--8<---------------cut here---------------start------------->8---
*** /home/albinus/src/emacs/lisp/vc/diff-mode.el.~106544~	2011-11-29 15:20:32.520298416 +0100
--- /home/albinus/src/emacs/lisp/vc/diff-mode.el	2011-11-29 15:19:24.575961506 +0100
***************
*** 815,823 ****
  	    (diff-find-file-name old noprompt (match-string 1)))
         ;; if all else fails, ask the user
         (unless noprompt
!          (let ((file (read-file-name (format "Use file %s: "
!                                              (or (first fs) ""))
!                                      nil (first fs) t (first fs))))
             (set (make-local-variable 'diff-remembered-files-alist)
                  (cons (cons fs file) diff-remembered-files-alist))
             file))))))
--- 815,825 ----
  	    (diff-find-file-name old noprompt (match-string 1)))
         ;; if all else fails, ask the user
         (unless noprompt
!          (let ((file (expand-file-name (or (first fs) ""))))
! 	   (setq file
! 		 (read-file-name (format "Use file %s: " file)
! 				 (file-name-directory file) file t
! 				 (file-name-nondirectory file)))
             (set (make-local-variable 'diff-remembered-files-alist)
                  (cons (cons fs file) diff-remembered-files-alist))
             file))))))
--8<---------------cut here---------------end--------------->8---

Best regards, Michael.

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Dani Moncayo]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

> Try this one instead:

This one seems to work.

I'm attaching the aspect of the minibuffer just after typing "C-c
C-c".  The cursor is just before "f2", and typing RET opens that "f2"
file and the point jumps to the right position.

I wonder if the special fontification of the "/usr:host:" part is
intended (it looks strange to me).

Anyway, the bug seem to be fixed by your last patch, so that this bug
report can be closed.  Thank you.

-- 
Dani Moncayo

[-- Attachment #2: img3.PNG --]
[-- Type: image/png, Size: 3298 bytes --]

bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too

[Michael Albinus]

Dani Moncayo <dmoncayo@gmail.com> writes:

> This one seems to work.
>
> I'm attaching the aspect of the minibuffer just after typing "C-c
> C-c".  The cursor is just before "f2", and typing RET opens that "f2"
> file and the point jumps to the right position.
>
> I wonder if the special fontification of the "/usr:host:" part is
> intended (it looks strange to me).

I've seen it as well. It isn't set by Tramp, as far as I remember. Must
be modified somewhere else.

> Anyway, the bug seem to be fixed by your last patch, so that this bug
> report can be closed.  Thank you.

OK, bug closed.

Best regards, Michael.