[Python-modules-commits] [pysvn] 01/09: Import pysvn_1.9.4.orig.tar.gz
Josué Ortega
josue at moszumanska.debian.org
Sun Oct 2 23:29:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
josue pushed a commit to branch master
in repository pysvn.
commit fdbb6c2ae0eaa851c9dbee243b205588a2ec1fa0
Author: Josue Ortega <josue at debian.org>
Date: Sun Oct 2 14:43:41 2016 -0600
Import pysvn_1.9.4.orig.tar.gz
---
Builder/builder_custom_init.cmd | 47 +-
Builder/builder_custom_init.sh | 6 +-
Builder/make-devel-rpm-build.sh | 11 +-
Builder/version.info | 4 +-
Docs/pysvn_prog_ref.html | 910 +++++++++++++--
Docs/pysvn_prog_ref.js | 6 +-
Examples/Client/svn_cmd.py | 383 ++++--
Import/pycxx-6.2.6/build-all.cmd | 19 -
Import/{pycxx-6.2.6 => pycxx-6.2.8}/COPYRIGHT | 0
Import/{pycxx-6.2.6 => pycxx-6.2.8}/CXX/Config.hxx | 0
.../{pycxx-6.2.6 => pycxx-6.2.8}/CXX/Exception.hxx | 0
.../CXX/Extensions.hxx | 0
.../CXX/IndirectPythonInterface.hxx | 0
.../{pycxx-6.2.6 => pycxx-6.2.8}/CXX/Objects.hxx | 0
.../CXX/Python2/Config.hxx | 0
.../CXX/Python2/CxxDebug.hxx | 0
.../CXX/Python2/Exception.hxx | 0
.../CXX/Python2/ExtensionModule.hxx | 0
.../CXX/Python2/ExtensionOldType.hxx | 0
.../CXX/Python2/ExtensionType.hxx | 4 +-
.../CXX/Python2/ExtensionTypeBase.hxx | 0
.../CXX/Python2/Extensions.hxx | 0
.../CXX/Python2/IndirectPythonInterface.hxx | 0
.../CXX/Python2/Objects.hxx | 71 +-
.../CXX/Python2/PythonType.hxx | 0
.../CXX/Python3/Config.hxx | 0
.../CXX/Python3/CxxDebug.hxx | 0
.../CXX/Python3/Exception.hxx | 0
.../CXX/Python3/ExtensionModule.hxx | 0
.../CXX/Python3/ExtensionOldType.hxx | 0
.../CXX/Python3/ExtensionType.hxx | 4 +-
.../CXX/Python3/ExtensionTypeBase.hxx | 0
.../CXX/Python3/Extensions.hxx | 0
.../CXX/Python3/IndirectPythonInterface.hxx | 0
.../CXX/Python3/Objects.hxx | 53 +-
.../CXX/Python3/PythonType.hxx | 0
.../{pycxx-6.2.6 => pycxx-6.2.8}/CXX/Version.hxx | 2 +-
.../{pycxx-6.2.6 => pycxx-6.2.8}/CXX/WrapPython.h | 0
.../Demo/Python2/example.cxx | 18 +-
.../Demo/Python2/example.def | 0
.../Demo/Python2/pycxx_iter.cxx | 0
.../Demo/Python2/pycxx_iter.hxx | 0
.../Demo/Python2/python.cxx | 0
.../Demo/Python2/range.cxx | 0
.../Demo/Python2/range.hxx | 0
.../Demo/Python2/rangetest.cxx | 0
.../Demo/Python2/setup.py | 0
.../Demo/Python2/simple.cxx | 2 +-
.../Demo/Python2/test_example.py | 0
.../Demo/Python2/test_pycxx_iter.py | 0
.../Demo/Python2/test_simple.py | 0
.../Demo/Python3/example.cxx | 4 +-
.../Demo/Python3/example.def | 0
.../Demo/Python3/pycxx_iter.cxx | 0
.../Demo/Python3/pycxx_iter.hxx | 0
.../Demo/Python3/python.cxx | 0
.../Demo/Python3/range.cxx | 0
.../Demo/Python3/range.hxx | 0
.../Demo/Python3/rangetest.cxx | 0
.../Demo/Python3/setup.py | 0
.../Demo/Python3/simple.cxx | 45 +-
.../Demo/Python3/simple2.cxx | 0
.../Demo/Python3/test_assert.hxx | 0
.../Demo/Python3/test_example.py | 0
.../Demo/Python3/test_pycxx_iter.py | 0
.../Demo/Python3/test_simple.py | 35 +-
.../Demo/Python3/test_simple2.py | 0
.../Doc/Python2/PyCXX.html | 30 +-
.../Doc/Python2/style.css | 0
.../Doc/Python3/PyCXX.html | 28 +-
.../Doc/Python3/make_contents.py | 0
.../Doc/Python3/style.css | 0
.../{pycxx-6.2.6 => pycxx-6.2.8}/Lib/__init__.py | 4 +-
Import/{pycxx-6.2.6 => pycxx-6.2.8}/README.html | 36 +-
.../RegressionTests/mem-leak.py | 0
.../SourceForge/deploy.sh | 2 +-
.../SourceForge/index.html | 13 +
.../Src/IndirectPythonInterface.cxx | 11 +
.../Src/Python2/cxx_extensions.cxx | 8 +-
.../Src/Python2/cxxextensions.c | 0
.../Src/Python2/cxxsupport.cxx | 0
.../Src/Python3/cxx_extensions.cxx | 5 +
.../Src/Python3/cxxextensions.c | 0
.../Src/Python3/cxxsupport.cxx | 0
.../Src/cxx_extensions.cxx | 0
.../Src/cxxextensions.c | 0
.../Src/cxxsupport.cxx | 0
Import/pycxx-6.2.8/build-all.cmd | 52 +
Import/{pycxx-6.2.6 => pycxx-6.2.8}/build-all.sh | 18 +-
.../how_to_release_pycxx.txt | 5 +-
.../{pycxx-6.2.6 => pycxx-6.2.8}/make_src_kit.py | 0
Import/{pycxx-6.2.6 => pycxx-6.2.8}/run_tests.cmd | 0
Import/{pycxx-6.2.6 => pycxx-6.2.8}/setup.py | 16 +-
.../{pycxx-6.2.6 => pycxx-6.2.8}/setup_makefile.py | 6 +-
Import/{pycxx-6.2.6 => pycxx-6.2.8}/tag_pycxx.py | 0
Kit/MacOSX/make_pkg.py | 42 +-
Kit/Win32-1.4/makefile | 28 -
Kit/Win32-1.4/msvc71_system_files.iss | 8 -
Kit/Win32-1.4/pysvn.iss | 97 --
Kit/Win32-1.4/setup_version_handling.py | 62 -
Kit/Win32-1.5/makefile | 47 -
Kit/Win32-1.5/msvc71_system_files.iss | 8 -
Kit/Win32-1.5/msvc90_system_files.iss | 10 -
Kit/Win32-1.5/pysvn.iss | 112 --
Kit/Win32-1.5/setup_version_handling.py | 76 --
Kit/Win32-1.6/makefile | 19 -
Kit/Win32-1.6/setup_version_handling.py | 78 --
Kit/Win32-1.7/makefile | 12 -
Kit/Win32-1.8/makefile | 12 -
Kit/Windows/build.cmd | 11 +
Kit/Windows/makefile | 29 +
.../pysvn.iss => Windows/pysvn_win32_code.iss} | 38 +-
Kit/Windows/pysvn_win64_code.iss | 50 +
Kit/Windows/setup_kit_files.py | 169 +++
Kit/Windows/show_python_registry.py | 31 +
MANIFEST.in | 19 +
Patches/test_proplist.sh | 2 +-
Source/build.cmd | 61 +-
Source/build.sh | 28 +
Source/create__init__.py | 2 +-
Source/pysvn.cpp | 6 +
Source/pysvn.hpp | 102 +-
Source/pysvn/__init__.py.template | 43 +-
Source/pysvn_arg_processing.cpp | 25 +-
Source/pysvn_client.cpp | 49 +-
Source/pysvn_client_cmd_add.cpp | 139 ++-
Source/pysvn_client_cmd_changelist.cpp | 20 +-
Source/pysvn_client_cmd_checkin.cpp | 209 +++-
Source/pysvn_client_cmd_copy.cpp | 234 +++-
Source/pysvn_client_cmd_diff.cpp | 333 +++++-
Source/pysvn_client_cmd_export.cpp | 56 +-
Source/pysvn_client_cmd_info.cpp | 869 ++++++++++++--
Source/pysvn_client_cmd_list.cpp | 109 +-
Source/pysvn_client_cmd_merge.cpp | 105 +-
Source/pysvn_client_cmd_prop.cpp | 673 ++++++++---
Source/pysvn_client_cmd_revprop.cpp | 129 +-
Source/pysvn_client_cmd_switch.cpp | 47 +-
Source/pysvn_converters.cpp | 560 ++++++++-
Source/pysvn_enum_string.cpp | 2 -
Source/pysvn_static_strings.hpp | 43 +
Source/pysvn_svnenv.cpp | 45 +-
Source/pysvn_svnenv.hpp | 76 +-
Source/pysvn_transaction.cpp | 83 +-
Source/pysvncmd.cmd | 7 +
Source/pysvncmd.sh | 16 +
Source/run_py.sh | 2 +-
Source/setup_configure.py | 401 ++++---
Tests/benchmark_diff.py | 8 +-
Tests/test-01.cmd | 28 +-
Tests/test-01.sh | 30 +-
Tests/test-01.unix.known_good-py2-svn1.7.log | 183 ++-
Tests/test-01.unix.known_good-py2-svn1.8.log | 200 +++-
Tests/test-01.unix.known_good-py2-svn1.9.log | 1227 +++++++++++---------
Tests/test-01.unix.known_good-py3-svn1.7.log | 191 ++-
Tests/test-01.unix.known_good-py3-svn1.8.log | 208 +++-
Tests/test-01.unix.known_good-py3-svn1.9.log | 1227 +++++++++++---------
Tests/test-01.win32.known_good-py2-svn1.7.log | 187 ++-
Tests/test-01.win32.known_good-py2-svn1.8.log | 338 ++++--
...log => test-01.win32.known_good-py2-svn1.9.log} | 366 ++++--
Tests/test-01.win32.known_good-py3-svn1.7.log | 1113 ++++++++++--------
Tests/test-01.win32.known_good-py3-svn1.8.log | 292 +++--
...log => test-01.win32.known_good-py3-svn1.9.log} | 320 +++--
Tests/test-02.cmd | 4 +
Tests/test-03.cmd | 5 +
Tests/test-03.sh | 7 +-
Tests/test-03.win32.known_good-py2-svn1.9.log | 36 +
Tests/test-03.win32.known_good-py3-svn1.9.log | 36 +
Tests/test-04.cmd | 5 +
Tests/test-04.sh | 11 +-
Tests/test-04.unix.known_good-py2-svn1.8.log | 32 +-
Tests/test-04.unix.known_good-py2-svn1.9.log | 90 +-
Tests/test-04.unix.known_good-py3-svn1.8.log | 130 +--
Tests/test-04.unix.known_good-py3-svn1.9.log | 140 +--
Tests/test-04.win32.known_good-py2-svn1.9.log | 307 +++++
Tests/test-04.win32.known_good-py3-svn1.9.log | 307 +++++
Tests/test-05.cmd | 31 +-
Tests/test-05.sh | 31 +-
Tests/test-05.unix.known_good-py2-svn1.8.log | 328 +++---
Tests/test-05.unix.known_good-py2-svn1.9.log | 100 +-
Tests/test-05.unix.known_good-py3-svn1.8.log | 328 +++---
Tests/test-05.unix.known_good-py3-svn1.9.log | 332 +++---
Tests/test-05.win32.known_good-py2-svn1.8.log | 113 +-
...log => test-05.win32.known_good-py2-svn1.9.log} | 119 +-
Tests/test-05.win32.known_good-py3-svn1.8.log | 313 +++--
...log => test-05.win32.known_good-py3-svn1.9.log} | 119 +-
Tests/test-06.cmd | 4 +
Tests/test-06.sh | 9 +-
Tests/test-06.unix.known_good-py2-svn1.8.log | 104 +-
Tests/test-06.unix.known_good-py2-svn1.9.log | 34 +-
Tests/test-06.unix.known_good-py3-svn1.8.log | 104 +-
Tests/test-06.unix.known_good-py3-svn1.9.log | 104 +-
Tests/test-06.win32.known_good-py2-svn1.8.log | 28 +-
...log => test-06.win32.known_good-py2-svn1.9.log} | 101 +-
Tests/test-06.win32.known_good-py3-svn1.8.log | 98 +-
...log => test-06.win32.known_good-py3-svn1.9.log} | 101 +-
Tests/test-07.cmd | 4 +
Tests/test-07.sh | 10 +-
Tests/test-07.win32.known_good-py2-svn1.9.log | 99 ++
Tests/test-07.win32.known_good-py3-svn1.9.log | 99 ++
Tests/test-08.cmd | 6 +
Tests/test-08.sh | 7 +-
Tests/test-08.win32.known_good-py2-svn1.8.log | 20 +-
...log => test-08.win32.known_good-py2-svn1.9.log} | 22 +-
Tests/test-08.win32.known_good-py3-svn1.8.log | 20 +-
...log => test-08.win32.known_good-py3-svn1.9.log} | 22 +-
Tests/{test-08.cmd => test-09.cmd} | 172 ++-
Tests/test-09.sh | 98 ++
Tests/test-09.unix.known_good-py2-svn1.8.log | 121 ++
Tests/test-09.unix.known_good-py2-svn1.9.log | 128 ++
Tests/test-09.unix.known_good-py3-svn1.8.log | 121 ++
Tests/test-09.unix.known_good-py3-svn1.9.log | 128 ++
Tests/test-09.win32.known_good-py2-svn1.8.log | 48 +
Tests/test-09.win32.known_good-py2-svn1.9.log | 50 +
Tests/test-09.win32.known_good-py3-svn1.8.log | 48 +
Tests/test-09.win32.known_good-py3-svn1.9.log | 50 +
Tests/{test-08.cmd => test-10.cmd} | 186 ++-
Tests/{test-08.sh => test-10.sh} | 53 +-
Tests/test-10.unix.known_good-py2-svn1.9.log | 76 ++
Tests/test-10.unix.known_good-py3-svn1.9.log | 76 ++
Tests/test-10.win32.known_good-py2-svn1.9.log | 75 ++
Tests/test-10.win32.known_good-py3-svn1.9.log | 75 ++
Tests/test_01_set_get_tests.py | 7 +
setup.py | 102 +-
223 files changed, 13193 insertions(+), 5551 deletions(-)
diff --git a/Builder/builder_custom_init.cmd b/Builder/builder_custom_init.cmd
index 2f626ef..7bfc337 100644
--- a/Builder/builder_custom_init.cmd
+++ b/Builder/builder_custom_init.cmd
@@ -1,46 +1 @@
- at echo off
-
-set PY_MAJ=2
-if not "%1" == "" set PY_MAJ=%1
-set PY_MIN=7
-if not "%2" == "" set PY_MIN=%2
-if not "%3" == "" set BUILD_TYPE=%3
-if not "%4" == "" set SVN_VER_MAJ_MIN=%4
-
-
-if "%SVN_VER_MAJ_MIN%" == "" set /p SVN_VER_MAJ_MIN="Build Version (1.8): "
-if "%SVN_VER_MAJ_MIN%" == "" set SVN_VER_MAJ_MIN=1.8
-
-set SVN_VER_MAJ_DASH_MIN=%SVN_VER_MAJ_MIN:.=-%
-rem Save CWD
-pushd .
-
-set VC_VER=9.0
-
-if exist ..\..\ReleaseEngineering\win32-vc-%VC_VER%\software-versions-%SVN_VER_MAJ_MIN%.cmd (
- echo Setting up compiler VC %VC_VER%
- pushd ..\..\ReleaseEngineering\win32-vc-%VC_VER%
- call software-versions-%SVN_VER_MAJ_MIN%.cmd off
- popd
-) else (
- echo No compiler setup found
- pause
-)
-
-set PYCXX=%BUILDER_TOP_DIR%\Import\pycxx-%PYCXX_VER%
-set PY=c:\python%PY_MAJ%%PY_MIN%.win32
-if not exist %PY%\python.exe set PY=c:\python%PY_MAJ%%PY_MIN%
-
-set PYTHONPATH=%BUILDER_TOP_DIR%\Source
-set PYTHON=%PY%\python.exe
-
-rem Need python and SVN on the path
-PATH %PY%;%SVN_BIN%;%PATH%
-
-rem prove the python version selected
-python -c "import sys;print( 'Info: Python Version %%s' %% sys.version )"
-echo SVN Version:
-svn --version --quiet
-
-rem restore original CWD
-popd
+rem empty
diff --git a/Builder/builder_custom_init.sh b/Builder/builder_custom_init.sh
index 04712a9..c8ae804 100755
--- a/Builder/builder_custom_init.sh
+++ b/Builder/builder_custom_init.sh
@@ -5,10 +5,12 @@ if [ ! -z "$1" ]
then
PREF_VER=$1.$2
else
- PREF_VER=2.7
+ PREF_VER=3.5
fi
-for PY_VER in ${PREF_VER} 2.7 2.6
+export PYCXX_VER=7.0.1
+
+for PY_VER in ${PREF_VER} 3.5 3.4 2.7
do
# used in pick python to use in Builder driver makefile
export PYTHON=$( which python${PY_VER} )
diff --git a/Builder/make-devel-rpm-build.sh b/Builder/make-devel-rpm-build.sh
index e6326d6..c44edee 100755
--- a/Builder/make-devel-rpm-build.sh
+++ b/Builder/make-devel-rpm-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
#
# make-devel-rpm-build.sh
#
@@ -10,14 +10,17 @@ rm -rf /tmp/pysvn-${V}
svn export --quiet .. /tmp/pysvn-${V}
BUILD=$( svnversion .. )
-cat <<EOF >/tmp/pysvn-workbench-${V}/Builder/version.info
+cat <<EOF >/tmp/pysvn-${V}/Builder/version.info
MAJOR=${MAJOR}
MINOR=${MINOR}
PATCH=${PATCH}
BUILD=${BUILD}
EOF
echo Info: Creating source kit...
-tar czf ~/rpmbuild/SOURCES/pysvn-${V}.tar.gz -C /tmp pysvn-${V}
+mkdir -p /tmp/rpmbuild/SOURCES
+mkdir -p /tmp/rpmbuild/SPECS
+
+tar czf /tmp/rpmbuild/SOURCES/pysvn-${V}.tar.gz -C /tmp pysvn-${V}
echo Info: Running rpmbuild
-cd ~/rpmbuild/SPECS
+cd /tmp/rpmbuild/SPECS
rpmbuild -ba pysvn.spec
diff --git a/Builder/version.info b/Builder/version.info
index 77601a9..b6d4ac7 100644
--- a/Builder/version.info
+++ b/Builder/version.info
@@ -1,4 +1,4 @@
MAJOR=1
-MINOR=8
-PATCH=0
+MINOR=9
+PATCH=4
BUILD=0
diff --git a/Docs/pysvn_prog_ref.html b/Docs/pysvn_prog_ref.html
index 05de60e..a5c43f7 100644
--- a/Docs/pysvn_prog_ref.html
+++ b/Docs/pysvn_prog_ref.html
@@ -22,7 +22,8 @@ pre {color: #0000cc; background-color: #dddddd; position: relative; left: 40
border-style: solid; border-color: black; border-width: thin}
table {position: relative; left: 40px; margin-right: 80px;
border-style: solid; border-color: black; border-width: thin}
-span.button {border: black 1px solid;background-color: #cccccc; cursor: default; padding: 4px;}
+span.button {border: black 1px solid; background-color: #cccccc; cursor: default;
+ padding: 4px; margin: 4px;}
</style>
@@ -31,6 +32,8 @@ span.svn_example {display: inline; }
</style>
<style id="show_style" type="text/css">
+span.svn_1009000 {display: inline; }
+span.svn_1008000 {display: inline; }
span.svn_1007000 {display: inline; }
span.svn_1006000 {display: inline; }
span.svn_1005000 {display: inline; }
@@ -38,6 +41,8 @@ span.svn_1004000 {display: inline; }
span.svn_1003000 {display: inline; }
span.svn_1002000 {display: inline; }
span.svn_1001000 {display: inline; }
+div.svn_1009000 {display: block; }
+div.svn_1008000 {display: block; }
div.svn_1007000 {display: block; }
div.svn_1006000 {display: block; }
div.svn_1005000 {display: block; }
@@ -62,20 +67,28 @@ gives an tutorial introduction to the pysvn module.
<h2>pysvn features and feature testing</h2>
-<p>This document covers pysvn version 1.6. Features offered by pysvn
+<p>This document covers pysvn version 1.7. Features offered by pysvn
depend on the version of SVN that is being used. Full functionality is
only available with SVN 1.6.0 or later.
</p>
<p>Click one of the buttons below to show the pysvn API as supported
by a particular version of the SVN.</p>
<div id="buttons_work" style="display: none">
+<p>
+<span class="button" onclick='changeDisplay( 1009000 )'>Show SVN 1.9.0 API</span>
+<span class="button" onclick='changeDisplay( 1008000 )'>Show SVN 1.8.0 API</span>
<span class="button" onclick='changeDisplay( 1007000 )'>Show SVN 1.7.0 API</span>
<span class="button" onclick='changeDisplay( 1006000 )'>Show SVN 1.6.0 API</span>
+</p>
+<p>
<span class="button" onclick='changeDisplay( 1005000 )'>Show SVN 1.5.0 API</span>
<span class="button" onclick='changeDisplay( 1004000 )'>Show SVN 1.4.0 API</span>
<span class="button" onclick='changeDisplay( 1003000 )'>Show SVN 1.3.0 API</span>
<span class="button" onclick='changeDisplay( 1002000 )'>Show SVN 1.2.0 API</span>
+</p>
+<p>
<span class="button" onclick='changeDisplay( 1001000 )'>Show SVN 1.1.0 API</span>
+</p>
<div style="margin: 4px">
<form>
<input name="visual_style" value="hilite" type="radio" checked="checked" onclick='changeVisual( "hilite")'>Hilite unsupported</input>
@@ -196,17 +209,19 @@ to pysvn 1.1.2.
for details of effect of the style on the exception raised.
</p>
-
<h4><a name="pysvn_client_commit_info_style"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.commit_info_style</a></h4>
<p>commit_info_style is used to control how pysvn return commit information.
</p>
-<p>commit_info_style can be set to 0 or 1.
+<p>commit_info_style can be set to 0, 1 or 2.
The default value, 0, makes pysvn return only the commit revision.
</p>
<p>When set to 1 pysvn returns a dictionary of commit information including date, author, revision and post_commit_err.
</p>
+<p>When set to 2 pysvn returns a list of dictionaries of commit information including date, author, revision and post_commit_err.
+</p>
+
<h3><a name="pysvn_client_callbacks">Client callbacks</a></h3>
<p>pysvn uses callback functions to allow for realtime feedback
@@ -430,15 +445,13 @@ called with information about the certificate in trust dict.
a tuple of three values (retcode, accepted_failures, save).
</p>
<ul>
-<li>retcode - boolean, False if no username and password are
- available. True if subversion is to use the username and password.</li>
-<li>accepted_failures - int, the accepted failures allowed</li>
+<li>retcode - boolean, True if the ssl server is trusted, False if not trusted.</li>
+<li>accepted_failures - int, the accepted failures allowed. Typically just return trust_dict["failures"].</li>
<li>save - boolean, return True if you want subversion to remember
the certificate in the configuration directory. return False
to prevent saving the certificate.</li>
</ul>
-
<h4><a name="pysvn_client_callback_conflict_resolver"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.callback_conflict_resolver</a></h4>
<pre>
import pysvn
@@ -489,89 +502,97 @@ It is passed the conflict_description and must return a conflict_choice, merge_f
<td><a href="#pysvn_client_add">add</a></td>
<td><span class="svn_1005000"><a href="#pysvn_client_add_to_changelist">add_to_changelist</a></span></td>
<td><a href="#pysvn_client_annotate">annotate</a></td>
+<td><span class="svn_1007000"><a href="#pysvn_client_annotate2">annotate2</a></span></td>
<td><a href="#pysvn_client_cat">cat</a></td>
<td><a href="#pysvn_client_checkin">checkin</a></td>
-<td><a href="#pysvn_client_checkout">checkout</a></td>
</tr>
<tr bgcolor="#e0e0e0">
+<td><a href="#pysvn_client_checkout">checkout</a></td>
<td><a href="#pysvn_client_cleanup">cleanup</a></td>
<td><a href="#pysvn_client_copy">copy</a></td>
<td><span class="svn_1005000"><a href="#pysvn_client_copy2">copy2</a></span></td>
<td><a href="#pysvn_client_diff">diff</a></td>
<td><span class="svn_1001000"><a href="#pysvn_client_diff_peg">diff_peg</a></span></td>
-<td><span class="svn_1004000"><a href="#pysvn_client_diff_summarize">diff_summarize</a></span></td>
</tr>
<tr>
+<td><span class="svn_1004000"><a href="#pysvn_client_diff_summarize">diff_summarize</a></span></td>
<td><span class="svn_1004000"><a href="#pysvn_client_diff_summarize_peg">diff_summarize_peg</a></span></td>
<td><a href="#pysvn_client_export">export</a></td>
<td><span class="svn_1003000"><a href="#pysvn_client_get_adm_dir">get_adm_dir</a></span></td>
<td><a href="#pysvn_client_get_auth_cache">get_auth_cache</a></td>
<td><a href="#pysvn_client_get_auto_props">get_auto_props</a></td>
-<td><span class="svn_1005000"><a href="#pysvn_client_get_changelist">get_changelist</a></span></td>
</tr>
<tr bgcolor="#e0e0e0">
+<td><span class="svn_1005000"><a href="#pysvn_client_get_changelist">get_changelist</a></span></td>
<td><a href="#pysvn_client_get_default_password">get_default_password</a></td>
<td><a href="#pysvn_client_get_default_username">get_default_username</a></td>
<td><a href="#pysvn_client_get_interactive">get_interactive</a></td>
<td><a href="#pysvn_client_get_store_passwords">get_store_passwords</a></td>
<td><a href="#pysvn_client_import_">import_</a></td>
-<td><a href="#pysvn_client_info">info</a></td>
</tr>
<tr>
+<td><a href="#pysvn_client_info">info</a></td>
<td><span class="svn_1003000"><a href="#pysvn_client_info2">info2</a></span></td>
<td><span class="svn_1003000"><a href="#pysvn_client_is_adm_dir">is_adm_dir</a></span></td>
<td><a href="#pysvn_client_is_url">is_url</a></td>
<td><span class="svn_1004000"><a href="#pysvn_client_list">list</a></span></td>
<td><a href="#pysvn_client_log">log</a></td>
-<td><span class="svn_1002000"><a href="#pysvn_client_lock">lock</a></span></td>
</tr>
<tr bgcolor="#e0e0e0">
+<td><span class="svn_1002000"><a href="#pysvn_client_lock">lock</a></span></td>
<td><a href="#pysvn_client_ls">ls</a></td>
<td><a href="#pysvn_client_merge">merge</a></td>
<td><span class="svn_1001000"><a href="#pysvn_client_merge_peg">merge_peg</a></span></td>
<td><span class="svn_1005000"><a href="#pysvn_client_merge_peg2">merge_peg2</a></span></td>
<td><span class="svn_1005000"><a href="#pysvn_client_merge_reintegrate">merge_peg2</a></span></td>
-<td><a href="#pysvn_client_mkdir">mkdir</a></td>
</tr>
<tr>
+<td><a href="#pysvn_client_mkdir">mkdir</a></td>
<td><a href="#pysvn_client_move">move</a></td>
<td><span class="svn_1005000"><a href="#pysvn_client_move2">move2</a></span></td>
<td><span class="svn_1007000"><a href="#pysvn_client_patch">patch</a></span></td>
<td><a href="#pysvn_client_propdel">propdel</a></td>
-<td><a href="#pysvn_client_propget">propget</a></td>
-<td><a href="#pysvn_client_proplist">proplist</a></td>
+<td><span class="svn_1007000"><a href="#pysvn_client_propdel_local">propdel_local</a></span></td>
</tr>
<tr bgcolor="#e0e0e0">
+<td><span class="svn_1005000"><a href="#pysvn_client_propdel_remote">propdel_remote</a></span></td>
+<td><a href="#pysvn_client_propget">propget</a></td>
+<td><a href="#pysvn_client_proplist">proplist</a></td>
<td><a href="#pysvn_client_propset">propset</a></td>
+<td><span class="svn_1007000"><a href="#pysvn_client_propset_local">propset_local</a></span></td>
+<td><span class="svn_1007000"><a href="#pysvn_client_propset_remote">propset_remote</a></span></td>
+</tr>
+<tr>
<td><a href="#pysvn_client_relocate">relocate</a></td>
<td><a href="#pysvn_client_remove">remove</a></td>
<td><span class="svn_1005000"><a href="#pysvn_client_remove_from_changelists">remove_from_changelists</a></span></td>
<td><a href="#pysvn_client_resolved">resolved</a></td>
<td><a href="#pysvn_client_revert">revert</a></td>
-</tr>
-<tr>
<td><a href="#pysvn_client_revpropdel">revpropdel</a></td>
+</tr>
+<tr bgcolor="#e0e0e0">
<td><a href="#pysvn_client_revpropget">revpropget</a></td>
<td><a href="#pysvn_client_revproplist">revproplist</a></td>
<td><a href="#pysvn_client_revpropset">revpropset</a></td>
<td><span class="svn_1005000"><a href="#pysvn_client_root_url_from_path">root_url_from_path</a></span></td>
<td><span class="svn_1003000"><a href="#pysvn_client_set_adm_dir">set_adm_dir</a></span></td>
-</tr>
-<tr bgcolor="#e0e0e0">
<td><a href="#pysvn_client_set_auth_cache">set_auth_cache</a></td>
+</tr>
+<tr>
<td><a href="#pysvn_client_set_auto_props">set_auto_props</a></td>
<td><a href="#pysvn_client_set_default_password">set_default_password</a></td>
<td><a href="#pysvn_client_set_default_username">set_default_username</a></td>
<td><a href="#pysvn_client_set_interactive">set_interactive</a></td>
<td><a href="#pysvn_client_set_store_passwords">set_store_passwords</a></td>
+<td><a href="#pysvn_client_status2">status2</a></td>
</tr>
-<tr>
+<tr bgcolor="#e0e0e0">
<td><a href="#pysvn_client_status">status</a></td>
<td><a href="#pysvn_client_switch">switch</a></td>
<td><span class="svn_1002000"><a href="#pysvn_client_unlock">unlock</a></span></td>
<td><a href="#pysvn_client_update">update</a></td>
<td><span class="svn_1007000"><a href="#pysvn_client_upgrade">upgrade</a></span></td>
-<td> </td>
+<td><span class="svn_1009000"><a href="#pysvn_client_vacuum">vacuum</a></span></td>
</tr>
</table>
@@ -600,12 +621,16 @@ add( path,
recurse=True<span class="svn_1001000">,
force=False</span><span class="svn_1003000">,
ignore=False</span><span class="svn_1005000">,
- depth=None</span> )
+ depth=None,
+ add_parents=False</span><span class="svn_1007000">,
+ autoprops=False</span> )
add( [path,path],
recurse=True<span class="svn_1001000">,
force=False</span><span class="svn_1003000">,
ignore=True</span><span class="svn_1005000">,
- depth=None</span> )
+ depth=None,
+ add_parents=False</span><span class="svn_1007000">,
+ autoprops=True</span> )
</pre>
<p>
Schedules all the files or directories specfied in the paths
@@ -618,6 +643,10 @@ Files are added at the next checkin.
<div class="svn_1005000">
<p>The depth can be used as in place of recurse. depth is one of the pysvn.depth enums.
</p>
+<p>Set add_parents True to have subversion create missing directories.</p>
+</div>
+<div class="svn_1007000">
+<p>Set autoprops to False to prevent subversion from applying properties automatically.</p>
</div>
<h4><a name="pysvn_client_annotate"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.annotate</a></h4>
@@ -649,23 +678,83 @@ contains:
<li>revision - pysvn.Revision - the revision that committed the line</li>
</ul>
+<div class="svn_1007000">
+<h4><a name="pysvn_client_annotate2"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.annotate2</a></h4>
+<pre>
+file_annotation = \
+annotate2( url_or_path,
+ revision_start=pysvn.Revision( opt_revision_kind.number, 0 ),
+ revision_end=pysvn.Revision( opt_revision_kind.head )<span class="svn_1002000">,
+ peg_revision=pysvn.Revision( opt_revision_kind.unspecified )</span> )
+</pre>
+<p>Return the annotation for each line in the url_or_path from
+revision_start to revision_end.
+</p>
+<p>peg_revision indicates in
+which revision url_or_path is valid. If peg_revision.kind
+is opt_revision_kind.unspecified, then it defaults to
+opt_revision_kind.head for URLs or opt_revision_kind.working for
+WC targets.
+</p>
+
+<p>The file_annotation is a list of dictionaries. Each dictionary
+contains:
+</p>
+<ul>
+<li>line - string - the text of the line</li>
+<li>number - int - the line number</li>
+<li>revision - pysvn.Revision - the revision that committed the line</li>
+<li>local_change - boolean - true if the change was made locally</li>
+<li>merged_revision - pysvn.Revsion or None - None if not merged otherwise revision of the merged line</li>
+<li>merged_path - string or None - path of the merged line if merged</li>
+<li>local_changed - boolean - If there is no blame information for this line, revision will be
+ invalid and rev_props will be None. In this case local_change
+ will be True if the reason there is no annotation information is that the line
+ was modified locally. In all other cases local_change will be False.</li>
+<li>merged_rev_props - not implemented yet</li>
+</ul>
+<p>
+Note: To find the author and date of the lines in the annotation use
+<a href="#pysvn_client_log">log()</a>.
+</p>
+</div>
+
<h4><a name="pysvn_client_cat"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.cat</a></h4>
<pre>
file_text = \
cat( url_or_path,
revision=pysvn.Revision( opt_revision_kind.head )<span class="svn_1002000">,
- peg_revision=pysvn.Revision( opt_revision_kind.unspecified )</span> )
+ peg_revision=pysvn.Revision( opt_revision_kind.unspecified )</span>,<span class="svn_1009000">
+ expand_keywords=false,
+ get_props=false</span> )
+
+<div class="svn_1009000">
+file_text, props = \
+cat( url_or_path,
+ revision=pysvn.Revision( opt_revision_kind.head ),
+ peg_revision=pysvn.Revision( opt_revision_kind.unspecified ),
+ expand_keywords=False,
+ get_props=True )
+</div>
</pre>
<p>
Return the contents of url_or_path for the specified revision as
-a string, file_text.
+a string, file_text.
</p>
-<p><span class="svn_1002000">peg_revision indicates in
+<div class="svn_1009000">
+<p>
+When get_props is True the props of the file are returned in a dictionary.
+</p>
+</div>
+<div class="svn_1002000">
+<p>
+peg_revision indicates in
which revision url_or_path is valid. If peg_revision.kind
is opt_revision_kind.unspecified, then it defaults to
opt_revision_kind.head for URLs or opt_revision_kind.working for
WC targets.
-</span></p>
+</p>
+</div>
<h4><a name="pysvn_client_checkin"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.checkin</a></h4>
@@ -678,7 +767,10 @@ checkin( path,
depth,
keep_changelist,
changelists,
- revprops</span> )
+ revprops</span><span class="svn_1007000">,
+ commit_as_operations=False</span><span class="svn_1008000">,
+ include_file_externals=False,
+ include_dir_externals=False</span> )
revision = \
checkin( [path,path],
log_message,
@@ -687,11 +779,14 @@ checkin( [path,path],
depth,
keep_changelist,
changelists,
- revprops</span> )
+ revprops</span><span class="svn_1007000">,
+ commit_as_operations=False</span><span class="svn_1008000">,
+ include_file_externals=False,
+ include_dir_externals=False</span> )
</pre>
<p>
checkin the files in the path_list to the repository with the
-specifed log_message. Set recurse to True to recursively checkin
+specified log_message. Set recurse to True to recursively checkin
a directory's children with the same log message. <span class="svn_1002000"> Set
keep_locks to True to prevent locks in the path being unlocked.</span>
</p>
@@ -699,11 +794,46 @@ keep_locks to True to prevent locks in the path being unlocked.</span>
checked in revision.
</p>
-<p>depth,
- keep_changelist,
- changelists,
- revprops TBD</p>
+<div class="svn_1005000">
+<p>The depth can be used as in place of recurse. depth is one of the pysvn.depth enums.
+</p>
+<p>
+changelists is an array of string changelist
+names, used as a restrictive filter on items that are committed;
+that is, don't commit anything unless it's a member of one of those
+changelists. After the commit completes successfully, remove
+changelist associations from the targets, unless
+keep_changelists is set. If changelists is
+empty or None, no changelist filtering occurs.
+</p>
+<p>
+If not None revprop is a list holding additional,
+custom revision properties to be set on the new revision.
+This list cannot contain any standard Subversion properties.
+</p>
+</div>
+<div class="svn_1007000">
+<p>
+If commit_as_operations is set to False, when a copy is committed
+all changes below the copy are always committed at the same time
+(independent of the value of depth). If commit_as_operations is
+True, changes to descendants are only committed if they are itself
+included via depth and targets.
+</p>
+</div>
+<div class="svn_1008000">
+<p>
+If include_file_externals and/or include_dir_externals are True,
+also commit all file and/or dir externals (respectively) that are reached
+by recursion, except for those externals which:</p>
+<ul>
+<li>have a fixed revision, or</li>
+<li>come from a different repository root URL (dir externals).</li>
+</ul>
+<p>These flags affect only recursion; externals that directly appear in
+targets are always included in the commit.</p>
+</div>
<h4><a name="pysvn_client_checkout"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.checkout</a></h4>
<pre>
@@ -713,7 +843,9 @@ checkout( url,
recurse=True,
revision=pysvn.Revision( opt_revision_kind.head )<span class="svn_1002000">,
peg_revision=pysvn.Revision( opt_revision_kind.unspecified )</span><span class="svn_1002000">,
- ignore_externals=False</span> )
+ ignore_externals=False</span><span class="svn_1005000">,
+ allow_unver_obstructions=False,
+ depth=None</span> )
</pre>
<p>
checkout the repository at url into the location specified by path.
@@ -727,6 +859,13 @@ is opt_revision_kind.unspecified, then it defaults to
opt_revision_kind.head for URLs or opt_revision_kind.working for
WC targets.
</span></p>
+
+<div class="svn_1005000">
+<p>The depth can be used as in place of recurse. depth is one of the pysvn.depth enums.
+</p>
+</div>
+
+
<p>checkout returns a pysvn.Revision containing the number of the
checked out revision.
</p>
@@ -738,18 +877,44 @@ This is what the svn command does.
<h4><a name="pysvn_client_cleanup"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.cleanup</a></h4>
<pre>
-cleanup( path )
+cleanup( path<span cleanup="svn_1009000">,
+ fix_recorded_timestamps=True,
+ clear_dav_cache=True,
+ vacuum_pristines=True,
+ include_externals=False</span> )
</pre>
<p>
Clean up any locks in the working copy at path. Usually such
locks are the result of a failed or interrupted operation.
</p>
+<div class="svn_1009000">
+<p>
+If break_locks is True, existing working copy locks at or below
+dir_abspath are broken, otherwise a normal write lock is obtained.
+</p>
+<p>If fix_recorded_timestamps is True, this function fixes recorded
+timestamps for unmodified files in the working copy, reducing comparision
+time on future checks.
+</p>
+<p>If clear_dav_cache is True, the caching of DAV information for older
+mod_dav served repositories is cleared. This clearing invalidates some
+cached information used for pre-HTTPv2 repositories.
+</p>
+<p>If vacuum_pristines is True, and dir_abspath points to the working
+copy root unreferenced files in the pristine store are removed.
+</p>
+<p>If include_externals is True, recurse into externals and clean
+them up as well.
+</p>
+</div>
+
<h4><a name="pysvn_client_copy"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.copy</a></h4>
<pre>
copy( src_url_or_path,
dest_url_or_path,
- src_revision=pysvn.Revision( opt_revision_kind.head ))
+ src_revision=pysvn.Revision( opt_revision_kind.head )
+ )
</pre>
<p>
Duplicate something in working copy or repos, remembering history.
@@ -759,17 +924,19 @@ pysvn.Revision( opt_revision_kind.working ).
</p>
<p>src_url_or_path and dest_url_or_path can each be either a
working copy (WC) path or URL:
+</p>
<ul>
-<li>WC -> WC: copy and schedule for addition (with history)</li>
-<li>WC -> URL: immediately commit a copy of WC to URL</li>
-<li>URL -> WC: check out URL into WC, schedule for addition</li>
-<li>URL -> URL: complete server-side copy; used to branch and tag</li>
+<li>WC -&rt; WC: copy and schedule for addition (with history)</li>
+<li>WC -&rt; URL: immediately commit a copy of WC to URL</li>
+<li>URL -&rt; WC: check out URL into WC, schedule for addition</li>
+<li>URL -&rt; URL: complete server-side copy; used to branch and tag</li>
</ul>
-</p>
<p>If the destination is a URL the <a href="#pysvn_client_callback_get_log_message">client_get_log_message</a>
callback must be implemented to return a log message.
</p>
+
+
<div class="svn_1005000">
<h4><a name="pysvn_client_copy2"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.copy2</a></h4>
<pre>
@@ -778,7 +945,10 @@ copy2( sources,
copy_as_child=False,
make_parents=False,
revprops<span class="svn_1006000">,
- ignore_externals=False</span> )
+ ignore_externals=False</span><span class="svn_1009000">,
+ metadata_only=False,
+ pin_externals=False,
+ externals_to_pin=[(path_or_url, externals_description),...]</span> )
</pre>
<p>
Duplicate something in working copy or repos, remembering history.
@@ -797,13 +967,44 @@ TBD better docs here.</p>
</p>
</div>
+<div class="svn_1009000">
+<p>
+If metadata_only is True and copying a file in a working copy,
+everything in the metadata is updated as if the node is moved, but the
+actual disk copy operation is not performed. This feature is useful for
+clients that want to keep the working copy in sync while the actual working
+copy is updated by some other task.
+</p>
+<p>
+If pin_externals is set, pin URLs in copied externals definitions
+to their current revision unless they were already pinned to a
+particular revision. A pinned external uses a URL which points at a
+fixed revision, rather than the HEAD revision. Externals in the copy
+destination are pinned to either a working copy base revision or the
+HEAD revision of a repository (as of the time the copy operation is
+performed), depending on the type of the copy source:
+</p>
+<p>
+If not None, externals_to_pin restricts pinning to a subset of externals.
+It is a dictionary keyed by either a local absolute path or a URL at which
+an svn:externals property is set. The dictionary contains externals description
+each of which corresponds to a single line of an svn:externals definition.
+</p>
+<p>
+Externals corresponding to
+these items will be pinned, other externals will not be pinned.
+If externals_to_pin is None then all externals are pinned.
+If pin_externals is False then externals_to_pin is ignored.
+</p>
+</div>
+
<p>src_url_or_path and dest_url_or_path can each be either a
working copy (WC) path or URL:
<ul>
-<li>WC -> WC: copy and schedule for addition (with history)</li>
-<li>WC -> URL: immediately commit a copy of WC to URL</li>
-<li>URL -> WC: check out URL into WC, schedule for addition</li>
-<li>URL -> URL: complete server-side copy; used to branch and tag</li>
+<li>WC -> WC: copy and schedule for addition (with history)</li>
+<li>WC -> URL: immediately commit a copy of WC to URL</li>
+<li>URL -> WC: check out URL into WC, schedule for addition</li>
+<li>URL -> URL: complete server-side copy; used to branch and tag</li>
</ul>
</p>
<p>If the destination is a URL the <a href="#pysvn_client_callback_get_log_message">client_get_log_message</a>
@@ -827,7 +1028,12 @@ diff( tmp_path,
diff_options=[]</span><span class="svn_1005000">,
depth=depth</span>,<span class="svn_1006000">,
relative_to_dir=None,
- changelists=None</span> )
+ changelists=None</span><span class="svn_1007000">,
+ show_copies_as_adds=False,
+ use_git_diff_format=False</span><span class="svn_1008000">,
+ diff_added=False,
+ ignore_properties=False,
+ properties_only=False</span> )
</pre>
<p>
Return the differences between revision1 of url_or_path
@@ -868,6 +1074,22 @@ and its configuration.</span>
an error is returned.
</p>
</div>
+<div class="svn_1007000">
+<p>
+If show_copies_as_adds is True, then copied files will not be diffed
+against their copyfrom source, and will appear in the diff output
+in their entirety, as if they were newly added.
+</p>
+<p>
+If use_git_diff_format is True, then the git's extended diff format
+will be used.
+</p>
+</div>
+<div class="svn_1008000">
+<p>if diff_added is True show diff of added files.</p>
+<p>if ignore_properties is True then ignore diff of properties.</p>
+<p>if properties_only is True then only diff properties.</p>
+</div>
<div class="svn_1001000">
<h4><a name="pysvn_client_diff_peg"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.diff_peg</a></h4>
@@ -884,7 +1106,12 @@ diff_peg( tmp_path,
ignore_content_type=False</span><span class="svn_1003000">,
header_encoding="",
diff_options=[]</span><span class="svn_1005000">,
- depth=depth</span> )
+ depth=depth</span><span class="svn_1007000">,
+ show_copies_as_adds=False,
+ use_git_diff_format=False</span><span class="svn_1008000">,
+ diff_added=False,
+ ignore_properties=False,
+ properties_only=False</span> )
</pre>
<p>
return the differences between two revisions of the url_or_path.
@@ -923,6 +1150,22 @@ The exact options that work depend on the version of subversion used
and its configuration.</span>
</p>
</div>
+<div class="svn_1007000">
+<p>
+If show_copies_as_adds is True, then copied files will not be diffed
+against their copyfrom source, and will appear in the diff output
+in their entirety, as if they were newly added.
+</p>
+<p>
+If use_git_diff_format is True, then the git's extended diff format
+will be used.
+</p>
+</div>
+<div class="svn_1008000">
+<p>if diff_added is True show diff of added files.</p>
+<p>if ignore_properties is True then ignore diff of properties.</p>
+<p>if properties_only is True then only diff properties.</p>
+</div>
<div class="svn_1004000">
<h4><a name="pysvn_client_diff_summarize"><a href="#pysvn_module">pysvn</a>.<a href="#pysvn_client">Client</a>.diff_summarize</a></h4>
@@ -1027,7 +1270,7 @@ WC targets.
</div>
<p><span class="svn_1001000">native_eol parameter allows the line ending of files with
-svn:eol-style propery set to native to be overriden.
+svn:eol-style property set to native to be overridden.
Use None to use the eol-style of the Operating System,
use "LF" to use "\n", "CR" to use "\r" and "CRLF" to use "\r\n".</span>
</p>
@@ -1118,7 +1361,8 @@ import_( path,
log_message,
recurse=True<span class="svn_1003000">,
... 27872 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pysvn.git
More information about the Python-modules-commits
mailing list