Re: Patch naming policy (was: Re: [153574] trunk/dports/sysutils/skey)
Hi, I don't care if we use *.diff or *.patch. Either is fine, but I would prefer if we would stick to one ending and try to be as consistent as we can be. The "patch-" prefix is a bit redundant indeed, but then again I don't care that much. I would be OK with removal, but again I would like to keep it consistent in the future (at least for new commits/changes). But from what I remember the biggest concern was what to put *inbetween* those two. That's probably a more relevant question. Mojca ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: Patch naming policy (was: Re: [153574] trunk/dports/sysutils/skey)
> On 5 Oct 2016, at 2:56 pm, Rainer Müller wrote: > > On 2016-10-05 01:45, Ryan Schmidt wrote: >>> Patches should follow the patch-*.diff naming scheme, so this >>> should be named patch-skeyprune-man8.diff or similar. >>> >>> https://guide.macports.org/#development.patches.source >> >> Popular opinion seems to be that we should relax that restriction. >> >> I think it's reasonable if we change it to "patch-*.diff or >> *.patch". >> >> My primary gripe was with the way patches used to be named >> "patch-foo" or "patch-foo.c" which caused editors to use incorrect >> syntax highlighting. As long as we use a .diff or .patch extension, >> to indicate to a syntax highlighter that this is a diff or patch >> file, that should be fine. > > The initial patch-* policy was adopted from FreeBSD ports. The filename > extension .diff was added later for this reason. > > If we want to change the patch naming policy, should we allow both > *.diff and *.patch or would one file extension be better to avoid > configuring editors twice? My bet is any decent editor, at least those which support software development, would already support both. > > Rainer > ___ > macports-dev mailing list > macports-dev@lists.macosforge.org > https://lists.macosforge.org/mailman/listinfo/macports-dev ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Patch naming policy (was: Re: [153574] trunk/dports/sysutils/skey)
On 2016-10-05 01:45, Ryan Schmidt wrote: >> Patches should follow the patch-*.diff naming scheme, so this >> should be named patch-skeyprune-man8.diff or similar. >> >> https://guide.macports.org/#development.patches.source > > Popular opinion seems to be that we should relax that restriction. > > I think it's reasonable if we change it to "patch-*.diff or > *.patch". > > My primary gripe was with the way patches used to be named > "patch-foo" or "patch-foo.c" which caused editors to use incorrect > syntax highlighting. As long as we use a .diff or .patch extension, > to indicate to a syntax highlighter that this is a diff or patch > file, that should be fine. The initial patch-* policy was adopted from FreeBSD ports. The filename extension .diff was added later for this reason. If we want to change the patch naming policy, should we allow both *.diff and *.patch or would one file extension be better to avoid configuring editors twice? Rainer ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [153574] trunk/dports/sysutils/skey
> On Oct 4, 2016, at 10:33 PM, Lawrence Velázquez wrote:
>
>> On Oct 4, 2016, at 7:45 PM, Ryan Schmidt wrote:
>>
>>> On Oct 4, 2016, at 3:58 PM, Rainer Müller wrote:
>>>
>>> Patches should follow the patch-*.diff naming scheme, so this should be
>>> named patch-skeyprune-man8.diff or similar.
>>
>> Popular opinion seems to be that we should relax that restriction.
>>
>> I think it's reasonable if we change it to "patch-*.diff or *.patch".
>
> "patch-" and ".diff" are effectively synonymous, so I don't see any reason to
> include both in a single patch name, as it's redundant and makes every patch
> name longer. Plain "*.{patch,diff}" should be sufficient.
+1 on both counts.
Cheers!
Frank
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [153574] trunk/dports/sysutils/skey
> On Oct 4, 2016, at 7:45 PM, Ryan Schmidt wrote:
>
>> On Oct 4, 2016, at 3:58 PM, Rainer Müller wrote:
>>
>> Patches should follow the patch-*.diff naming scheme, so this should be
>> named patch-skeyprune-man8.diff or similar.
>
> Popular opinion seems to be that we should relax that restriction.
>
> I think it's reasonable if we change it to "patch-*.diff or *.patch".
"patch-" and ".diff" are effectively synonymous, so I don't see any reason to
include both in a single patch name, as it's redundant and makes every patch
name longer. Plain "*.{patch,diff}" should be sufficient.
vq
Sent from my iPhone
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [153574] trunk/dports/sysutils/skey
> On Oct 4, 2016, at 3:58 PM, Rainer Müller wrote:
>
> On 2016-10-04 22:03, lar...@macports.org wrote:
>> Revision: 153574
>> https://trac.macports.org/changeset/153574
>> Author: lar...@macports.org
>> Date: 2016-10-04 13:03:08 -0700 (Tue, 04 Oct 2016)
>> Log Message:
>> ---
>> skey: Rename patch
>>
>> Modified Paths:
>> --
>>trunk/dports/sysutils/skey/Portfile
>>
>> Added Paths:
>> ---
>>trunk/dports/sysutils/skey/files/install-skeyprune.8.patch
>>
>> Removed Paths:
>> -
>>trunk/dports/sysutils/skey/files/patch-Makefile.in.diff
>>
>> Modified: trunk/dports/sysutils/skey/Portfile
>> ===
>> --- trunk/dports/sysutils/skey/Portfile 2016-10-04 20:00:00 UTC (rev
>> 153573)
>> +++ trunk/dports/sysutils/skey/Portfile 2016-10-04 20:03:08 UTC (rev
>> 153574)
>> @@ -25,6 +25,6 @@
>> sha1d55fb286098900cdf3eb6b174a720a06c722312a \
>> rmd160 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d
>>
>> -patchfiles patch-Makefile.in.diff
>> +patchfiles install-skeyprune.8.patch
>>
>> configure.args --mandir=${prefix}/share/man
>
> Patches should follow the patch-*.diff naming scheme, so this should be
> named patch-skeyprune-man8.diff or similar.
>
> https://guide.macports.org/#development.patches.source
Popular opinion seems to be that we should relax that restriction.
I think it's reasonable if we change it to "patch-*.diff or *.patch".
My primary gripe was with the way patches used to be named "patch-foo" or
"patch-foo.c" which caused editors to use incorrect syntax highlighting. As
long as we use a .diff or .patch extension, to indicate to a syntax highlighter
that this is a diff or patch file, that should be fine.
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [153574] trunk/dports/sysutils/skey
> On Oct 4, 2016, at 7:05 PM, Lawrence Velázquez wrote: > > But that day is not today. https://trac.macports.org/changeset/153579 I meant this, obviously. https://trac.macports.org/changeset/153576 vq ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [153574] trunk/dports/sysutils/skey
> On Oct 4, 2016, at 4:58 PM, Rainer Müller wrote: > > Patches should follow the patch-*.diff naming scheme, so this should be > named patch-skeyprune-man8.diff or similar. > > https://guide.macports.org/#development.patches.source One day I'll get this naming guideline changed, if it's the last thing I do.* But that day is not today. https://trac.macports.org/changeset/153579 vq * figuratively speaking ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [153574] trunk/dports/sysutils/skey
On 2016-10-04 22:03, lar...@macports.org wrote:
> Revision: 153574
> https://trac.macports.org/changeset/153574
> Author: lar...@macports.org
> Date: 2016-10-04 13:03:08 -0700 (Tue, 04 Oct 2016)
> Log Message:
> ---
> skey: Rename patch
>
> Modified Paths:
> --
> trunk/dports/sysutils/skey/Portfile
>
> Added Paths:
> ---
> trunk/dports/sysutils/skey/files/install-skeyprune.8.patch
>
> Removed Paths:
> -
> trunk/dports/sysutils/skey/files/patch-Makefile.in.diff
>
> Modified: trunk/dports/sysutils/skey/Portfile
> ===
> --- trunk/dports/sysutils/skey/Portfile 2016-10-04 20:00:00 UTC (rev
> 153573)
> +++ trunk/dports/sysutils/skey/Portfile 2016-10-04 20:03:08 UTC (rev
> 153574)
> @@ -25,6 +25,6 @@
> sha1d55fb286098900cdf3eb6b174a720a06c722312a \
> rmd160 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d
>
> -patchfiles patch-Makefile.in.diff
> +patchfiles install-skeyprune.8.patch
>
> configure.args --mandir=${prefix}/share/man
Patches should follow the patch-*.diff naming scheme, so this should be
named patch-skeyprune-man8.diff or similar.
https://guide.macports.org/#development.patches.source
Rainer
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
