[PATCH] addcommand line option to svn-backup-dumps.py to specify svnadmin and svnlook paths

[tma]

Hi.

I added the feature to specify svnadmin and svnlook paths
by command line options.

[[[
   add two command line options, --svnadmin-path and --svnlook-path
   to svn-backup-dumps.py

   When --svnlook-path option is specified, use the parameter as
   svnlook path to get the youngest revision of a repository.

   When --svnadmin-path option is specified, use the parameter as
   svnadmin path to dump a repository.

   * tools/server-side/svn-backup-dumps.py
     (SvnBackup.__init__): add two member variables, __svnadmin_path and
                           __svnlook_path to hold command line parameters
     (SvnBackup.get_head_rev): use the member variable __svnlook_path instead
                               of contant string "svnlook".
     (SvnBackup.create_dump): use the member variable __svnadmin_path instead
                               of contant string "svnadmin".
   ]]]

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2410830

[Senthil Kumaran Shanmuga Sundram]

masaru tsuchiyama wrote:

> Hi.
>
> I added the feature to specify svnadmin and svnlook paths
> by command line options.
>
> [[[
>    add two command line options, --svnadmin-path and --svnlook-path
>    to svn-backup-dumps.py
>
>    When --svnlook-path option is specified, use the parameter as
>    svnlook path to get the youngest revision of a repository.
>
>    When --svnadmin-path option is specified, use the parameter as
>    svnadmin path to dump a repository.
>
>    * tools/server-side/svn-backup-dumps.py
>      (SvnBackup.__init__): add two member variables, __svnadmin_path and
>                            __svnlook_path to hold command line parameters
>      (SvnBackup.get_head_rev): use the member variable __svnlook_path instead
>                                of contant string "svnlook".
>      (SvnBackup.create_dump): use the member variable __svnadmin_path instead
>                                of contant string "svnadmin".
>    ]]]

Committed in r40215 and tested as follows,

<snip>
$ ./tools/server-side/svn-backup-dumps.py -b /tmp/repos1 /tmp
svnlook: Expected FS format between '1' and '3'; found format '4'

An error occured!
$ ./tools/server-side/svn-backup-dumps.py -b
--svnlook-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnlook
/tmp/repos1 /tmp
writing /tmp/repos1.000000-000000.svndmp.bz2
svnadmin: Expected FS format between '1' and '3'; found format '4'

An error occured!
$ rm /tmp/repos1.000000-000000.svndmp.bz2
$ ./tools/server-side/svn-backup-dumps.py -b
--svnadmin-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnadmin
--svnlook-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnlook
/tmp/repos1 /tmp
writing /tmp/repos1.000000-000000.svndmp.bz2
* Dumped revision 0.

Everything OK.
</snip>

Thank You.
--
Senthil Kumaran S
http://www.stylesen.org/

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2410844

[Daniel Shahaf-2]

Senthil Kumaran S wrote on Sat, 24 Oct 2009 at 12:41 +0530:
> --svnadmin-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnadmin
> --svnlook-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnlook

Won't it always be necessary to provide either both of these or neither of
them?  In that case it might be better to have just one arg, e.g.,

    --svn-path=/home/stylesen/work/builds/pure-trunk-neon/bin

and then

    svnadmin_path = os.path.join(svn_path, 'svnadmin')
    svnlook_path = os.path.join(svn_path, 'svnlook')

in the script.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2411019

[tma]

Hi. Daniel

2009/10/24 Daniel Shahaf <d.s@...>:

> Senthil Kumaran S wrote on Sat, 24 Oct 2009 at 12:41 +0530:
>> --svnadmin-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnadmin
>> --svnlook-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnlook
>
> Won't it always be necessary to provide either both of these or neither of
> them?  In that case it might be better to have just one arg, e.g.,
>
>    --svn-path=/home/stylesen/work/builds/pure-trunk-neon/bin
>
> and then
>
>    svnadmin_path = os.path.join(svn_path, 'svnadmin')
>    svnlook_path = os.path.join(svn_path, 'svnlook')
>
> in the script.
>

Sorry fo very late reply.

I had sent another patch to add a feature to specify bzip2 and gzip paths
--bzip2-path and --gzip-path option. (The patch was committed at r40147)

If the option is specified, bzip2 or gzip is used to compress instead of
python module.

That patch also takes paths to bzip and bzip executables.

If bzip2 and gzip are in a dir of 'PATH' environment variable,
a user can use --bzip2-path=bzip2 or --gzip-path=gzip.
If the options take dirs to bzip2 and gzip, a user must
specify the absolute or relative dir to the commands.

So I decided that the options take the paths to the commands.

For consistency, I added the options to specify svnadmin and svnlook paths.

Regards.
Masaru.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2414098

[Daniel Shahaf-2]

masaru tsuchiyama wrote on Tue, 3 Nov 2009 at 21:39 +0900:

> Hi. Daniel
>
> 2009/10/24 Daniel Shahaf <d.s@...>:
> > Senthil Kumaran S wrote on Sat, 24 Oct 2009 at 12:41 +0530:
> >> --svnadmin-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnadmin
> >> --svnlook-path=/home/stylesen/work/builds/pure-trunk-neon/bin/svnlook
> >
> > Won't it always be necessary to provide either both of these or neither of
> > them?  In that case it might be better to have just one arg, e.g.,
> >
> >    --svn-path=/home/stylesen/work/builds/pure-trunk-neon/bin
> >
> > and then
> >
> >    svnadmin_path = os.path.join(svn_path, 'svnadmin')
> >    svnlook_path = os.path.join(svn_path, 'svnlook')
> >
> > in the script.
> >
>
> Sorry fo very late reply.
>
> I had sent another patch to add a feature to specify bzip2 and gzip paths
> --bzip2-path and --gzip-path option. (The patch was committed at r40147)
>
> If the option is specified, bzip2 or gzip is used to compress instead of
> python module.
>
> That patch also takes paths to bzip and bzip executables.
>

...
>
> For consistency, I added the options to specify svnadmin and svnlook paths.
>

*nod* fair enough.  If someone's svnadmin isn't in $PATH, they can just
use a shell variable to save their typing then (and it's also more
general the way it is).

Let's leave it the way it is then.  Thanks for explaining :)

Daniel

> Regards.
> Masaru.
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2414234