Re: Survey: How do you commit?

2016-01-02 Thread Takeshi Enomoto
Dear Ryan,

> Using a Subversion working copy and "svn commit”?

I use subversion.

I use git for other projects, but I used to use subversion at work.
I don’t have any problems with subversion.
I think subversion is suited for centralized repositories.

Regards,

Takeshi

-
Takeshi Enomoto
take...@macports.org

___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Joshua Root
On 2016-1-3 07:38 , Ryan Schmidt wrote:
> 
> On Jan 2, 2016, at 6:22 AM, Joshua Root wrote:
> 
>> Works pretty well for the most part. Would be nice if it had commit
>> shelving .
> 
> The closest feature that exists is the changelist: 
> http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.changelist.html

While that's certainly useful in some situations, it doesn't help for
the use case I have in mind. Suppose you're working on some relatively
lengthy changes to a file, when you spot an unrelated bug that can
easily be fixed with a small change. The unrelated bugfix should be in
its own changeset, so the ideal workflow here is to shelve the partially
completed changes, fix the bug, commit, then unshelve and continue working.

You can emulate this in various ways of course, and I do when needed, it
would just be nice if it was built in.

- Josh
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: [144013] trunk/dports/gis/qlandkartegt/Portfile

2016-01-02 Thread Ryan Schmidt

> On Dec 29, 2015, at 8:43 PM, khindenb...@macports.org wrote:
> 
> Revision
> 144013
> Author
> khindenb...@macports.org
> Date
> 2015-12-29 18:43:19 -0800 (Tue, 29 Dec 2015)
> Log Message
> 
> qlandkartegt: add qt4 portgroup, enable cmake.out_of_source build maintainer 
> #49432

> Modified: trunk/dports/gis/qlandkartegt/Portfile (144012 => 144013)

> @@ -33,9 +35,11 @@
>  
>  patchfiles   patch-src-main.cpp.diff
>  
> +cmake.out_of_source yes
> +
>  destroot {
>  xinstall -d ${destroot}${applications_dir}
> -copy "${worksrcpath}/bin/QLandkarte GT.app" 
> ${destroot}${applications_dir}
> +copy "${workpath}/build/bin/QLandkarte GT.app" 
> ${destroot}${applications_dir}
>  }

You probably should not assume that the build directory is ${workpath}/build. 
That's an implementation detail of the cmake portgroup. You should use the 
${destroot.dir} variable instead.

There's also no need here to create ${destroot}${applications_dir}. MacPorts 
creates this and other standard directories for you automatically before the 
destroot phase runs.

___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: [144027] trunk/dports/lang/py-htmldocs/Portfile

2016-01-02 Thread Eric A. Borisch
There's a later commit that added dist_subdir for those versions that
have been stealth-updated...

On Sat, Jan 2, 2016 at 11:05 AM, Ryan Schmidt  wrote:
>
>> On Dec 30, 2015, at 12:10 AM, ebori...@macports.org wrote:
>>
>> Revision
>> 144027
>> Author
>> ebori...@macports.org
>> Date
>> 2015-12-29 22:10:10 -0800 (Tue, 29 Dec 2015)
>> Log Message
>>
>> py-htmldocs: Update (again?) checksum for py35-htmldocs. Moved revision 
>> numbers into by-subport for bumping when checksums change. See #50172.
>> Modified Paths
>>
>>   • trunk/dports/lang/py-htmldocs/Portfile
>> Diff
>>
>> Modified: trunk/dports/lang/py-htmldocs/Portfile (144026 => 144027)
>>
>> --- trunk/dports/lang/py-htmldocs/Portfile2015-12-30 05:55:28 UTC (rev 
>> 144026)
>> +++ trunk/dports/lang/py-htmldocs/Portfile2015-12-30 06:10:10 UTC (rev 
>> 144027)
>> @@ -47,45 +47,52 @@
>>  notes   ${long_description}
>>
>>  if {${python.version} == 26} {
>> +  revision  1
>>checksums \
>>  rmd160  a7bd375ac3a62249529da805693c3b15510ff976 \
>>  sha256  
>> f3faa71f4b0cc8fa2bb6c5624233ae79983a2d5c11195fb2089668c60ceb7f1f
>>  }
>>
>>  if {${python.version} == 27} {
>> +  revision  2
>>checksums \
>>  rmd160  5962cd9d48d5678a832cfef7a693ffcadb66d55e \
>>  sha256  
>> a6b61188de5e26295533a619f0e89dd180c6b4385d27e3239581de8aa1d4ceaf
>>  }
>>
>>  if {${python.version} == 31} {
>> +  revision  1
>>checksums \
>>  rmd160  29717979d6a8b4e970a4747e101259da3e3890c1 \
>>  sha256  
>> ff327cfaa1219d8d82fcb4f3bae3ec4ce28567982a49784004130521d282faa0
>>  }
>>
>>  if {${python.version} == 32} {
>> +  revision  1
>>checksums \
>>  rmd160  039539fc90454d35525c8b9478156f7135b86622 \
>>  sha256  
>> b746ef40a29abe7949e5f183e236a0734c58b841c0600043160a518390704c13
>>  }
>>
>>  if {${python.version} == 33} {
>> +  revision  1
>>checksums \
>>  rmd160  84290bfaea54b943025f7088268f256d4a50cf71 \
>>  sha256  
>> 54da33f8a91be819e7ac22fdc88c5125bdd4c67494f52dd79d6b603572c41fb0
>>  }
>>
>>  if {${python.version} == 34} {
>> +  revision  1
>>checksums \
>>  rmd160  3cfdc8682fee199be83163026aa2a387f36e14af \
>>  sha256  
>> 62690cf2d6781cf761aa4ae3c81b8a794700f6b61e4cef0cadbcf4f96a5b7da1
>>  }
>>
>>  if {${python.version} == 35} {
>> +  revision  2
>>checksums \
>> -rmd160  dc49af77633fbb4c4766cd313f1609295d5a0438 \
>> -sha256  
>> 1bf4aa73555eb1c38504ab4ef8368c15d6e026b0669d477f7e7d3db8edfae75b
>> +rmd160  708cb554c1b80bcf795f89936ca9bdac11abffb5 \
>> +sha256  
>> ad75e90b950c6abfae550680576ad8ffa48d8ef579fcb98687037590c7576d98
>>  }
>
> Stealth updates need to be handled per this recipe:
>
> https://trac.macports.org/wiki/PortfileRecipes#stealth-updates
>
> py-htmldocs is not handling the dist_subdir correctly.
>
>
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Ryan Schmidt

On Jan 2, 2016, at 6:22 AM, Joshua Root wrote:

> Works pretty well for the most part. Would be nice if it had commit
> shelving .

The closest feature that exists is the changelist: 
http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.changelist.html

___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Adam Mercer
On Fri, Jan 1, 2016 at 11:43 PM, Ryan Schmidt  wrote:
> Quick survey for committers:
>
> How do you commit to the MacPorts Subversion repository?
>
> Using a Subversion working copy and "svn commit"?
> Using a Git clone and git-svn?

This is the one I use, in fact this is the way I commit to most of the
SVN repositories I use.

> Some other method?
>
> Do you have any complaints about that method or are you happy with it?

Generally happy with it.

Cheers

Adam
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Mojca Miklavec
On 2 January 2016 at 13:22, Joshua Root wrote:
> On 2016-1-2 16:43 , Ryan Schmidt wrote:
>
>> Do you have any complaints about that method or are you happy with it?
>
> Works pretty well for the most part. Would be nice if it had commit
> shelving .

I sometimes miss that too. I'm not sure if I would actually use this
particular feature, but I indeed often end up checking out multiple
(sparse) SVN trees when I have to commit changes in multiple ports at
once (I have lots of local testing/unfinished changes in the "main"
checkout). But my workaround is not too bad.

Mojca
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Kurt Hindenburg

> On Jan 2, 2016, at 12:43 AM, Ryan Schmidt  wrote:
> 
> Quick survey for committers:
> 
> How do you commit to the MacPorts Subversion repository?
> 
> Using a Subversion working copy and "svn commit”?

This one

> Using a Git clone and git-svn?

I should have setup this up when I started as I know git the best.

> Some other method?
> 
> Do you have any complaints about that method or are you happy with it?

It is subversion so that’s that. I haven’t heard of anyone mentioning 
converting to git.  I’m not sure if there’s any great benefits for this project 
although I would prefer git.

Kurt

> 
> 
> ___
> 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


Re: [144027] trunk/dports/lang/py-htmldocs/Portfile

2016-01-02 Thread Ryan Schmidt

> On Dec 30, 2015, at 12:10 AM, ebori...@macports.org wrote:
> 
> Revision
> 144027
> Author
> ebori...@macports.org
> Date
> 2015-12-29 22:10:10 -0800 (Tue, 29 Dec 2015)
> Log Message
> 
> py-htmldocs: Update (again?) checksum for py35-htmldocs. Moved revision 
> numbers into by-subport for bumping when checksums change. See #50172.
> Modified Paths
> 
>   • trunk/dports/lang/py-htmldocs/Portfile
> Diff
> 
> Modified: trunk/dports/lang/py-htmldocs/Portfile (144026 => 144027)
> 
> --- trunk/dports/lang/py-htmldocs/Portfile2015-12-30 05:55:28 UTC (rev 
> 144026)
> +++ trunk/dports/lang/py-htmldocs/Portfile2015-12-30 06:10:10 UTC (rev 
> 144027)
> @@ -47,45 +47,52 @@
>  notes   ${long_description}
>  
>  if {${python.version} == 26} {
> +  revision  1
>checksums \
>  rmd160  a7bd375ac3a62249529da805693c3b15510ff976 \
>  sha256  
> f3faa71f4b0cc8fa2bb6c5624233ae79983a2d5c11195fb2089668c60ceb7f1f
>  }
>  
>  if {${python.version} == 27} {
> +  revision  2
>checksums \
>  rmd160  5962cd9d48d5678a832cfef7a693ffcadb66d55e \
>  sha256  
> a6b61188de5e26295533a619f0e89dd180c6b4385d27e3239581de8aa1d4ceaf
>  }
>  
>  if {${python.version} == 31} {
> +  revision  1
>checksums \
>  rmd160  29717979d6a8b4e970a4747e101259da3e3890c1 \
>  sha256  
> ff327cfaa1219d8d82fcb4f3bae3ec4ce28567982a49784004130521d282faa0
>  }
>  
>  if {${python.version} == 32} {
> +  revision  1
>checksums \
>  rmd160  039539fc90454d35525c8b9478156f7135b86622 \
>  sha256  
> b746ef40a29abe7949e5f183e236a0734c58b841c0600043160a518390704c13
>  }
>  
>  if {${python.version} == 33} {
> +  revision  1
>checksums \
>  rmd160  84290bfaea54b943025f7088268f256d4a50cf71 \
>  sha256  
> 54da33f8a91be819e7ac22fdc88c5125bdd4c67494f52dd79d6b603572c41fb0
>  }
>  
>  if {${python.version} == 34} {
> +  revision  1
>checksums \
>  rmd160  3cfdc8682fee199be83163026aa2a387f36e14af \
>  sha256  
> 62690cf2d6781cf761aa4ae3c81b8a794700f6b61e4cef0cadbcf4f96a5b7da1
>  }
>  
>  if {${python.version} == 35} {
> +  revision  2
>checksums \
> -rmd160  dc49af77633fbb4c4766cd313f1609295d5a0438 \
> -sha256  
> 1bf4aa73555eb1c38504ab4ef8368c15d6e026b0669d477f7e7d3db8edfae75b
> +rmd160  708cb554c1b80bcf795f89936ca9bdac11abffb5 \
> +sha256  
> ad75e90b950c6abfae550680576ad8ffa48d8ef579fcb98687037590c7576d98
>  }

Stealth updates need to be handled per this recipe:

https://trac.macports.org/wiki/PortfileRecipes#stealth-updates

py-htmldocs is not handling the dist_subdir correctly.


___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Blair Zajac

> On Jan 2, 2016, at 12:43 AM, Ryan Schmidt  wrote:
> 
> Quick survey for committers:
> 
> How do you commit to the MacPorts Subversion repository?
> 
> Using a Subversion working copy and "svn commit”?

This one.

> Using a Git clone and git-svn?
> Some other method?
> 
> Do you have any complaints about that method or are you happy with it?

I use rsync to get ports so when I make a change, I delete the directory and do 
an ‘svn co’ in place, which is a little annoying.

Blair
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Wahlstedt Jyrki

> On 2.1.2016, at 7.43, Ryan Schmidt  wrote:
> 
> Quick survey for committers:
> 
> How do you commit to the MacPorts Subversion repository?
> 
> Using a Subversion working copy and "svn commit”?
This one

> Using a Git clone and git-svn?
> Some other method?
> 
> Do you have any complaints about that method or are you happy with it?

No…

!
! Jyrki

___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Craig Treleaven
> On Jan 2, 2016, at 12:43 AM, Ryan Schmidt  wrote:
> 
> Quick survey for committers:
> 
> How do you commit to the MacPorts Subversion repository?
> 
> Using a Subversion working copy and "svn commit”?

Yes

> Using a Git clone and git-svn?
> Some other method?
> 
> Do you have any complaints about that method or are you happy with it?

No.

Craig
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Mojca Miklavec
On 2 January 2016 at 06:43, Ryan Schmidt wrote:
> Quick survey for committers:
>
> How do you commit to the MacPorts Subversion repository?
>
> Using a Subversion working copy and "svn commit"?
> Using a Git clone and git-svn?
> Some other method?

I use a sparse subversion checkout and "svn commit".

> Do you have any complaints about that method or are you happy with it?

I'm perfectly happy with it now that I have commit rights (and SVN is
easier in many aspects), but before I had commit rights, it was a bit
of a pain.

Mojca

PS: I often use git for certain ports where changes are nontrivial and
cannot be committed right away. In those cases managing patches with
git can be very helpful. (Git would also helpful in managing patches
that get uploaded to trac, but get outdated as time passes by, while
pull requests could still work out of the box in many cases.)
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev


Re: Survey: How do you commit?

2016-01-02 Thread Joshua Root
On 2016-1-2 16:43 , Ryan Schmidt wrote:
> Quick survey for committers:
> 
> How do you commit to the MacPorts Subversion repository?
> 
> Using a Subversion working copy and "svn commit"?

This.

> Do you have any complaints about that method or are you happy with it?

Works pretty well for the most part. Would be nice if it had commit
shelving .

- Josh
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev