* bug#8159: file-name-sans-version fails for some git files
@ 2011-03-02 22:31 Reuben Thomas
2011-03-03 3:58 ` Eli Zaretskii
0 siblings, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-02 22:31 UTC (permalink / raw)
To: 8159
filenames like foo.js.~HEAD~1~ aren't handled properly because of the
internal tilde.
This is easily fixable by adding tilde to the character class matched
against (in emacs-23 it's in the source of file-name-sans-version; in
the trunk it's in the more accessible file-name-version-regexp).
It seems to me that git is commonly-enough used that this is probably
worth fixing in the source rather than leaving to users who notice the
problem (especially in emacs-23, where it means redefining
file-name-sans-version).
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-02 22:31 bug#8159: file-name-sans-version fails for some git files Reuben Thomas
@ 2011-03-03 3:58 ` Eli Zaretskii
2011-03-03 12:02 ` Reuben Thomas
0 siblings, 1 reply; 19+ messages in thread
From: Eli Zaretskii @ 2011-03-03 3:58 UTC (permalink / raw)
To: Reuben Thomas; +Cc: 8159
> Date: Wed, 2 Mar 2011 22:31:12 +0000
> From: Reuben Thomas <rrt@sc3d.org>
> Cc:
>
> filenames like foo.js.~HEAD~1~ aren't handled properly because of the
> internal tilde.
What would be the "proper" handling of such a file name? What is the
"version" here?
> This is easily fixable by adding tilde to the character class matched
> against (in emacs-23 it's in the source of file-name-sans-version; in
> the trunk it's in the more accessible file-name-version-regexp).
>
> It seems to me that git is commonly-enough used that this is probably
> worth fixing in the source rather than leaving to users who notice the
> problem (especially in emacs-23, where it means redefining
> file-name-sans-version).
file-name-sans-versions is used by Emacs to produce backup file
names. The file name you mention is not in the format of backup file
names that Emacs uses. Extending file-name-sans-versions in the way
you suggest is not enough; we need also extend the format of backup
file names to support this. Otherwise, removing the "version", then
adding another one will not produce a file name in this format.
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 3:58 ` Eli Zaretskii
@ 2011-03-03 12:02 ` Reuben Thomas
2011-03-03 13:36 ` Eli Zaretskii
0 siblings, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 12:02 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 8159
On 3 March 2011 03:58, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Wed, 2 Mar 2011 22:31:12 +0000
>> From: Reuben Thomas <rrt@sc3d.org>
>> Cc:
>>
>> filenames like foo.js.~HEAD~1~ aren't handled properly because of the
>> internal tilde.
>
> What would be the "proper" handling of such a file name? What is the
> "version" here?
The version is HEAD~1, so the only difference from supported version
formats is the internal tilde.
I can't see (yet) how this doesn't work with backup file names. In
particular, it can't be mistaken for a numbered backup file, since it
doesn't end `.~%d~'; on the other hand, both the simple backup suffix
~ and numeric backups suffix `.~%d~' are still correctly stripped by
my modified file-name-sans-versions.
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 12:02 ` Reuben Thomas
@ 2011-03-03 13:36 ` Eli Zaretskii
2011-03-03 13:39 ` Reuben Thomas
2011-03-03 14:33 ` Andreas Schwab
0 siblings, 2 replies; 19+ messages in thread
From: Eli Zaretskii @ 2011-03-03 13:36 UTC (permalink / raw)
To: Reuben Thomas; +Cc: 8159
> Date: Thu, 3 Mar 2011 12:02:53 +0000
> From: Reuben Thomas <rrt@sc3d.org>
> Cc: 8159@debbugs.gnu.org
>
> On 3 March 2011 03:58, Eli Zaretskii <eliz@gnu.org> wrote:
> >> Date: Wed, 2 Mar 2011 22:31:12 +0000
> >> From: Reuben Thomas <rrt@sc3d.org>
> >> Cc:
> >>
> >> filenames like foo.js.~HEAD~1~ aren't handled properly because of the
> >> internal tilde.
> >
> > What would be the "proper" handling of such a file name? What is the
> > "version" here?
>
> The version is HEAD~1, so the only difference from supported version
> formats is the internal tilde.
If you don't want the version to be "~1~", then I guess this is okay.
It wasn't clear from your original message that you don't consider
this form a numbered backup file.
> I can't see (yet) how this doesn't work with backup file names. In
> particular, it can't be mistaken for a numbered backup file, since it
> doesn't end `.~%d~'; on the other hand, both the simple backup suffix
> ~ and numeric backups suffix `.~%d~' are still correctly stripped by
> my modified file-name-sans-versions.
If you are okay with having foo.js~ as a simple backup file name of
foo.js.~HEAD~1~ and foo.js.~3~ as its numbered backup, then I see no
issues here. I just wonder if that would surprise git users (I don't
use it too much, so I don't know).
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 13:36 ` Eli Zaretskii
@ 2011-03-03 13:39 ` Reuben Thomas
2011-03-03 13:57 ` Eli Zaretskii
2011-03-03 14:33 ` Andreas Schwab
1 sibling, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 13:39 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 8159
On 3 March 2011 13:36, Eli Zaretskii <eliz@gnu.org> wrote:
>
> If you are okay with having foo.js~ as a simple backup file name of
> foo.js.~HEAD~1~ and foo.js.~3~ as its numbered backup, then I see no
> issues here. I just wonder if that would surprise git users (I don't
> use it too much, so I don't know).
Why would you have a backup of such a file? It's a file visited with
vc-revision-other-window, which is by default read-only.
The question arises equally for other VC systems, it's just that not
all of them allow version numbers that contain tildes.
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 13:39 ` Reuben Thomas
@ 2011-03-03 13:57 ` Eli Zaretskii
2011-03-03 14:00 ` Reuben Thomas
2011-03-03 15:09 ` Andreas Schwab
0 siblings, 2 replies; 19+ messages in thread
From: Eli Zaretskii @ 2011-03-03 13:57 UTC (permalink / raw)
To: Reuben Thomas; +Cc: 8159
> Date: Thu, 3 Mar 2011 13:39:32 +0000
> From: Reuben Thomas <rrt@sc3d.org>
> Cc: 8159@debbugs.gnu.org
>
> On 3 March 2011 13:36, Eli Zaretskii <eliz@gnu.org> wrote:
> >
> > If you are okay with having foo.js~ as a simple backup file name of
> > foo.js.~HEAD~1~ and foo.js.~3~ as its numbered backup, then I see no
> > issues here. I just wonder if that would surprise git users (I don't
> > use it too much, so I don't know).
>
> Why would you have a backup of such a file?
Because vc-make-backup-files is set non-nil?
> It's a file visited with
> vc-revision-other-window, which is by default read-only.
Is that the only way to visit files with such names?
Anyway, your change is not limited to this particular situation, it is
more general. It will affect any file of that form, anywhere.
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 13:57 ` Eli Zaretskii
@ 2011-03-03 14:00 ` Reuben Thomas
2011-03-03 15:09 ` Andreas Schwab
1 sibling, 0 replies; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 14:00 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 8159
On 3 March 2011 13:57, Eli Zaretskii <eliz@gnu.org> wrote:
> Anyway, your change is not limited to this particular situation, it is
> more general. It will affect any file of that form, anywhere.
Sure. What I am trying to understand is why this change should be any
more of a problem than the currently-accepted suffixes for VC systems.
You said earlier:
> If you are okay with having foo.js~ as a simple backup file name of
> foo.js.~HEAD~1~ and foo.js.~3~ as its numbered backup,
> then I see no issues here
Indeed, I don't have a problem with this; I was just trying to point
out that because of the way these suffixes normally arise, they rarely
have backups.
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 13:36 ` Eli Zaretskii
2011-03-03 13:39 ` Reuben Thomas
@ 2011-03-03 14:33 ` Andreas Schwab
2011-03-03 14:35 ` Reuben Thomas
1 sibling, 1 reply; 19+ messages in thread
From: Andreas Schwab @ 2011-03-03 14:33 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 8159, Reuben Thomas
Eli Zaretskii <eliz@gnu.org> writes:
>> Date: Thu, 3 Mar 2011 12:02:53 +0000
>> From: Reuben Thomas <rrt@sc3d.org>
>> Cc: 8159@debbugs.gnu.org
>>
>> On 3 March 2011 03:58, Eli Zaretskii <eliz@gnu.org> wrote:
>> >> Date: Wed, 2 Mar 2011 22:31:12 +0000
>> >> From: Reuben Thomas <rrt@sc3d.org>
>> >> Cc:
>> >>
>> >> filenames like foo.js.~HEAD~1~ aren't handled properly because of the
>> >> internal tilde.
>> >
>> > What would be the "proper" handling of such a file name? What is the
>> > "version" here?
>>
>> The version is HEAD~1, so the only difference from supported version
>> formats is the internal tilde.
>
> If you don't want the version to be "~1~", then I guess this is okay.
It cannot be the version because it lacks the period.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 14:33 ` Andreas Schwab
@ 2011-03-03 14:35 ` Reuben Thomas
2011-03-03 14:45 ` Andreas Schwab
0 siblings, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 14:35 UTC (permalink / raw)
To: Andreas Schwab; +Cc: 8159
On 3 March 2011 14:33, Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> It cannot be the version because it lacks the period.
I think you're confusing two things: the VC version and the backup
version. Eli was talking (if I understood correctly) about the VC
version (which could be ~1~, e.g. in Subversion).
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 14:35 ` Reuben Thomas
@ 2011-03-03 14:45 ` Andreas Schwab
2011-03-03 14:53 ` Reuben Thomas
0 siblings, 1 reply; 19+ messages in thread
From: Andreas Schwab @ 2011-03-03 14:45 UTC (permalink / raw)
To: Reuben Thomas; +Cc: 8159
Reuben Thomas <rrt@sc3d.org> writes:
> On 3 March 2011 14:33, Andreas Schwab <schwab@linux-m68k.org> wrote:
>>
>> It cannot be the version because it lacks the period.
>
> I think you're confusing two things: the VC version and the backup
> version. Eli was talking (if I understood correctly) about the VC
> version (which could be ~1~, e.g. in Subversion).
No, it would be ".~1~". A version suffix will always start with a
period.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 14:45 ` Andreas Schwab
@ 2011-03-03 14:53 ` Reuben Thomas
0 siblings, 0 replies; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 14:53 UTC (permalink / raw)
To: Andreas Schwab; +Cc: 8159
On 3 March 2011 14:45, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Reuben Thomas <rrt@sc3d.org> writes:
>
>> On 3 March 2011 14:33, Andreas Schwab <schwab@linux-m68k.org> wrote:
>>>
>>> It cannot be the version because it lacks the period.
>>
>> I think you're confusing two things: the VC version and the backup
>> version. Eli was talking (if I understood correctly) about the VC
>> version (which could be ~1~, e.g. in Subversion).
>
> No, it would be ".~1~". A version suffix will always start with a
> period.
Sorry, I see what you mean, and that's why it's not ambiguous.
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 13:57 ` Eli Zaretskii
2011-03-03 14:00 ` Reuben Thomas
@ 2011-03-03 15:09 ` Andreas Schwab
2011-03-03 15:26 ` Reuben Thomas
1 sibling, 1 reply; 19+ messages in thread
From: Andreas Schwab @ 2011-03-03 15:09 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 8159, Reuben Thomas
Eli Zaretskii <eliz@gnu.org> writes:
> Anyway, your change is not limited to this particular situation, it is
> more general. It will affect any file of that form, anywhere.
file-name-version-regexp is already very general. But one problem is
that by adding ~ it would match backups of backups.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 15:09 ` Andreas Schwab
@ 2011-03-03 15:26 ` Reuben Thomas
2011-03-03 16:23 ` Andreas Schwab
0 siblings, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 15:26 UTC (permalink / raw)
To: Andreas Schwab; +Cc: 8159
On 3 March 2011 15:09, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Eli Zaretskii <eliz@gnu.org> writes:
>
>> Anyway, your change is not limited to this particular situation, it is
>> more general. It will affect any file of that form, anywhere.
>
> file-name-version-regexp is already very general. But one problem is
> that by adding ~ it would match backups of backups.
To be precise, it would match non-numbered backups of non-numbered
backups of non-numbered backups, and non-numbered backups of numbered
backups: the current pattern requires either a single ~, or two tildes
with at least one other character between them.
To fix this would require specifying that an internal tilde is
preceded and followed by at least one character from the rest of the
character class [-[:alnum:]:#@^._] (or, if you just want to cope with
git notation, then preceded by one such character, and followed by a
digit), i.e. something like
\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\([-[:alnum:]:#@^._~]*[-[:alnum:]:#@^._]+\\)?~\\)
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 15:26 ` Reuben Thomas
@ 2011-03-03 16:23 ` Andreas Schwab
2011-03-03 22:58 ` Reuben Thomas
0 siblings, 1 reply; 19+ messages in thread
From: Andreas Schwab @ 2011-03-03 16:23 UTC (permalink / raw)
To: Reuben Thomas; +Cc: 8159
Reuben Thomas <rrt@sc3d.org> writes:
> \\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\([-[:alnum:]:#@^._~]*[-[:alnum:]:#@^._]+\\)?~\\)
That still matches ".~1~.~2~".
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 16:23 ` Andreas Schwab
@ 2011-03-03 22:58 ` Reuben Thomas
2011-03-04 7:55 ` Eli Zaretskii
0 siblings, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-03 22:58 UTC (permalink / raw)
To: Andreas Schwab; +Cc: 8159
On 3 March 2011 16:23, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Reuben Thomas <rrt@sc3d.org> writes:
>
>> \\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\([-[:alnum:]:#@^._~]*[-[:alnum:]:#@^._]+\\)?~\\)
>
> That still matches ".~1~.~2~".
\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)
would cope with just the git version scheme, while not swallowing
multiple backup suffixes.
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-03 22:58 ` Reuben Thomas
@ 2011-03-04 7:55 ` Eli Zaretskii
2011-03-05 16:42 ` Reuben Thomas
0 siblings, 1 reply; 19+ messages in thread
From: Eli Zaretskii @ 2011-03-04 7:55 UTC (permalink / raw)
To: Reuben Thomas; +Cc: schwab, 8159
> Date: Thu, 3 Mar 2011 22:58:14 +0000
> From: Reuben Thomas <rrt@sc3d.org>
> Cc: 8159@debbugs.gnu.org
>
> \\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)
>
> would cope with just the git version scheme, while not swallowing
> multiple backup suffixes.
I would suggest a comment mentioning the git case with an example.
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-04 7:55 ` Eli Zaretskii
@ 2011-03-05 16:42 ` Reuben Thomas
2011-03-05 17:00 ` Eli Zaretskii
0 siblings, 1 reply; 19+ messages in thread
From: Reuben Thomas @ 2011-03-05 16:42 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: schwab, 8159
On 4 March 2011 07:55, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Thu, 3 Mar 2011 22:58:14 +0000
>> From: Reuben Thomas <rrt@sc3d.org>
>> Cc: 8159@debbugs.gnu.org
>>
>> \\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)
>>
>> would cope with just the git version scheme, while not swallowing
>> multiple backup suffixes.
>
> I would suggest a comment mentioning the git case with an example.
So, something like:
(defvar file-name-version-regexp
"\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)"
;; The optional ~[[:digit]]+ matches relative versions in git like `HEAD~2'
"Regular expression matching the backup/version part of a file name.
Used by `file-name-sans-versions'.")
?
--
http://rrt.sc3d.org
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-05 16:42 ` Reuben Thomas
@ 2011-03-05 17:00 ` Eli Zaretskii
2011-03-05 20:36 ` Chong Yidong
0 siblings, 1 reply; 19+ messages in thread
From: Eli Zaretskii @ 2011-03-05 17:00 UTC (permalink / raw)
To: Reuben Thomas; +Cc: schwab, 8159
> Date: Sat, 5 Mar 2011 16:42:40 +0000
> From: Reuben Thomas <rrt@sc3d.org>
> Cc: schwab@linux-m68k.org, 8159@debbugs.gnu.org
>
> >> \\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)
> >>
> >> would cope with just the git version scheme, while not swallowing
> >> multiple backup suffixes.
> >
> > I would suggest a comment mentioning the git case with an example.
>
> So, something like:
>
> (defvar file-name-version-regexp
> "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)"
> ;; The optional ~[[:digit]]+ matches relative versions in git like `HEAD~2'
> "Regular expression matching the backup/version part of a file name.
> Used by `file-name-sans-versions'.")
>
> ?
Yes, that's fine. Thanks.
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#8159: file-name-sans-version fails for some git files
2011-03-05 17:00 ` Eli Zaretskii
@ 2011-03-05 20:36 ` Chong Yidong
0 siblings, 0 replies; 19+ messages in thread
From: Chong Yidong @ 2011-03-05 20:36 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: schwab, 8159, Reuben Thomas
Eli Zaretskii <eliz@gnu.org> writes:
>> So, something like:
>>
>> (defvar file-name-version-regexp
>> "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(~[[:digit:]]+\\)?~\\)"
>> ;; The optional ~[[:digit]]+ matches relative versions in git like `HEAD~2'
>> "Regular expression matching the backup/version part of a file name.
>> Used by `file-name-sans-versions'.")
>
> Yes, that's fine. Thanks.
Committed to trunk.
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2011-03-05 20:36 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-02 22:31 bug#8159: file-name-sans-version fails for some git files Reuben Thomas
2011-03-03 3:58 ` Eli Zaretskii
2011-03-03 12:02 ` Reuben Thomas
2011-03-03 13:36 ` Eli Zaretskii
2011-03-03 13:39 ` Reuben Thomas
2011-03-03 13:57 ` Eli Zaretskii
2011-03-03 14:00 ` Reuben Thomas
2011-03-03 15:09 ` Andreas Schwab
2011-03-03 15:26 ` Reuben Thomas
2011-03-03 16:23 ` Andreas Schwab
2011-03-03 22:58 ` Reuben Thomas
2011-03-04 7:55 ` Eli Zaretskii
2011-03-05 16:42 ` Reuben Thomas
2011-03-05 17:00 ` Eli Zaretskii
2011-03-05 20:36 ` Chong Yidong
2011-03-03 14:33 ` Andreas Schwab
2011-03-03 14:35 ` Reuben Thomas
2011-03-03 14:45 ` Andreas Schwab
2011-03-03 14:53 ` Reuben Thomas
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).