[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Adding option --config-dir to svnmerge

From: Nicolas PAYART <payart_at_benchmark.fr>
Date: Thu, 12 Jun 2008 12:04:48 +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.
]]]

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_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-12 22:15:51 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.