accept more version names in file-name-sans-versions

accept more version names in file-name-sans-versions

[Dan Nicolaescu]

For a file file.c managed by git doing
C-u C-x v = master RET

will create the buffer file.c.~master~ with the major-mode
fundamental-mode not c-mode.

The reason is that file-name-sans-versions only looks for revision
names matching ".~[0-9.]+~", so .~master~ does not match. 

Any reason not to add a-z to that regexp?

Re: accept more version names in file-name-sans-versions

[Juri Linkov]

> For a file file.c managed by git doing
> C-u C-x v = master RET
>
> will create the buffer file.c.~master~ with the major-mode
> fundamental-mode not c-mode.
>
> The reason is that file-name-sans-versions only looks for revision
> names matching ".~[0-9.]+~", so .~master~ does not match.
>
> Any reason not to add a-z to that regexp?

Then please add also "-" since often the revision name contains it,
e.g. file.c.~multi-tty~ or file.c.~2007-09-20~

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: accept more version names in file-name-sans-versions

[Dan Nicolaescu]

Juri Linkov <juri@jurta.org> writes:

  > > For a file file.c managed by git doing
  > > C-u C-x v = master RET
  > >
  > > will create the buffer file.c.~master~ with the major-mode
  > > fundamental-mode not c-mode.
  > >
  > > The reason is that file-name-sans-versions only looks for revision
  > > names matching ".~[0-9.]+~", so .~master~ does not match.
  > >
  > > Any reason not to add a-z to that regexp?
  > 
  > Then please add also "-" since often the revision name contains it,
  > e.g. file.c.~multi-tty~ or file.c.~2007-09-20~

Good idea, I made the changes on the EMACS_22_BASE branch.

Re: accept more version names in file-name-sans-versions

[Andreas Schwab]

Dan Nicolaescu <dann@ics.uci.edu> writes:

> Juri Linkov <juri@jurta.org> writes:
>
>   > > For a file file.c managed by git doing
>   > > C-u C-x v = master RET
>   > >
>   > > will create the buffer file.c.~master~ with the major-mode
>   > > fundamental-mode not c-mode.
>   > >
>   > > The reason is that file-name-sans-versions only looks for revision
>   > > names matching ".~[0-9.]+~", so .~master~ does not match.
>   > >
>   > > Any reason not to add a-z to that regexp?
>   > 
>   > Then please add also "-" since often the revision name contains it,
>   > e.g. file.c.~multi-tty~ or file.c.~2007-09-20~
>
> Good idea, I made the changes on the EMACS_22_BASE branch.

Now if you are checking out revision EMACS_22_BASE it still does not
work. :-)

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: accept more version names in file-name-sans-versions

[Richard Stallman]

    Now if you are checking out revision EMACS_22_BASE it still does not
    work. :-)

Could you please send me a *precise* test case for this bug?  The test
case should start with `emacs -q', so that your .emacs file does not
affect it, and it should show exactly what text to put in the buffer,
what commands to execute, and how and where to click.  Also please say
exactly what incorrect results you get.

Re: accept more version names in file-name-sans-versions

[Andreas Schwab]

Richard Stallman <rms@gnu.org> writes:

>     Now if you are checking out revision EMACS_22_BASE it still does not
>     work. :-)
>
> Could you please send me a *precise* test case for this bug?

Please look again.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: accept more version names in file-name-sans-versions

[Richard Stallman]

    >     Now if you are checking out revision EMACS_22_BASE it still does not
    >     work. :-)
    >
    > Could you please send me a *precise* test case for this bug?

    Please look again.

All I see is the sentence quoted above.  It says that something still
does not work, but I am not sure WHAT does not work.  Is it the
original bug?  Something else?

(Has this been dealt with?)

Re: accept more version names in file-name-sans-versions

[Andreas Schwab]

Richard Stallman <rms@gnu.org> writes:

>     >     Now if you are checking out revision EMACS_22_BASE it still does not
>     >     work. :-)
>     >
>     > Could you please send me a *precise* test case for this bug?
>
>     Please look again.
>
> All I see is the sentence quoted above.

Did you see the smiley?

> (Has this been dealt with?)

Of course.  Even before I sent the mail.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: accept more version names in file-name-sans-versions

[Richard Stallman]

    Did you see the smiley?

Yes, but I do not understand what it means:

>     >     Now if you are checking out revision EMACS_22_BASE it still does not
>     >     work. :-)

It is so clever and cryptic that I could not understand it.

Re: accept more version names in file-name-sans-versions

[Dan Nicolaescu]

Richard Stallman <rms@gnu.org> writes:

  >     Now if you are checking out revision EMACS_22_BASE it still does not
  >     work. :-)
  > 
  > Could you please send me a *precise* test case for this bug?  The test
  > case should start with `emacs -q', so that your .emacs file does not
  > affect it, and it should show exactly what text to put in the buffer,
  > what commands to execute, and how and where to click.  Also please say
  > exactly what incorrect results you get.

The problem is fixed now on the EMACS_22_BASE branch, it will
propagate to the trunk whenever Miles restarts his merging.

There was a precise description in the original message, it was using
git.  Here's one using CVS:

emacs -q 
C-x C-f emacs/lisp/subr.el RET
C-u C-x v ~ EMACS_22_BASE RET

Before the fix the resulting buffer subr.el.~EMACS_22_BASE~ was not
put in emacs-lisp-mode, but in fundamental-mode.

Re: accept more version names in file-name-sans-versions

[Michaël Cadilhac]

[-- Attachment #1.1: Type: text/plain, Size: 855 bytes --]

Dan Nicolaescu <dann@ics.uci.edu> writes:

> The problem is fixed now on the EMACS_22_BASE branch, it will
> propagate to the trunk whenever Miles restarts his merging.
>
> There was a precise description in the original message, it was using
> git.  Here's one using CVS:
>
> emacs -q 
> C-x C-f emacs/lisp/subr.el RET
> C-u C-x v ~ EMACS_22_BASE RET

BTW, the regexp is :
		     (or (string-match "\\.~[-0-9a-z._]+~\\'" name)

If the user has case-fold-search set to nil, it's risky to not put A-Z
here, nop?

-- 
 |   Michaël `Micha' Cadilhac       |  To be portable,                       |
 |   http://michael.cadilhac.name   |    Just stay on Windows.               |
 |   JID/MSN:                       |                                        |
 `----  michael.cadilhac@gmail.com  |          -- A Microsoft Guy       -  --'

[-- Attachment #1.2: Type: application/pgp-signature, Size: 188 bytes --]

[-- Attachment #2: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: accept more version names in file-name-sans-versions

[Dan Nicolaescu]

michael@cadilhac.name (Michaël Cadilhac) writes:

  > Dan Nicolaescu <dann@ics.uci.edu> writes:
  > 
  > > The problem is fixed now on the EMACS_22_BASE branch, it will
  > > propagate to the trunk whenever Miles restarts his merging.
  > >
  > > There was a precise description in the original message, it was using
  > > git.  Here's one using CVS:
  > >
  > > emacs -q 
  > > C-x C-f emacs/lisp/subr.el RET
  > > C-u C-x v ~ EMACS_22_BASE RET
  > 
  > BTW, the regexp is :
  > 		     (or (string-match "\\.~[-0-9a-z._]+~\\'" name)
  > 
  > If the user has case-fold-search set to nil, it's risky to not put A-Z
  > here, nop?

Thanks, added A-Z too.

Re: accept more version names in file-name-sans-versions

[Stefan Monnier]

> BTW, the regexp is :
> 		     (or (string-match "\\.~[-0-9a-z._]+~\\'" name)

> If the user has case-fold-search set to nil, it's risky to not put A-Z
> here, nop?

Not quite: you want [:alnum:] in place of 0-9a-zA-Z.


        Stefan

Re: accept more version names in file-name-sans-versions

[Stefan Monnier]

> 		     (or (string-match "\\.~[-0-9a-z._]+~\\'" name)

Oh, and: Arch uses @ and Monotone sometimes uses : and # as well.
I think we'd better think the other way around: which chars do we want
to disallow.


        Stefan

Re: accept more version names in file-name-sans-versions

[Dan Nicolaescu]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

  > > 		     (or (string-match "\\.~[-0-9a-z._]+~\\'" name)
  > 
  > Oh, and: Arch uses @ and Monotone sometimes uses : and # as well.

Git can also use ^. I added all these and used :alnum:

  > I think we'd better think the other way around: which chars do we want
  > to disallow.

We can make that change once a decision what to use is made...