You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Nicolas PAYART <pa...@benchmark.fr> on 2008/06/12 10:04:48 UTC
[PATCH] Adding option --config-dir to svnmerge
[[[
Add option --config-dir to svnmerge. Allow defining custom config directory
for svn commands launch by svnmerge.
* contrib/client-side/svnmerge/svnmerge.py
(launchsvn, global_opts): Add option --config-dir to svnmerge python script.
]]]
Index: contrib/client-side/svnmerge/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge/svnmerge.py (revision 31709)
+++ contrib/client-side/svnmerge/svnmerge.py (working copy)
@@ -305,6 +305,7 @@
"""Launch SVN and grab its output."""
username = opts.get("username", None)
password = opts.get("password", None)
+ configdir = opts.get("config-dir", None)
if username:
username = " --username=" + username
else:
@@ -313,7 +314,11 @@
password = " --password=" + password
else:
password = ""
- cmd = opts["svn"] + " --non-interactive" + username + password + " " +
s
+ if configdir:
+ configdir = " --config-dir=" + configdir
+ else:
+ configdir = ""
+ cmd = opts["svn"] + " --non-interactive" + username + password +
configdir + " " + s
if show or opts["verbose"] >= 2:
print cmd
if pretend:
@@ -1868,6 +1873,9 @@
OptionArg("-p", "--password",
default=None,
help="invoke subversion commands with the supplied
password"),
+ OptionArg("-c", "--config-dir",
+ default=None,
+ help="config file in this directory"),
]
common_opts = [
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by Blair Zajac <bl...@orcaware.com>.
Thanks. In the future, more complicated patches are vetted on the svnmerge
list, and it's probably better to send them there to have a committer see them.
If they go to the svn dev list, they may be missed if the patch is a
substantial one.
Regards,
Blair
Nicolas PAYART wrote:
> Ok I sent the patch to the proper list.
>
> Thanks,
> Nicolas Payart
>
> ----- Original Message ----- From: "Daniel Shahaf"
> <d....@daniel.shahaf.co.il>
> To: "Senthil Kumaran S" <se...@collab.net>
> Cc: "Nicolas PAYART" <pa...@benchmark.fr>; <de...@subversion.tigris.org>
> Sent: Friday, June 13, 2008 2:06 PM
> Subject: Re: [PATCH] Adding option --config-dir to svnmerge
>
>
>> Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
>>> Hi Daniel,
>>>
>>> Daniel Shahaf wrote:
>>> > Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
>>> > > [[[
>>> > > Add option --config-dir to svnmerge. Allow defining custom config
>>> > > directory
>>> > > for svn commands launch by svnmerge.
>>> > >
>>> > > * contrib/client-side/svnmerge/svnmerge.py
>>> > > (launchsvn, global_opts): Add option --config-dir to svnmerge python
>>> > > script.
>>> > > ]]]
>>> > >
>>> >
>>> > Thanks for the patch, but it's the wrong list; try
>>> >
>>> http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
>>>
>>>
>>> We still have svnmerge.py here
>>> http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/
>>> - doesn't
>>> that mean this patch applies?
>>>
>>
>> Its sources live in our repository, but it is a separate project that has
>> its own developers' mailing list.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by Nicolas PAYART <pa...@benchmark.fr>.
Ok I sent the patch to the proper list.
Thanks,
Nicolas Payart
----- Original Message -----
From: "Daniel Shahaf" <d....@daniel.shahaf.co.il>
To: "Senthil Kumaran S" <se...@collab.net>
Cc: "Nicolas PAYART" <pa...@benchmark.fr>; <de...@subversion.tigris.org>
Sent: Friday, June 13, 2008 2:06 PM
Subject: Re: [PATCH] Adding option --config-dir to svnmerge
> Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
>> Hi Daniel,
>>
>> Daniel Shahaf wrote:
>> > Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
>> > > [[[
>> > > Add option --config-dir to svnmerge. Allow defining custom config
>> > > directory
>> > > for svn commands launch by svnmerge.
>> > >
>> > > * contrib/client-side/svnmerge/svnmerge.py
>> > > (launchsvn, global_opts): Add option --config-dir to svnmerge python
>> > > script.
>> > > ]]]
>> > >
>> >
>> > Thanks for the patch, but it's the wrong list; try
>> > http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
>>
>> We still have svnmerge.py here
>> http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ -
>> doesn't
>> that mean this patch applies?
>>
>
> Its sources live in our repository, but it is a separate project that has
> its own developers' mailing list.
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by David Glasser <gl...@davidglasser.net>.
While it's not that big a deal, I'd rather have the svnmerge.py
maintainers maintain their own software instead of people who don't
know their software as well (which certainly includes me; I don't know
if it includes you) committing patches. I don't want to accidentally
be the next Debian-maintainer-breaking-OpenSSL.
--dave
On Fri, Jun 13, 2008 at 6:22 AM, C. Michael Pilato <cm...@collab.net> wrote:
> Proper action? *shrug* Beats me. I'm just cranky this morning, and hate
> to see good, simple patches get lost in red tape.
>
>
> Daniel Shahaf wrote:
>>
>> C. Michael Pilato wrote on Fri, 13 Jun 2008 at 09:08 -0400:
>>>
>>> Oh, enough already. The patch was obviously a good one, and a useful
>>> thing
>>> for svnmerge.py to have. Patch committed (with tweaks) in r31727.
>>>
>>
>> As I'm not an svnmerge expert, I didn't try to classify the patch as
>> "trivial"/"non-trivial" before I redirected Nicolas to the svnmerge
>> list. Sorry if that wasn't the proper action.
>>
>> Daniel
>>
>>> Daniel Shahaf wrote:
>>>>
>>>> Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
>>>>>
>>>>> Hi Daniel,
>>>>>
>>>>> Daniel Shahaf wrote:
>>>>>>
>>>>>> Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
>>>>>>>
>>>>>>> [[[
>>>>>>> Add option --config-dir to svnmerge. Allow defining custom config
>>>>>>> directory
>>>>>>> for svn commands launch by svnmerge.
>>>>>>>
>>>>>>> * contrib/client-side/svnmerge/svnmerge.py
>>>>>>> (launchsvn, global_opts): Add option --config-dir to svnmerge python
>>>>>>> script.
>>>>>>> ]]]
>>>>>>>
>>>>>> Thanks for the patch, but it's the wrong list; try
>>>>>>
>>>>>> http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
>>>>>
>>>>> We still have svnmerge.py here
>>>>> http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ -
>>>>> doesn't
>>>>> that mean this patch applies?
>>>>>
>>>> Its sources live in our repository, but it is a separate project that
>>>> has
>>>> its own developers' mailing list.
>>>
>
>
> --
> C. Michael Pilato <cm...@collab.net>
> CollabNet <> www.collab.net <> Distributed Development On Demand
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by "C. Michael Pilato" <cm...@collab.net>.
Proper action? *shrug* Beats me. I'm just cranky this morning, and hate
to see good, simple patches get lost in red tape.
Daniel Shahaf wrote:
> C. Michael Pilato wrote on Fri, 13 Jun 2008 at 09:08 -0400:
>> Oh, enough already. The patch was obviously a good one, and a useful thing
>> for svnmerge.py to have. Patch committed (with tweaks) in r31727.
>>
>
> As I'm not an svnmerge expert, I didn't try to classify the patch as
> "trivial"/"non-trivial" before I redirected Nicolas to the svnmerge
> list. Sorry if that wasn't the proper action.
>
> Daniel
>
>> Daniel Shahaf wrote:
>>> Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
>>>> Hi Daniel,
>>>>
>>>> Daniel Shahaf wrote:
>>>>> Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
>>>>>> [[[
>>>>>> Add option --config-dir to svnmerge. Allow defining custom config
>>>>>> directory
>>>>>> for svn commands launch by svnmerge.
>>>>>>
>>>>>> * contrib/client-side/svnmerge/svnmerge.py
>>>>>> (launchsvn, global_opts): Add option --config-dir to svnmerge python
>>>>>> script.
>>>>>> ]]]
>>>>>>
>>>>> Thanks for the patch, but it's the wrong list; try
>>>>> http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
>>>> We still have svnmerge.py here
>>>> http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ -
>>>> doesn't
>>>> that mean this patch applies?
>>>>
>>> Its sources live in our repository, but it is a separate project that has
>>> its own developers' mailing list.
>>
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
C. Michael Pilato wrote on Fri, 13 Jun 2008 at 09:08 -0400:
> Oh, enough already. The patch was obviously a good one, and a useful thing
> for svnmerge.py to have. Patch committed (with tweaks) in r31727.
>
As I'm not an svnmerge expert, I didn't try to classify the patch as
"trivial"/"non-trivial" before I redirected Nicolas to the svnmerge
list. Sorry if that wasn't the proper action.
Daniel
>
> Daniel Shahaf wrote:
> > Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
> > > Hi Daniel,
> > >
> > > Daniel Shahaf wrote:
> > > > Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
> > > > > [[[
> > > > > Add option --config-dir to svnmerge. Allow defining custom config
> > > > > directory
> > > > > for svn commands launch by svnmerge.
> > > > >
> > > > > * contrib/client-side/svnmerge/svnmerge.py
> > > > > (launchsvn, global_opts): Add option --config-dir to svnmerge python
> > > > > script.
> > > > > ]]]
> > > > >
> > > > Thanks for the patch, but it's the wrong list; try
> > > > http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
> > > We still have svnmerge.py here
> > > http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ -
> > > doesn't
> > > that mean this patch applies?
> > >
> >
> > Its sources live in our repository, but it is a separate project that has
> > its own developers' mailing list.
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by "C. Michael Pilato" <cm...@collab.net>.
Oh, enough already. The patch was obviously a good one, and a useful thing
for svnmerge.py to have. Patch committed (with tweaks) in r31727.
Daniel Shahaf wrote:
> Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
>> Hi Daniel,
>>
>> Daniel Shahaf wrote:
>>> Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
>>>> [[[
>>>> Add option --config-dir to svnmerge. Allow defining custom config
>>>> directory
>>>> for svn commands launch by svnmerge.
>>>>
>>>> * contrib/client-side/svnmerge/svnmerge.py
>>>> (launchsvn, global_opts): Add option --config-dir to svnmerge python
>>>> script.
>>>> ]]]
>>>>
>>> Thanks for the patch, but it's the wrong list; try
>>> http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
>> We still have svnmerge.py here
>> http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ - doesn't
>> that mean this patch applies?
>>
>
> Its sources live in our repository, but it is a separate project that has
> its own developers' mailing list.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Senthil Kumaran S wrote on Fri, 13 Jun 2008 at 17:27 +0530:
> Hi Daniel,
>
> Daniel Shahaf wrote:
> > Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
> > > [[[
> > > Add option --config-dir to svnmerge. Allow defining custom config
> > > directory
> > > for svn commands launch by svnmerge.
> > >
> > > * contrib/client-side/svnmerge/svnmerge.py
> > > (launchsvn, global_opts): Add option --config-dir to svnmerge python
> > > script.
> > > ]]]
> > >
> >
> > Thanks for the patch, but it's the wrong list; try
> > http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
>
> We still have svnmerge.py here
> http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ - doesn't
> that mean this patch applies?
>
Its sources live in our repository, but it is a separate project that has
its own developers' mailing list.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by Senthil Kumaran S <se...@collab.net>.
Hi Daniel,
Daniel Shahaf wrote:
> Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
>> [[[
>> Add option --config-dir to svnmerge. Allow defining custom config directory
>> for svn commands launch by svnmerge.
>>
>> * contrib/client-side/svnmerge/svnmerge.py
>> (launchsvn, global_opts): Add option --config-dir to svnmerge python script.
>> ]]]
>>
>
> Thanks for the patch, but it's the wrong list; try
> http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
We still have svnmerge.py here
http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/ - doesn't
that mean this patch applies?
--
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Adding option --config-dir to svnmerge
Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Nicolas PAYART wrote on Thu, 12 Jun 2008 at 12:04 +0200:
> [[[
> Add option --config-dir to svnmerge. Allow defining custom config directory
> for svn commands launch by svnmerge.
>
> * contrib/client-side/svnmerge/svnmerge.py
> (launchsvn, global_opts): Add option --config-dir to svnmerge python script.
> ]]]
>
Thanks for the patch, but it's the wrong list; try
http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel.
Daniel
>
> Index: contrib/client-side/svnmerge/svnmerge.py
> ===================================================================
> --- contrib/client-side/svnmerge/svnmerge.py (revision 31709)
> +++ contrib/client-side/svnmerge/svnmerge.py (working copy)
> @@ -305,6 +305,7 @@
> """Launch SVN and grab its output."""
> username = opts.get("username", None)
> password = opts.get("password", None)
> + configdir = opts.get("config-dir", None)
> if username:
> username = " --username=" + username
> else:
> @@ -313,7 +314,11 @@
> password = " --password=" + password
> else:
> password = ""
> - cmd = opts["svn"] + " --non-interactive" + username + password + " " + s
> + if configdir:
> + configdir = " --config-dir=" + configdir
> + else:
> + configdir = ""
> + cmd = opts["svn"] + " --non-interactive" + username + password +
> configdir + " " + s
> if show or opts["verbose"] >= 2:
> print cmd
> if pretend:
> @@ -1868,6 +1873,9 @@
> OptionArg("-p", "--password",
> default=None,
> help="invoke subversion commands with the supplied password"),
> + OptionArg("-c", "--config-dir",
> + default=None,
> + help="config file in this directory"),
> ]
>
> common_opts = [
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org