[PATCH V2] .gitignore: Add vim swap files

[PATCH V2] .gitignore: Add vim swap files

[Julien Grall]

Signed-off-by: Julien Grall <julien.grall@linaro.org>

Changes in v2:
    - update .hgignore
---
 .gitignore |    1 +
 .hgignore  |    1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6753368..960c29e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.orig
 *.rej
 *~
+*.swp
 *.o
 *.d
 *.opic
diff --git a/.hgignore b/.hgignore
index 6b432f7..4bd24fc 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,6 +11,7 @@
 .*\.tar\.bz2$
 .*\.tar\.gz$
 .*~$
+.swp$
 .*\.tmp$
 .*\.flc$
 .*\.orig$
-- 
1.7.10.4

Re: [PATCH V2] .gitignore: Add vim swap files

[Andrew Cooper]

On 09/05/13 17:17, Julien Grall wrote:
> Signed-off-by: Julien Grall <julien.grall@linaro.org>
>
> Changes in v2:
>     - update .hgignore

Much appreciated.

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

> ---
>  .gitignore |    1 +
>  .hgignore  |    1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/.gitignore b/.gitignore
> index 6753368..960c29e 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -2,6 +2,7 @@
>  *.orig
>  *.rej
>  *~
> +*.swp
>  *.o
>  *.d
>  *.opic
> diff --git a/.hgignore b/.hgignore
> index 6b432f7..4bd24fc 100644
> --- a/.hgignore
> +++ b/.hgignore
> @@ -11,6 +11,7 @@
>  .*\.tar\.bz2$
>  .*\.tar\.gz$
>  .*~$
> +.swp$
>  .*\.tmp$
>  .*\.flc$
>  .*\.orig$

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Campbell]

On Thu, 2013-05-09 at 17:17 +0100, Julien Grall wrote:
> Signed-off-by: Julien Grall <julien.grall@linaro.org>
> 
> Changes in v2:
>     - update .hgignore
> ---
>  .gitignore |    1 +
>  .hgignore  |    1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/.gitignore b/.gitignore
> index 6753368..960c29e 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -2,6 +2,7 @@
>  *.orig
>  *.rej
>  *~
> +*.swp
>  *.o
>  *.d
>  *.opic
> diff --git a/.hgignore b/.hgignore
> index 6b432f7..4bd24fc 100644
> --- a/.hgignore
> +++ b/.hgignore
> @@ -11,6 +11,7 @@
>  .*\.tar\.bz2$
>  .*\.tar\.gz$
>  .*~$
> +.swp$

hgignore is a regex, so I think this should be ".*\.swp$"

Ian.

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Campbell]

On Fri, 2013-05-10 at 14:04 +0100, Ian Campbell wrote:
> On Thu, 2013-05-09 at 17:17 +0100, Julien Grall wrote:
> > Signed-off-by: Julien Grall <julien.grall@linaro.org>
> > 
> > Changes in v2:
> >     - update .hgignore
> > ---
> >  .gitignore |    1 +
> >  .hgignore  |    1 +
> >  2 files changed, 2 insertions(+)
> > 
> > diff --git a/.gitignore b/.gitignore
> > index 6753368..960c29e 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -2,6 +2,7 @@
> >  *.orig
> >  *.rej
> >  *~
> > +*.swp
> >  *.o
> >  *.d
> >  *.opic
> > diff --git a/.hgignore b/.hgignore
> > index 6b432f7..4bd24fc 100644
> > --- a/.hgignore
> > +++ b/.hgignore
> > @@ -11,6 +11,7 @@
> >  .*\.tar\.bz2$
> >  .*\.tar\.gz$
> >  .*~$
> > +.swp$
> 
> hgignore is a regex, so I think this should be ".*\.swp$"

Actually, I'll just make this change when I apply...

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Campbell]

On Fri, 2013-05-10 at 14:14 +0100, Ian Campbell wrote:
> On Fri, 2013-05-10 at 14:04 +0100, Ian Campbell wrote:
> > On Thu, 2013-05-09 at 17:17 +0100, Julien Grall wrote:
> > > Signed-off-by: Julien Grall <julien.grall@linaro.org>
> > > 
> > > Changes in v2:
> > >     - update .hgignore
> > > ---
> > >  .gitignore |    1 +
> > >  .hgignore  |    1 +
> > >  2 files changed, 2 insertions(+)
> > > 
> > > diff --git a/.gitignore b/.gitignore
> > > index 6753368..960c29e 100644
> > > --- a/.gitignore
> > > +++ b/.gitignore
> > > @@ -2,6 +2,7 @@
> > >  *.orig
> > >  *.rej
> > >  *~
> > > +*.swp
> > >  *.o
> > >  *.d
> > >  *.opic
> > > diff --git a/.hgignore b/.hgignore
> > > index 6b432f7..4bd24fc 100644
> > > --- a/.hgignore
> > > +++ b/.hgignore
> > > @@ -11,6 +11,7 @@
> > >  .*\.tar\.bz2$
> > >  .*\.tar\.gz$
> > >  .*~$
> > > +.swp$
> > 
> > hgignore is a regex, so I think this should be ".*\.swp$"
> 
> Actually, I'll just make this change when I apply...

Which I have now done...

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Jackson]

Andrew Cooper writes ("Re: [PATCH V2] .gitignore: Add vim swap files"):
> On 09/05/13 17:17, Julien Grall wrote:
> > Signed-off-by: Julien Grall <julien.grall@linaro.org>
> >
> > Changes in v2:
> >     - update .hgignore
> 
> Much appreciated.
> 
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

Nacked-by: Ian Jackson <ian.jackson@eu.citrix.com>

> > diff --git a/.hgignore b/.hgignore
> > index 6b432f7..4bd24fc 100644
> > --- a/.hgignore
> > +++ b/.hgignore
> > @@ -11,6 +11,7 @@
> >  .*\.tar\.bz2$
> >  .*\.tar\.gz$
> >  .*~$
> > +.swp$

AIUI the format of .hgignore files is lines containing
implicitly-^-anchored regexps.

So this is wrong.  Please copy the (hideous) syntax of the other
entries.

Furthermore, while it's good to update both ignore files I think it's
fine to update only one of them if that's what's annoying you.

Ian.

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Campbell]

On Fri, 2013-05-10 at 19:09 +0100, Ian Jackson wrote:
> Andrew Cooper writes ("Re: [PATCH V2] .gitignore: Add vim swap files"):
> > On 09/05/13 17:17, Julien Grall wrote:
> > > diff --git a/.hgignore b/.hgignore
> > > index 6b432f7..4bd24fc 100644
> > > --- a/.hgignore
> > > +++ b/.hgignore
> > > @@ -11,6 +11,7 @@
> > >  .*\.tar\.bz2$
> > >  .*\.tar\.gz$
> > >  .*~$
> > > +.swp$
> 
> AIUI the format of .hgignore files is lines containing
> implicitly-^-anchored regexps.
> 
> So this is wrong.  Please copy the (hideous) syntax of the other
> entries.

If you read the rest of the thread you will find that I noted this and
fixed it as I committed it.

(Does your MUA not do threading?)

Ian.

Re: [PATCH V2] .gitignore: Add vim swap files

[Andrew Cooper]

On 10/05/13 19:09, Ian Jackson wrote:
> Andrew Cooper writes ("Re: [PATCH V2] .gitignore: Add vim swap files"):
>> On 09/05/13 17:17, Julien Grall wrote:
>>> Signed-off-by: Julien Grall <julien.grall@linaro.org>
>>>
>>> Changes in v2:
>>>     - update .hgignore
>> Much appreciated.
>>
>> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Nacked-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
>>> diff --git a/.hgignore b/.hgignore
>>> index 6b432f7..4bd24fc 100644
>>> --- a/.hgignore
>>> +++ b/.hgignore
>>> @@ -11,6 +11,7 @@
>>>  .*\.tar\.bz2$
>>>  .*\.tar\.gz$
>>>  .*~$
>>> +.swp$
> AIUI the format of .hgignore files is lines containing
> implicitly-^-anchored regexps.

Nope - the documentation states otherwise

http://www.selenic.com/mercurial/hgignore.5.html

"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of
the form *.c will match a file ending in .c in any directory, and a
regexp pattern of the form \.c$ will do the same. To root a regexp
pattern, start it with ^."

>
> So this is wrong.  Please copy the (hideous) syntax of the other
> entries.

It is wrong because it failes to escape the literal . (which admittedly
I missed when reviewing it)

Just because the rest of the .hgignore is wrong doesn't mean new
additions shouldn't be.

~Andrew

>
> Furthermore, while it's good to update both ignore files I think it's
> fine to update only one of them if that's what's annoying you.
>
> Ian.

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Campbell]

On Fri, 2013-05-10 at 19:15 +0100, Andrew Cooper wrote:
> On 10/05/13 19:09, Ian Jackson wrote:
> > Andrew Cooper writes ("Re: [PATCH V2] .gitignore: Add vim swap files"):
> >> On 09/05/13 17:17, Julien Grall wrote:
> >>> Signed-off-by: Julien Grall <julien.grall@linaro.org>
> >>>
> >>> Changes in v2:
> >>>     - update .hgignore
> >> Much appreciated.
> >>
> >> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > Nacked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> >
> >>> diff --git a/.hgignore b/.hgignore
> >>> index 6b432f7..4bd24fc 100644
> >>> --- a/.hgignore
> >>> +++ b/.hgignore
> >>> @@ -11,6 +11,7 @@
> >>>  .*\.tar\.bz2$
> >>>  .*\.tar\.gz$
> >>>  .*~$
> >>> +.swp$
> > AIUI the format of .hgignore files is lines containing
> > implicitly-^-anchored regexps.
> 
> Nope - the documentation states otherwise
> 
> http://www.selenic.com/mercurial/hgignore.5.html
> 
> "Neither glob nor regexp patterns are rooted. A glob-syntax pattern of
> the form *.c will match a file ending in .c in any directory, and a
> regexp pattern of the form \.c$ will do the same. To root a regexp
> pattern, start it with ^."
> 
> >
> > So this is wrong.  Please copy the (hideous) syntax of the other
> > entries.
> 
> It is wrong because it failes to escape the literal . (which admittedly
> I missed when reviewing it)
> 
> Just because the rest of the .hgignore is wrong doesn't mean new
> additions shouldn't be.

I don't think anything is wrong with the current .hgignore, where the
precise path matters the entries are explicitly anchored with ^ e.g.
^docs/figs/xenserver\.eps$
^docs/html/.*$
^docs/interface/WARNINGS$
etc

Where only the extension or filename matters but not the path it isn't
anchored, like the examples in the context of the patch.

I fixed this is .*\.swp$ as I committed it, which is consistent with the
existing entries even though the ".*" is technically redundant AFAICT.

Ian.

Re: [PATCH V2] .gitignore: Add vim swap files

[Ian Jackson]

Ian Campbell writes ("Re: [Xen-devel] [PATCH V2] .gitignore: Add vim swap files"):
> If you read the rest of the thread you will find that I noted this and
> fixed it as I committed it.

Yes.

> (Does your MUA not do threading?)

Sometimes it does threading...

Ian.