diff --git a/Builder/version.info b/Builder/version.info index 0031b2ce691477544bfe6db11d53ebc9ffa2f0f7..36682fa407e25f645e4dab3c05fb601aa5d43e18 100644 --- a/Builder/version.info +++ b/Builder/version.info @@ -1,4 +1,4 @@ MAJOR=1 MINOR=9 -PATCH=6 +PATCH=9 BUILD=0 diff --git a/Import/pycxx-7.0.3/Demo/Python3/test_pycxx_iter.py b/Import/pycxx-7.0.3/Demo/Python3/test_pycxx_iter.py deleted file mode 100644 index 42b238d1c23c52f2ecb2af45042aa074b0227ce3..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/Demo/Python3/test_pycxx_iter.py +++ /dev/null @@ -1,17 +0,0 @@ -import sys -sys.path.insert( 0, 'pyds%d%d' % (sys.version_info[0], sys.version_info[1]) ) - -import pycxx_iter - -it = pycxx_iter.IterT( 5, 7 ) - - -for i in it: - print( i, it ) - -print( "refcount of it:", sys.getrefcount( it ) ) - -for i in it.reversed(): - print( i ) - -print( "refcount of it:", sys.getrefcount( it ) ) diff --git a/Import/pycxx-7.0.3/PyCXX-Release-Notes.txt b/Import/pycxx-7.0.3/PyCXX-Release-Notes.txt deleted file mode 100644 index dfcacd2b04080ec863c389e0c504b7c51113e65d..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/PyCXX-Release-Notes.txt +++ /dev/null @@ -1,3 +0,0 @@ -Version: 7.0.3 (23-April-2017) - -Update Py::Long to support long long consitently between Python2 and Python3. diff --git a/Import/pycxx-7.0.3/README.txt b/Import/pycxx-7.0.3/README.txt deleted file mode 100644 index dfcacd2b04080ec863c389e0c504b7c51113e65d..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Version: 7.0.3 (23-April-2017) - -Update Py::Long to support long long consitently between Python2 and Python3. diff --git a/Import/pycxx-7.0.3/SourceForge/PyCXX-Python2.html b/Import/pycxx-7.0.3/SourceForge/PyCXX-Python2.html deleted file mode 120000 index 8f41cbde9d8bb2445db83c3581da02d9fad9df93..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/SourceForge/PyCXX-Python2.html +++ /dev/null @@ -1 +0,0 @@ -../Doc/Python2/PyCXX.html \ No newline at end of file diff --git a/Import/pycxx-7.0.3/SourceForge/PyCXX-Python3.html b/Import/pycxx-7.0.3/SourceForge/PyCXX-Python3.html deleted file mode 120000 index 5691598c2b6569d243f68af7fb9123ee81a2bff6..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/SourceForge/PyCXX-Python3.html +++ /dev/null @@ -1 +0,0 @@ -../Doc/Python3/PyCXX.html \ No newline at end of file diff --git a/Import/pycxx-7.0.3/SourceForge/README.html b/Import/pycxx-7.0.3/SourceForge/README.html deleted file mode 120000 index 16e707e227cc49f10ef37d371276daaa3a736bb9..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/SourceForge/README.html +++ /dev/null @@ -1 +0,0 @@ -../README.html \ No newline at end of file diff --git a/Import/pycxx-7.0.3/SourceForge/deploy.sh b/Import/pycxx-7.0.3/SourceForge/deploy.sh deleted file mode 100755 index fafc7a91b938467410d4f1e5ded3011957b0b3d7..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/SourceForge/deploy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -scp index.html barry-scott,cxx@web.sourceforge.net:/home/groups/c/cx/cxx/htdocs/ -scp ../README.html barry-scott,cxx@web.sourceforge.net:/home/groups/c/cx/cxx/htdocs/ -scp ../Doc/Python2/PyCXX.html barry-scott,cxx@web.sourceforge.net:/home/groups/c/cx/cxx/htdocs/PyCXX-Python2.html -scp ../Doc/Python3/style.css barry-scott,cxx@web.sourceforge.net:/home/groups/c/cx/cxx/htdocs/style.css -scp ../Doc/Python3/PyCXX.html barry-scott,cxx@web.sourceforge.net:/home/groups/c/cx/cxx/htdocs/PyCXX-Python3.html diff --git a/Import/pycxx-7.0.3/SourceForge/index.html b/Import/pycxx-7.0.3/SourceForge/index.html deleted file mode 100644 index 15e4a53ea0a31324c1d223ee74636f92f531cc22..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/SourceForge/index.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - PyCXX: Write Python Extensions in C++ - - - -
PyCXX: Write Python Extensions in C++ -

Barry Scott, barry@barrys-emacs.org -

-

The CXX -Project Page at SourceForge Home -gives you access to the releases, the Subversion repository, and more. -

- -

PyCXX is designed to make it easier to extend Python with C++

- -

-CXX/Objects is a set of C++ facilities to make it easier -to write Python extensions. The chief way in which PyCXX makes it easier -to write Python extensions is that it greatly increases the probability -that your program will not make a reference-counting error and will not -have to continually check error returns from the Python C API. CXX/Objects -integrates Python with C++ in these ways: -

-

- -
- -

PyCXX documentation is split into Python 3 -and Python 2 versions. The Python 3 documentation is the most accurate.

- -

Latest PyCXX README file.

- -
- - - - - diff --git a/Import/pycxx-7.0.3/SourceForge/style.css b/Import/pycxx-7.0.3/SourceForge/style.css deleted file mode 120000 index 5b7446375d56674ca7469281b0e1039ccad7e8ab..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/SourceForge/style.css +++ /dev/null @@ -1 +0,0 @@ -../Doc/Python3/style.css \ No newline at end of file diff --git a/Import/pycxx-7.0.3/build-all.cmd b/Import/pycxx-7.0.3/build-all.cmd deleted file mode 100644 index 534884e85edb38de7146d2fc15a2977ee3866e77..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/build-all.cmd +++ /dev/null @@ -1,67 +0,0 @@ -if not "%1%2" == "" goto :build_%1_%2 - -:build_27_32 - setlocal - call "%LOCALAPPDATA%\Programs\Common\Microsoft\Visual C++ for Python\9.0\vcvarsall.bat" x86 - if exist c:\python27.win32\python.exe ( - c:\python27.win32\python setup_makefile.py win32 win32.mak - nmake -f win32.mak clean all 2>&1 | c:\unxutils\tee tmp-win32-python27-build.log - nmake -f win32.mak test 2>&1 | c:\unxutils\tee tmp-win32-python27-test.log - ) - endlocal -if not "%1%2" == "" goto :eof - -:build_33_32 - setlocal - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" - if exist c:\python33.win32\python.exe ( - c:\python33.win32\python setup_makefile.py win32 win32.mak - nmake -f win32.mak clean all 2>&1 | c:\unxutils\tee tmp-win32-python33-build.log - nmake -f win32.mak test 2>&1 | c:\unxutils\tee tmp-win32-python33-test.log - ) - endlocal -if not "%1%2" == "" goto :eof - -:build_34_32 - setlocal - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" - if exist c:\python34.win32\python.exe ( - c:\python34.win32\python setup_makefile.py win32 win32.mak - nmake -f win32.mak clean all 2>&1 | c:\unxutils\tee tmp-win32-python34-build.log - nmake -f win32.mak test 2>&1 | c:\unxutils\tee tmp-win32-python34-test.log - ) - endlocal -if not "%1%2" == "" goto :eof - -:build_35_32 - setlocal - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" - if exist c:\python35.win32\python.exe ( - c:\python35.win32\python setup_makefile.py win32 win32.mak - nmake -f win32.mak clean all 2>&1 | c:\unxutils\tee tmp-win32-python35-build.log - nmake -f win32.mak test 2>&1 | c:\unxutils\tee tmp-win32-python35-test.log - ) - endlocal -if not "%1%2" == "" goto :eof - -:build_27_64 - setlocal - call "%LOCALAPPDATA%\Programs\Common\Microsoft\Visual C++ for Python\9.0\vcvarsall.bat" x64 - if exist c:\python27.win64\python.exe ( - c:\python27.win64\python setup_makefile.py win64 win64.mak - nmake -f win64.mak clean all 2>&1 | c:\unxutils\tee tmp-win64-python27-build.log - nmake -f win64.mak test 2>&1 | c:\unxutils\tee tmp-win64-python27-test.log - ) - endlocal -if not "%1%2" == "" goto :eof - -:build_35_64 - setlocal - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" - if exist c:\python35.win64\python.exe ( - c:\python35.win64\python setup_makefile.py win64 win64.mak - nmake -f win64.mak clean all 2>&1 | c:\unxutils\tee tmp-win64-python35-build.log - nmake -f win64.mak test 2>&1 | c:\unxutils\tee tmp-win64-python35-test.log - ) - endlocal -if not "%1%2" == "" goto :eof diff --git a/Import/pycxx-7.0.3/build-all.sh b/Import/pycxx-7.0.3/build-all.sh deleted file mode 100755 index 6d454875bf9a1e11266b8ddda272daa3ccb0e7c9..0000000000000000000000000000000000000000 --- a/Import/pycxx-7.0.3/build-all.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -case "$( uname )" in -Darwin) - OS=macosx - ;; -Linux): - OS=linux - ;; -*) - echo Unknown OS assuming Linux - OS=linux - ;; -esac - -for PYTHON in \ - python2.6 \ - python2.7 \ - python3.3 \ - python3.4 \ - python3.5 \ - python3.6 \ - ; -do - if which $PYTHON >/dev/null - then - echo "Info: Found ${PYTHON}" - ${PYTHON} setup_makefile.py ${OS} tmp-$PYTHON.mak - make -f tmp-$PYTHON.mak clean 2>&1 | tee tmp-$PYTHON.log - make -f tmp-$PYTHON.mak test 2>&1 | tee -a tmp-$PYTHON.log - fi -done diff --git a/Import/pycxx-7.0.3/COPYRIGHT b/Import/pycxx-7.1.0/COPYRIGHT similarity index 100% rename from Import/pycxx-7.0.3/COPYRIGHT rename to Import/pycxx-7.1.0/COPYRIGHT diff --git a/Import/pycxx-7.0.3/CXX/Config.hxx b/Import/pycxx-7.1.0/CXX/Config.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Config.hxx rename to Import/pycxx-7.1.0/CXX/Config.hxx diff --git a/Import/pycxx-7.0.3/CXX/CxxDebug.hxx b/Import/pycxx-7.1.0/CXX/CxxDebug.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/CxxDebug.hxx rename to Import/pycxx-7.1.0/CXX/CxxDebug.hxx diff --git a/Import/pycxx-7.0.3/CXX/Exception.hxx b/Import/pycxx-7.1.0/CXX/Exception.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Exception.hxx rename to Import/pycxx-7.1.0/CXX/Exception.hxx diff --git a/Import/pycxx-7.0.3/CXX/Extensions.hxx b/Import/pycxx-7.1.0/CXX/Extensions.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Extensions.hxx rename to Import/pycxx-7.1.0/CXX/Extensions.hxx diff --git a/Import/pycxx-7.0.3/CXX/IndirectPythonInterface.hxx b/Import/pycxx-7.1.0/CXX/IndirectPythonInterface.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/IndirectPythonInterface.hxx rename to Import/pycxx-7.1.0/CXX/IndirectPythonInterface.hxx diff --git a/Import/pycxx-7.0.3/CXX/Objects.hxx b/Import/pycxx-7.1.0/CXX/Objects.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Objects.hxx rename to Import/pycxx-7.1.0/CXX/Objects.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/Config.hxx b/Import/pycxx-7.1.0/CXX/Python2/Config.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/Config.hxx rename to Import/pycxx-7.1.0/CXX/Python2/Config.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/CxxDebug.hxx b/Import/pycxx-7.1.0/CXX/Python2/CxxDebug.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/CxxDebug.hxx rename to Import/pycxx-7.1.0/CXX/Python2/CxxDebug.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/Exception.hxx b/Import/pycxx-7.1.0/CXX/Python2/Exception.hxx similarity index 98% rename from Import/pycxx-7.0.3/CXX/Python2/Exception.hxx rename to Import/pycxx-7.1.0/CXX/Python2/Exception.hxx index 84b7e8c662b5e22a8a85991a04a409655f50ad8e..d9d05f9fd3458e2dd31089dbd661382deeae86ae 100644 --- a/Import/pycxx-7.0.3/CXX/Python2/Exception.hxx +++ b/Import/pycxx-7.1.0/CXX/Python2/Exception.hxx @@ -81,6 +81,10 @@ namespace Py : BaseException( exception, reason ) {} + Exception( PyObject *exception, Object &reason ) + : BaseException ( exception, reason ) + {} + Exception( PyObject *exception, const std::string &reason ) : BaseException( exception, reason ) {} diff --git a/Import/pycxx-7.0.3/CXX/Python2/ExtensionModule.hxx b/Import/pycxx-7.1.0/CXX/Python2/ExtensionModule.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/ExtensionModule.hxx rename to Import/pycxx-7.1.0/CXX/Python2/ExtensionModule.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/ExtensionOldType.hxx b/Import/pycxx-7.1.0/CXX/Python2/ExtensionOldType.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/ExtensionOldType.hxx rename to Import/pycxx-7.1.0/CXX/Python2/ExtensionOldType.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/ExtensionType.hxx b/Import/pycxx-7.1.0/CXX/Python2/ExtensionType.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/ExtensionType.hxx rename to Import/pycxx-7.1.0/CXX/Python2/ExtensionType.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/ExtensionTypeBase.hxx b/Import/pycxx-7.1.0/CXX/Python2/ExtensionTypeBase.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/ExtensionTypeBase.hxx rename to Import/pycxx-7.1.0/CXX/Python2/ExtensionTypeBase.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/Extensions.hxx b/Import/pycxx-7.1.0/CXX/Python2/Extensions.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/Extensions.hxx rename to Import/pycxx-7.1.0/CXX/Python2/Extensions.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/IndirectPythonInterface.hxx b/Import/pycxx-7.1.0/CXX/Python2/IndirectPythonInterface.hxx similarity index 98% rename from Import/pycxx-7.0.3/CXX/Python2/IndirectPythonInterface.hxx rename to Import/pycxx-7.1.0/CXX/Python2/IndirectPythonInterface.hxx index e2ee7257b1c28d9235f222b79a9214557b47ccfd..ba74194be0d891d018762c5093cbdc04234b060c 100644 --- a/Import/pycxx-7.0.3/CXX/Python2/IndirectPythonInterface.hxx +++ b/Import/pycxx-7.1.0/CXX/Python2/IndirectPythonInterface.hxx @@ -153,7 +153,9 @@ int &_Py_VerboseFlag(); void _XINCREF( PyObject *op ); void _XDECREF( PyObject *op ); +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) char *__Py_PackageContext(); +#endif } #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ diff --git a/Import/pycxx-7.0.3/CXX/Python2/Objects.hxx b/Import/pycxx-7.1.0/CXX/Python2/Objects.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/Objects.hxx rename to Import/pycxx-7.1.0/CXX/Python2/Objects.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python2/PythonType.hxx b/Import/pycxx-7.1.0/CXX/Python2/PythonType.hxx similarity index 98% rename from Import/pycxx-7.0.3/CXX/Python2/PythonType.hxx rename to Import/pycxx-7.1.0/CXX/Python2/PythonType.hxx index dce6917a5c59071fcb085f50cc8c198aa7b2ab1e..7f26d876ac56308e11203bf0fadf8a50021555cc 100644 --- a/Import/pycxx-7.0.3/CXX/Python2/PythonType.hxx +++ b/Import/pycxx-7.1.0/CXX/Python2/PythonType.hxx @@ -183,11 +183,6 @@ namespace Py bool readyType(); protected: - void init_sequence(); - void init_mapping(); - void init_number(); - void init_buffer(); - PyTypeObject *table; PySequenceMethods *sequence_table; PyMappingMethods *mapping_table; diff --git a/Import/pycxx-7.0.3/CXX/Python2/cxx_standard_exceptions.hxx b/Import/pycxx-7.1.0/CXX/Python2/cxx_standard_exceptions.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python2/cxx_standard_exceptions.hxx rename to Import/pycxx-7.1.0/CXX/Python2/cxx_standard_exceptions.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python3/Config.hxx b/Import/pycxx-7.1.0/CXX/Python3/Config.hxx similarity index 95% rename from Import/pycxx-7.0.3/CXX/Python3/Config.hxx rename to Import/pycxx-7.1.0/CXX/Python3/Config.hxx index 10c611fb5354c4342ab18a41406b15d55617fe0c..25fb1d4fb249b5051762ccbac08ef1f45b1c32da 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/Config.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/Config.hxx @@ -38,6 +38,10 @@ #ifndef __PyCXX_config_hh__ #define __PyCXX_config_hh__ +#if defined( Py_LIMITED_API ) && Py_LIMITED_API+0 < 0x03040000 +#error "PyCXX support for Python limited API requires version 3.4 or newer. Py_LIMITED_API=0x03040000" +#endif + // // Microsoft VC++ 6.0 has no traits // diff --git a/Import/pycxx-7.0.3/CXX/Python3/CxxDebug.hxx b/Import/pycxx-7.1.0/CXX/Python3/CxxDebug.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python3/CxxDebug.hxx rename to Import/pycxx-7.1.0/CXX/Python3/CxxDebug.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python3/Exception.hxx b/Import/pycxx-7.1.0/CXX/Python3/Exception.hxx similarity index 98% rename from Import/pycxx-7.0.3/CXX/Python3/Exception.hxx rename to Import/pycxx-7.1.0/CXX/Python3/Exception.hxx index b75bbe78d96c6a16f70c7ce032dd94d76cdf1a5e..6289f7f8429983b312d47166ac020c86c587f2a6 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/Exception.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/Exception.hxx @@ -85,6 +85,10 @@ namespace Py : BaseException( exception, reason ) {} + Exception( PyObject *exception, Object &reason ) + : BaseException( exception, reason ) + {} + Exception( PyObject *exception, const std::string &reason ) : BaseException( exception, reason ) {} diff --git a/Import/pycxx-7.0.3/CXX/Python3/ExtensionModule.hxx b/Import/pycxx-7.1.0/CXX/Python3/ExtensionModule.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python3/ExtensionModule.hxx rename to Import/pycxx-7.1.0/CXX/Python3/ExtensionModule.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python3/ExtensionOldType.hxx b/Import/pycxx-7.1.0/CXX/Python3/ExtensionOldType.hxx similarity index 99% rename from Import/pycxx-7.0.3/CXX/Python3/ExtensionOldType.hxx rename to Import/pycxx-7.1.0/CXX/Python3/ExtensionOldType.hxx index c41013c79ddacfd0f64142dfd9f79842cfd4ee87..085f9278d1b4ab52e395557e97402816e32d70f4 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/ExtensionOldType.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/ExtensionOldType.hxx @@ -119,15 +119,19 @@ namespace Py { std::string name( _name ); +#if !defined( Py_LIMITED_API ) if( name == "__name__" && type_object()->tp_name != NULL ) { return Py::String( type_object()->tp_name ); } +#endif +#if !defined( Py_LIMITED_API ) if( name == "__doc__" && type_object()->tp_doc != NULL ) { return Py::String( type_object()->tp_doc ); } +#endif // trying to fake out being a class for help() // else if( name == "__bases__" ) diff --git a/Import/pycxx-7.0.3/CXX/Python3/ExtensionType.hxx b/Import/pycxx-7.1.0/CXX/Python3/ExtensionType.hxx similarity index 97% rename from Import/pycxx-7.0.3/CXX/Python3/ExtensionType.hxx rename to Import/pycxx-7.1.0/CXX/Python3/ExtensionType.hxx index b8e5846548522be6fc9f5a2d45007a4542756c9a..6fd7fea41584a28309c3d9059ec49a2638547462 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/ExtensionType.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/ExtensionType.hxx @@ -246,10 +246,15 @@ namespace Py #ifdef PYCXX_DEBUG std::cout << "extension_object_new()" << std::endl; #endif - PythonClassInstance *o = reinterpret_cast( subtype->tp_alloc( subtype, 0 ) ); - if( o == NULL ) +#if defined( Py_LIMITED_API ) + PyObject *object = reinterpret_cast( PyType_GetSlot( subtype, Py_tp_alloc ) )( subtype, 0 ); +#else + PyObject *object = subtype->tp_alloc( subtype, 0 ); +#endif + if( object == NULL ) return NULL; + PythonClassInstance *o = reinterpret_cast( object ); o->m_pycxx_object = NULL; PyObject *self = reinterpret_cast( o ); @@ -304,7 +309,12 @@ namespace Py std::cout << " self->m_pycxx_object=0x" << std::hex << reinterpret_cast< unsigned long >( self->m_pycxx_object ) << std::dec << std::endl; #endif delete self->m_pycxx_object; +#ifdef Py_LIMITED_API + freefunc fn = reinterpret_cast( PyType_GetSlot( _self->ob_type, Py_tp_free ) ); + fn( _self ); +#else _self->ob_type->tp_free( _self ); +#endif } public: diff --git a/Import/pycxx-7.0.3/CXX/Python3/ExtensionTypeBase.hxx b/Import/pycxx-7.1.0/CXX/Python3/ExtensionTypeBase.hxx similarity index 98% rename from Import/pycxx-7.0.3/CXX/Python3/ExtensionTypeBase.hxx rename to Import/pycxx-7.1.0/CXX/Python3/ExtensionTypeBase.hxx index c54409ea4b053e6462b8c2e1f88a701a0c7a1b57..d58bdfb1c2d612a2f8123b62fb14e1ca8a6c20b8 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/ExtensionTypeBase.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/ExtensionTypeBase.hxx @@ -70,7 +70,7 @@ namespace Py virtual void reinit( Tuple &args, Dict &kwds ); // object basics -#ifdef PYCXX_PYTHON_2TO3 +#if defined( PYCXX_PYTHON_2TO3 ) && !defined( Py_LIMITED_API ) virtual int print( FILE *, int ); #endif virtual Object getattr( const char * ); @@ -127,9 +127,11 @@ namespace Py virtual Object number_or( const Object & ); virtual Object number_power( const Object &, const Object & ); +#if !defined( Py_LIMITED_API ) // Buffer virtual int buffer_get( Py_buffer *, int flags ); virtual int buffer_release( Py_buffer *buf ); +#endif public: // helper functions to call function fn_name with 0 to 9 args diff --git a/Import/pycxx-7.0.3/CXX/Python3/Extensions.hxx b/Import/pycxx-7.1.0/CXX/Python3/Extensions.hxx similarity index 100% rename from Import/pycxx-7.0.3/CXX/Python3/Extensions.hxx rename to Import/pycxx-7.1.0/CXX/Python3/Extensions.hxx diff --git a/Import/pycxx-7.0.3/CXX/Python3/IndirectPythonInterface.hxx b/Import/pycxx-7.1.0/CXX/Python3/IndirectPythonInterface.hxx similarity index 91% rename from Import/pycxx-7.0.3/CXX/Python3/IndirectPythonInterface.hxx rename to Import/pycxx-7.1.0/CXX/Python3/IndirectPythonInterface.hxx index 6163536eb1729ea89ec0660df3ae5fffc65f8af9..a8c8425c3ef3e82ff4fe9762af53854639a9f2eb 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/IndirectPythonInterface.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/IndirectPythonInterface.hxx @@ -36,9 +36,9 @@ //----------------------------------------------------------------------------- #ifndef __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ -#define __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ +# define __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ -#include "CXX/WrapPython.h" +# include "CXX/WrapPython.h" namespace Py { @@ -49,11 +49,11 @@ bool InitialisePythonIndirectInterface(); // PyObject * _Exc_BaseException(); -#define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) \ +# define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) \ PyObject * _Exc_##eclass(); -#include "CXX/Python3/cxx_standard_exceptions.hxx" -#undef PYCXX_STANDARD_EXCEPTION +# include "CXX/Python3/cxx_standard_exceptions.hxx" +# undef PYCXX_STANDARD_EXCEPTION // // Wrap Object variables as function calls @@ -78,9 +78,14 @@ bool _Class_Check( PyObject *op ); PyTypeObject * _Instance_Type(); bool _Instance_Check( PyObject *op ); +# if !defined( Py_LIMITED_API ) PyTypeObject * _Method_Type(); bool _Method_Check( PyObject *op ); +PyTypeObject * _Function_Type(); +bool _Function_Check( PyObject *op ); +# endif + PyTypeObject * _Complex_Type(); bool _Complex_Check( PyObject *op ); @@ -96,9 +101,6 @@ bool _Float_Check( PyObject *op ); PyTypeObject * _Frame_Type(); bool _Frame_Check( PyObject *op ); -PyTypeObject * _Function_Type(); -bool _Function_Check( PyObject *op ); - PyTypeObject * _Bool_Type(); bool _Boolean_Check( PyObject *op ); @@ -138,18 +140,23 @@ bool _TraceBack_Check( PyObject *v ); PyTypeObject * _Tuple_Type(); bool _Tuple_Check( PyObject *op ); +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) int &_Py_DebugFlag(); int &_Py_InteractiveFlag(); int &_Py_OptimizeFlag(); int &_Py_NoSiteFlag(); int &_Py_TabcheckFlag(); int &_Py_VerboseFlag(); -int &_Py_UnicodeFlag(); + +# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 +const char *__Py_PackageContext(); +# else +char *__Py_PackageContext(); +# endif +# endif void _XINCREF( PyObject *op ); void _XDECREF( PyObject *op ); - -char *__Py_PackageContext(); }; #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ diff --git a/Import/pycxx-7.0.3/CXX/Python3/Objects.hxx b/Import/pycxx-7.1.0/CXX/Python3/Objects.hxx similarity index 98% rename from Import/pycxx-7.0.3/CXX/Python3/Objects.hxx rename to Import/pycxx-7.1.0/CXX/Python3/Objects.hxx index 157db5712368c15d0b1028147a740c26ce3974e1..a55420fd9a462279bc0d201f559ec96ed2dff3ff 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/Objects.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/Objects.hxx @@ -1008,6 +1008,8 @@ namespace Py { return pyob && Py::_Complex_Check( pyob ); } + +#if !defined( Py_LIMITED_API ) // convert to Py_complex operator Py_complex() const { @@ -1019,6 +1021,8 @@ namespace Py set( PyComplex_FromCComplex( v ), true ); return *this; } +#endif // Py_LIMITED_API + // assign from a double Complex &operator=( double v ) { @@ -1054,6 +1058,7 @@ namespace Py return PyComplex_ImagAsDouble( ptr() ); } }; + // Sequences // Sequences are here represented as sequences of items of type T. // The base class SeqBase represents that. @@ -1754,10 +1759,12 @@ namespace Py // Python strings return strings as individual elements. // I'll try having a class Char which is a String of length 1 // +#if !defined(Py_LIMITED_API) typedef std::basic_string unicodestring; - typedef std::basic_string ucs4string; - extern Py_UNICODE unicode_null_string[1]; +#endif + typedef std::basic_string ucs4string; + extern Py_UCS4 ucs4_null_string[1]; class Byte: public Object { @@ -1948,17 +1955,21 @@ namespace Py validate(); } +#if !defined( Py_LIMITED_API ) Char( Py_UNICODE v ) : Object( PyUnicode_FromOrdinal( v ), true ) { validate(); } +#endif +#if !defined( Py_LIMITED_API ) Char( const unicodestring &v ) : Object( PyUnicode_FromUnicode( const_cast( v.data() ),1 ), true ) { validate(); } +#endif // Assignment acquires new ownership of pointer Char &operator=( const Object &rhs ) @@ -1973,32 +1984,55 @@ namespace Py return *this; } +#if !defined( Py_LIMITED_API ) Char &operator=( const unicodestring &v ) { set( PyUnicode_FromUnicode( const_cast( v.data() ), 1 ), true ); return *this; } +#endif +#if !defined( Py_LIMITED_API ) Char &operator=( int v_ ) { Py_UNICODE v( static_cast( v_ ) ); set( PyUnicode_FromUnicode( &v, 1 ), true ); return *this; } +#endif +#if !defined( Py_LIMITED_API ) Char &operator=( Py_UNICODE v ) { set( PyUnicode_FromUnicode( &v, 1 ), true ); return *this; } +#endif long ord() { - if( PyUnicode_READY( ptr() ) == -1 ) +#if !defined( Py_LIMITED_API ) + return static_cast( PyUnicode_ReadChar( ptr(), 0 ) ); +#else + // we know that a Char() is 1 unicode code point + // that fits in 2 wchar_t on windows at worst + wchar_t buf[2]; + Py_ssize_t num_elements = PyUnicode_AsWideChar( ptr(), buf, 2 ); + + // just one wchar_t that easy + if( num_elements == 1 ) + { + return static_cast( buf[0] ); + } + // must be a pair of utf-16 surragates - convert to a code point + if( num_elements == 2 ) { - throw RuntimeError( "Char::ord() PyUnicode_READY() failed." ); + // convert from utf-16 to a code-point + return static_cast( ((buf[0]-0xd800)*0x400) + (buf[1]-0xdc00) + 0x10000); } - return static_cast( PyUnicode_READ_CHAR( ptr(), 0 ) ); + return 0; +#endif + } // Conversion @@ -2090,7 +2124,7 @@ namespace Py validate(); } -#if !defined( Py_UNICODE_WIDE ) +#if !defined( Py_LIMITED_API ) && !defined( Py_UNICODE_WIDE ) // Need these c'tors becuase Py_UNICODE is 2 bytes // User may use "int" or "unsigned int" as the unicode type String( const unsigned int *s, int length ) @@ -2106,11 +2140,13 @@ namespace Py } #endif +#if !defined( Py_LIMITED_API ) String( const Py_UNICODE *s, int length ) : SeqBase( PyUnicode_FromUnicode( s, length ), true ) { validate(); } +#endif // Assignment acquires new ownership of pointer String &operator=( const Object &rhs ) @@ -2125,13 +2161,15 @@ namespace Py return *this; } +#if !defined( Py_LIMITED_API ) String &operator=( const unicodestring &v ) { set( PyUnicode_FromUnicode( const_cast( v.data() ), v.length() ), true ); return *this; } +#endif -#if !defined( Py_UNICODE_WIDE ) +#if !defined( Py_UNICODE_WIDE ) && !defined( Py_LIMITED_API ) String &operator=( const ucs4string &v ) { set( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast( v.data() ), v.length() ), true ); @@ -2144,22 +2182,27 @@ namespace Py return Bytes( PyUnicode_AsEncodedString( ptr(), encoding, error ), true ); } +#if !defined( Py_LIMITED_API ) // Queries virtual size_type size() const { - return PyUnicode_GET_LENGTH( ptr() ); + return PyUnicode_GetLength( ptr() ); } +#endif +#if !defined( Py_LIMITED_API ) const Py_UNICODE *unicode_data() const { return PyUnicode_AS_UNICODE( ptr() ); } +#endif +#if !defined( Py_LIMITED_API ) unicodestring as_unicodestring() const { - return unicodestring( unicode_data(), PyUnicode_GET_SIZE( ptr() ) ); + return unicodestring( unicode_data(), PyUnicode_GetLength( ptr() ) ); } - +#endif ucs4string as_ucs4string() const { Py_UCS4 *buf = new Py_UCS4[ size() ]; diff --git a/Import/pycxx-7.0.3/CXX/Python3/PythonType.hxx b/Import/pycxx-7.1.0/CXX/Python3/PythonType.hxx similarity index 95% rename from Import/pycxx-7.0.3/CXX/Python3/PythonType.hxx rename to Import/pycxx-7.1.0/CXX/Python3/PythonType.hxx index 94f0aa4eaf4a9658c899802308d3ca39ea5ffbda..12012e13096dfe53c707c0b3bb5d985a2b9fb587 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/PythonType.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/PythonType.hxx @@ -38,6 +38,10 @@ #ifndef __CXX_PythonType__h #define __CXX_PythonType__h +#if defined( Py_LIMITED_API ) +#include +#endif + namespace Py { class PythonType @@ -57,7 +61,7 @@ namespace Py PythonType &doc( const char *d ); PythonType &supportClass( void ); -#ifdef PYCXX_PYTHON_2TO3 +#if defined( PYCXX_PYTHON_2TO3 ) && !defined( Py_LIMITED_API ) PythonType &supportPrint( void ); #endif PythonType &supportGetattr( void ); @@ -150,7 +154,7 @@ namespace Py support_number_int | support_number_float ); - +#if !defined( Py_LIMITED_API ) enum { support_buffer_getbuffer = B(0), support_buffer_releasebuffer = B(1) @@ -159,6 +163,7 @@ namespace Py support_buffer_getbuffer | support_buffer_releasebuffer ); +#endif #undef B PythonType &set_tp_dealloc( void (*tp_dealloc)( PyObject * ) ); @@ -170,16 +175,17 @@ namespace Py bool readyType(); protected: - void init_sequence(); - void init_mapping(); - void init_number(); - void init_buffer(); - +#if defined( Py_LIMITED_API ) + std::unordered_map slots; + PyType_Spec *spec; + PyTypeObject *tp_object; +#else PyTypeObject *table; PySequenceMethods *sequence_table; PyMappingMethods *mapping_table; PyNumberMethods *number_table; PyBufferProcs *buffer_table; +#endif private: // diff --git a/Import/pycxx-7.0.3/CXX/Python3/cxx_standard_exceptions.hxx b/Import/pycxx-7.1.0/CXX/Python3/cxx_standard_exceptions.hxx similarity index 72% rename from Import/pycxx-7.0.3/CXX/Python3/cxx_standard_exceptions.hxx rename to Import/pycxx-7.1.0/CXX/Python3/cxx_standard_exceptions.hxx index 4c53ad967d92725ebed1760196a405d27e60e8d1..c02bc0bad4f65600f5ab50edd00a69d933d3013a 100644 --- a/Import/pycxx-7.0.3/CXX/Python3/cxx_standard_exceptions.hxx +++ b/Import/pycxx-7.1.0/CXX/Python3/cxx_standard_exceptions.hxx @@ -16,7 +16,11 @@ PYCXX_STANDARD_EXCEPTION( GeneratorExit, BaseException ) PYCXX_STANDARD_EXCEPTION( Exception, BaseException ) #endif PYCXX_STANDARD_EXCEPTION( StopIteration, Exception ) -#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5 +#if !defined(MS_WINDOWS) && ((defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x03050000 && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5) || (!defined( Py_LIMITED_API ) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5)) +PYCXX_STANDARD_EXCEPTION( StopAsyncIteration, Exception ) +#endif +// Windows builds of python 3.5 do not export the symbol PyExc_StopAsyncIteration - need atleast 3.6 +#if defined(MS_WINDOWS) && ((defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x03050000 && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 6) || (!defined( Py_LIMITED_API ) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5)) PYCXX_STANDARD_EXCEPTION( StopAsyncIteration, Exception ) #endif PYCXX_STANDARD_EXCEPTION( ArithmeticError, Exception ) @@ -35,6 +39,7 @@ PYCXX_STANDARD_EXCEPTION( MemoryError, Exception ) PYCXX_STANDARD_EXCEPTION( NameError, Exception ) PYCXX_STANDARD_EXCEPTION( UnboundLocalError, NameError ) PYCXX_STANDARD_EXCEPTION( OSError, Exception ) +#if (defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x03060000 && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 6) || (!defined( Py_LIMITED_API ) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4) PYCXX_STANDARD_EXCEPTION( BlockingIOError, OSError ) PYCXX_STANDARD_EXCEPTION( ChildProcessError,OSError ) PYCXX_STANDARD_EXCEPTION( ConnectionError, OSError ) @@ -50,10 +55,15 @@ PYCXX_STANDARD_EXCEPTION( NotADirectoryError, OSError ) PYCXX_STANDARD_EXCEPTION( PermissionError, OSError ) PYCXX_STANDARD_EXCEPTION( ProcessLookupError, OSError ) PYCXX_STANDARD_EXCEPTION( TimeoutError, OSError ) +#endif PYCXX_STANDARD_EXCEPTION( ReferenceError, Exception ) PYCXX_STANDARD_EXCEPTION( RuntimeError, Exception ) PYCXX_STANDARD_EXCEPTION( NotImplementedError, RuntimeError ) -#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5 +#if !defined(MS_WINDOWS) && ((defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x03050000 && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5) || (!defined( Py_LIMITED_API ) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5)) +PYCXX_STANDARD_EXCEPTION( RecursionError, RuntimeError ) +#endif +// Windows builds of python 3.5 do not export the symbol PyExc_RecursionError - need atleast 3.6 +#if defined(MS_WINDOWS) && ((defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x03050000 && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 6) || (!defined( Py_LIMITED_API ) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5)) PYCXX_STANDARD_EXCEPTION( RecursionError, RuntimeError ) #endif PYCXX_STANDARD_EXCEPTION( SyntaxError, Exception ) diff --git a/Import/pycxx-7.0.3/CXX/Version.hxx b/Import/pycxx-7.1.0/CXX/Version.hxx similarity index 97% rename from Import/pycxx-7.0.3/CXX/Version.hxx rename to Import/pycxx-7.1.0/CXX/Version.hxx index 2dc2779e94a2aea3c67af8357c676b4b2fa3a3d9..fabce5f60ca09de4aa70d8be39f3e0115790f40f 100644 --- a/Import/pycxx-7.0.3/CXX/Version.hxx +++ b/Import/pycxx-7.1.0/CXX/Version.hxx @@ -39,8 +39,8 @@ #define __PyCXX_version_hxx__ #define PYCXX_VERSION_MAJOR 7 -#define PYCXX_VERSION_MINOR 0 -#define PYCXX_VERSION_PATCH 3 +#define PYCXX_VERSION_MINOR 1 +#define PYCXX_VERSION_PATCH 0 #define PYCXX_MAKEVERSION( major, minor, patch ) ((major<<16)|(minor<<8)|(patch)) #define PYCXX_VERSION PYCXX_MAKEVERSION( PYCXX_VERSION_MAJOR, PYCXX_VERSION_MINOR, PYCXX_VERSION_PATCH ) #endif diff --git a/Import/pycxx-7.0.3/CXX/WrapPython.h b/Import/pycxx-7.1.0/CXX/WrapPython.h similarity index 100% rename from Import/pycxx-7.0.3/CXX/WrapPython.h rename to Import/pycxx-7.1.0/CXX/WrapPython.h diff --git a/Import/pycxx-7.0.3/Demo/Python2/example.cxx b/Import/pycxx-7.1.0/Demo/Python2/example.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/example.cxx rename to Import/pycxx-7.1.0/Demo/Python2/example.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python2/example.def b/Import/pycxx-7.1.0/Demo/Python2/example.def similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/example.def rename to Import/pycxx-7.1.0/Demo/Python2/example.def diff --git a/Import/pycxx-7.0.3/Demo/Python2/pycxx_iter.cxx b/Import/pycxx-7.1.0/Demo/Python2/pycxx_iter.cxx similarity index 97% rename from Import/pycxx-7.0.3/Demo/Python2/pycxx_iter.cxx rename to Import/pycxx-7.1.0/Demo/Python2/pycxx_iter.cxx index 599d885dbc839756d45199ee34e65b70b5d82c15..22a71c483d0f45da3d5a1b142cf4f49bf3372966 100644 --- a/Import/pycxx-7.0.3/Demo/Python2/pycxx_iter.cxx +++ b/Import/pycxx-7.1.0/Demo/Python2/pycxx_iter.cxx @@ -10,6 +10,8 @@ void IterT::init_type() behaviors().supportIter(); // set entries in the Type Table behaviors().supportRepr(); add_varargs_method("reversed",&IterT::reversed,"reversed()"); + + behaviors().readyType(); } class MyIterModule : public Py::ExtensionModule diff --git a/Import/pycxx-7.0.3/Demo/Python2/pycxx_iter.hxx b/Import/pycxx-7.1.0/Demo/Python2/pycxx_iter.hxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/pycxx_iter.hxx rename to Import/pycxx-7.1.0/Demo/Python2/pycxx_iter.hxx diff --git a/Import/pycxx-7.0.3/Demo/Python2/python.cxx b/Import/pycxx-7.1.0/Demo/Python2/python.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/python.cxx rename to Import/pycxx-7.1.0/Demo/Python2/python.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python2/range.cxx b/Import/pycxx-7.1.0/Demo/Python2/range.cxx similarity index 99% rename from Import/pycxx-7.0.3/Demo/Python2/range.cxx rename to Import/pycxx-7.1.0/Demo/Python2/range.cxx index f36ddb33c44a1cebe083acd44d0132a721e8bd73..442e802d7c779c2406ce515df255ca8c077d83db 100644 --- a/Import/pycxx-7.0.3/Demo/Python2/range.cxx +++ b/Import/pycxx-7.1.0/Demo/Python2/range.cxx @@ -121,4 +121,6 @@ void range::init_type() add_varargs_method("assign", &range::assign); add_varargs_method("value", &range::value); add_varargs_method("reference_count", &range::reference_count); + + behaviors().readyType(); } diff --git a/Import/pycxx-7.0.3/Demo/Python2/range.hxx b/Import/pycxx-7.1.0/Demo/Python2/range.hxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/range.hxx rename to Import/pycxx-7.1.0/Demo/Python2/range.hxx diff --git a/Import/pycxx-7.0.3/Demo/Python2/rangetest.cxx b/Import/pycxx-7.1.0/Demo/Python2/rangetest.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/rangetest.cxx rename to Import/pycxx-7.1.0/Demo/Python2/rangetest.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python2/setup.py b/Import/pycxx-7.1.0/Demo/Python2/setup.py similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/setup.py rename to Import/pycxx-7.1.0/Demo/Python2/setup.py diff --git a/Import/pycxx-7.0.3/Demo/Python2/simple.cxx b/Import/pycxx-7.1.0/Demo/Python2/simple.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/simple.cxx rename to Import/pycxx-7.1.0/Demo/Python2/simple.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python2/test_example.py b/Import/pycxx-7.1.0/Demo/Python2/test_example.py similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/test_example.py rename to Import/pycxx-7.1.0/Demo/Python2/test_example.py diff --git a/Import/pycxx-7.0.3/Demo/Python2/test_pycxx_iter.py b/Import/pycxx-7.1.0/Demo/Python2/test_pycxx_iter.py similarity index 72% rename from Import/pycxx-7.0.3/Demo/Python2/test_pycxx_iter.py rename to Import/pycxx-7.1.0/Demo/Python2/test_pycxx_iter.py index 5856980f91e341d2825ddc28d6d7e6d77e138b15..aa2b5d645a6a4ffdeb2fa032187546c99dfa8384 100644 --- a/Import/pycxx-7.0.3/Demo/Python2/test_pycxx_iter.py +++ b/Import/pycxx-7.1.0/Demo/Python2/test_pycxx_iter.py @@ -11,8 +11,3 @@ for i in IT: print i, IT print "refcount of IT:",sys.getrefcount(IT) - -for i in IT.reversed(): - print i -print "refcount of IT:",sys.getrefcount(IT) - diff --git a/Import/pycxx-7.0.3/Demo/Python2/test_simple.py b/Import/pycxx-7.1.0/Demo/Python2/test_simple.py similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python2/test_simple.py rename to Import/pycxx-7.1.0/Demo/Python2/test_simple.py diff --git a/Import/pycxx-7.0.3/Demo/Python3/example.cxx b/Import/pycxx-7.1.0/Demo/Python3/example.cxx similarity index 98% rename from Import/pycxx-7.0.3/Demo/Python3/example.cxx rename to Import/pycxx-7.1.0/Demo/Python3/example.cxx index 9ce9f57067ce5205891a7e28d3046ab1460f2828..7ee63c0d2f74a5d566fa2273f233d380ba3cace3 100644 --- a/Import/pycxx-7.0.3/Demo/Python3/example.cxx +++ b/Import/pycxx-7.1.0/Demo/Python3/example.cxx @@ -121,20 +121,24 @@ void test_String() long v3 = c3.ord(); test_assert( "string ord value < 2^7", v3, long( 0x33 ) ); - Py::Char c4( 0x10ff00 ); + Py::Char c4( 0xd5 ); long v4 = c4.ord(); - test_assert( "string ord value > 2^16", v4, long( 0x10ff00 ) ); + test_assert( "string ord value < 2^8", v4, long( 0xd5 ) ); - Py::Char c5( 0xd5 ); + Py::Char c5( 0x10437 ); long v5 = c5.ord(); - test_assert( "string ord value < 2^8", v5, long( 0xd5 ) ); + test_assert( "string ord value > 2^16", v5, long( 0x10437 ) ); + + Py::Char c6( 0x10ff00 ); + long v6 = c6.ord(); + test_assert( "string ord value > 2^16", v6, long( 0x10ff00 ) ); // convert tests - Py::Char c6 = r2[5]; - test_assert( "string convert to std::string", c6, blank ); + Py::Char c7 = r2[5]; + test_assert( "string convert to std::string", c7, blank ); - Py::Char c7 = r2.front(); - Py::Char c8 = r2.back(); + Py::Char c8 = r2.front(); + Py::Char c9 = r2.back(); } void test_boolean() diff --git a/Import/pycxx-7.0.3/Demo/Python3/example.def b/Import/pycxx-7.1.0/Demo/Python3/example.def similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/example.def rename to Import/pycxx-7.1.0/Demo/Python3/example.def diff --git a/Import/pycxx-7.0.3/Demo/Python3/pycxx_iter.cxx b/Import/pycxx-7.1.0/Demo/Python3/pycxx_iter.cxx similarity index 95% rename from Import/pycxx-7.0.3/Demo/Python3/pycxx_iter.cxx rename to Import/pycxx-7.1.0/Demo/Python3/pycxx_iter.cxx index 9235a01fc3628c068e5c56a14df705a49e1ea09b..682baae35815d79130bbf92ad756e4e60ebe28d1 100644 --- a/Import/pycxx-7.0.3/Demo/Python3/pycxx_iter.cxx +++ b/Import/pycxx-7.1.0/Demo/Python3/pycxx_iter.cxx @@ -3,13 +3,14 @@ void IterT::init_type() { - behaviors().name( "IterT" ); + behaviors().name( "pycxx_iter.IterT" ); behaviors().doc( "IterT( ini_count )" ); // you must have overwritten the virtual functions // Py::Object iter() and Py::Object iternext() behaviors().supportIter(); // set entries in the Type Table behaviors().supportRepr(); add_varargs_method( "reversed", &IterT::reversed, "reversed()" ); + behaviors().readyType(); } class MyIterModule : public Py::ExtensionModule diff --git a/Import/pycxx-7.0.3/Demo/Python3/pycxx_iter.hxx b/Import/pycxx-7.1.0/Demo/Python3/pycxx_iter.hxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/pycxx_iter.hxx rename to Import/pycxx-7.1.0/Demo/Python3/pycxx_iter.hxx diff --git a/Import/pycxx-7.0.3/Demo/Python3/python.cxx b/Import/pycxx-7.1.0/Demo/Python3/python.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/python.cxx rename to Import/pycxx-7.1.0/Demo/Python3/python.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python3/range.cxx b/Import/pycxx-7.1.0/Demo/Python3/range.cxx similarity index 98% rename from Import/pycxx-7.0.3/Demo/Python3/range.cxx rename to Import/pycxx-7.1.0/Demo/Python3/range.cxx index eb4520bcaf9bf4ecdd554c5614017eaae91968e5..681ca9906d2ba61cdc7bd8caeee55bed9ed4c409 100644 --- a/Import/pycxx-7.0.3/Demo/Python3/range.cxx +++ b/Import/pycxx-7.1.0/Demo/Python3/range.cxx @@ -88,7 +88,7 @@ range *range::extend( Py_ssize_t k ) const std::string range::asString() const { std::OSTRSTREAM s; - s << "range(" << m_start << ", " << m_stop << ", " << m_step << ")" << std::ends; + s << "range(" << m_start << ", " << m_stop << ", " << m_step << ")"; return std::string( s.str() ); } @@ -185,7 +185,7 @@ Py::Object range::assign( const Py::Tuple &t ) void range::init_type() { - behaviors().name( "range" ); + behaviors().name( "example.range" ); behaviors().doc( "range objects: start, stop, step" ); behaviors().supportRepr(); behaviors().supportGetattr(); @@ -195,4 +195,6 @@ void range::init_type() add_varargs_method( "assign", &range::assign ); add_varargs_method( "value", &range::value ); add_varargs_method( "reference_count", &range::reference_count ); + + behaviors().readyType(); } diff --git a/Import/pycxx-7.0.3/Demo/Python3/range.hxx b/Import/pycxx-7.1.0/Demo/Python3/range.hxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/range.hxx rename to Import/pycxx-7.1.0/Demo/Python3/range.hxx diff --git a/Import/pycxx-7.0.3/Demo/Python3/rangetest.cxx b/Import/pycxx-7.1.0/Demo/Python3/rangetest.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/rangetest.cxx rename to Import/pycxx-7.1.0/Demo/Python3/rangetest.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python3/setup.py b/Import/pycxx-7.1.0/Demo/Python3/setup.py similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/setup.py rename to Import/pycxx-7.1.0/Demo/Python3/setup.py diff --git a/Import/pycxx-7.0.3/Demo/Python3/simple.cxx b/Import/pycxx-7.1.0/Demo/Python3/simple.cxx similarity index 98% rename from Import/pycxx-7.0.3/Demo/Python3/simple.cxx rename to Import/pycxx-7.1.0/Demo/Python3/simple.cxx index 54750683c03a8096f9c05a384496cb85544b8f11..9c2cd8a0022ee03c87d9f40d34ac60bb435744aa 100644 --- a/Import/pycxx-7.0.3/Demo/Python3/simple.cxx +++ b/Import/pycxx-7.1.0/Demo/Python3/simple.cxx @@ -47,7 +47,7 @@ public: static void init_type(void) { - behaviors().name( "new_style_class" ); + behaviors().name( "simple.new_style_class" ); behaviors().doc( "documentation for new_style_class class" ); behaviors().supportGetattro(); behaviors().supportSetattro(); @@ -169,13 +169,15 @@ public: static void init_type(void) { - behaviors().name( "old_style_class" ); + behaviors().name( "simple.old_style_class" ); behaviors().doc( "documentation for old_style_class class" ); behaviors().supportGetattr(); add_noargs_method( "old_style_class_func_noargs", &old_style_class::old_style_class_func_noargs ); add_varargs_method( "old_style_class_func_varargs", &old_style_class::old_style_class_func_varargs ); add_keyword_method( "old_style_class_func_keyword", &old_style_class::old_style_class_func_keyword ); + + behaviors().readyType(); } // override functions from PythonExtension diff --git a/Import/pycxx-7.0.3/Demo/Python3/simple2.cxx b/Import/pycxx-7.1.0/Demo/Python3/simple2.cxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/simple2.cxx rename to Import/pycxx-7.1.0/Demo/Python3/simple2.cxx diff --git a/Import/pycxx-7.0.3/Demo/Python3/test_assert.hxx b/Import/pycxx-7.1.0/Demo/Python3/test_assert.hxx similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/test_assert.hxx rename to Import/pycxx-7.1.0/Demo/Python3/test_assert.hxx diff --git a/Import/pycxx-7.0.3/Demo/Python3/test_example.py b/Import/pycxx-7.1.0/Demo/Python3/test_example.py similarity index 96% rename from Import/pycxx-7.0.3/Demo/Python3/test_example.py rename to Import/pycxx-7.1.0/Demo/Python3/test_example.py index dadbe0ddbf3c077667bb7fcc033b297fe1f3f71e..544f272507b7c4fbe22c96ed95668461fecab28a 100644 --- a/Import/pycxx-7.0.3/Demo/Python3/test_example.py +++ b/Import/pycxx-7.1.0/Demo/Python3/test_example.py @@ -37,5 +37,8 @@ import sys sys.path.insert( 0, 'pyds%d%d' % (sys.version_info[0], sys.version_info[1]) ) +sys.stdout.write( 'Info: ---- %s ----' % (sys.argv[0],) ) +sys.stdout.flush() + import example example.test() diff --git a/Import/pycxx-7.1.0/Demo/Python3/test_pycxx_iter.py b/Import/pycxx-7.1.0/Demo/Python3/test_pycxx_iter.py new file mode 100644 index 0000000000000000000000000000000000000000..1754da913ffb13c8fc6ad8bb43886f7e5b10bf95 --- /dev/null +++ b/Import/pycxx-7.1.0/Demo/Python3/test_pycxx_iter.py @@ -0,0 +1,19 @@ +import sys + +def message( msg ): + sys.stdout.write( msg ) + sys.stdout.write( '\n' ) + sys.stdout.flush() + +message( 'Info: ---- %s ----' % (sys.argv[0],) ) + +sys.path.insert( 0, 'pyds%d%d' % (sys.version_info[0], sys.version_info[1]) ) + +import pycxx_iter + +it = pycxx_iter.IterT( 5, 7 ) + +for i in it: + message( '%r %r' % (i, it) ) + +message( 'refcount of it: %d' % (sys.getrefcount( it ),) ) diff --git a/Import/pycxx-7.0.3/Demo/Python3/test_simple.py b/Import/pycxx-7.1.0/Demo/Python3/test_simple.py similarity index 56% rename from Import/pycxx-7.0.3/Demo/Python3/test_simple.py rename to Import/pycxx-7.1.0/Demo/Python3/test_simple.py index 9e08085dbc568f8833b6243b855df6d097a08f26..f9e3de5ad75b920c7c78d1c0cf2138a35eb46550 100644 --- a/Import/pycxx-7.0.3/Demo/Python3/test_simple.py +++ b/Import/pycxx-7.1.0/Demo/Python3/test_simple.py @@ -1,67 +1,75 @@ -print( 'TEST: import simple' ) +import sys + +def message( msg ): + sys.stdout.write( msg ) + sys.stdout.write( '\n' ) + sys.stdout.flush() + +message( 'Info: ---- %s ----' % (sys.argv[0],) ) + +message( 'TEST: import simple' ) import simple -print( 'TEST: call module functions' ) +message( 'TEST: call module functions' ) simple.func() simple.func( 4, 5 ) simple.func( 4, 5, name=6, value=7 ) def callback_good( arg ): - print( 'callback_good with %r' % (arg,) ) + message( 'callback_good with %r' % (arg,) ) return 'good result' -print( 'TEST: raise user defined exception' ) +message( 'TEST: raise user defined exception' ) try: raise simple.SimpleError( 'Testing simple error' ) except simple.SimpleError as e: - print( 'PASS SimpleError %s' % (e,) ) - + message( 'PASS SimpleError %s' % (e,) ) def callback_bad( arg ): - print( 'callback_bad with %r' % (arg,) ) + message( 'callback_bad with %r' % (arg,) ) raise ValueError( 'callback_bad error' ) def callback_raise_simple_error( arg ): - print( 'callback_bad with %r' % (arg,) ) + message( 'callback_bad with %r' % (arg,) ) raise simple.SimpleError( 'callback_raise_simple_error' ) -print( 'TEST: call C++ with Python callback_good' ) +message( 'TEST: call C++ with Python callback_good' ) answer = simple.func_with_callback( callback_good, 'fred' ) -print( 'PASS callback_good returned %r' % (answer,) ) +message( 'PASS callback_good returned %r' % (answer,) ) -print( 'TEST: call C++ with Python callback_bad' ) +message( 'TEST: call C++ with Python callback_bad' ) try: answer = simple.func_with_callback( callback_bad, 'fred' ) - print( 'FAILED callback_bad %r' % (answer,) ) + message( 'FAILED callback_bad %r' % (answer,) ) except Exception as e: - print( 'PASS callback_bad: error %s' % (e,) ) + message( 'PASS callback_bad: error %s' % (e,) ) -print( 'TEST: call C++ with Python callback_raise_simple_error' ) +message( 'TEST: call C++ with Python callback_raise_simple_error' ) try: answer = simple.func_with_callback( callback_raise_simple_error, 'fred' ) - print( 'FAIL callback_raise_simple_error returned %r' % (answer,) ) + message( 'FAIL callback_raise_simple_error returned %r' % (answer,) ) except simple.SimpleError as e: - print( 'PASS callback_raise_simple_error: %s' % (e,) ) + message( 'PASS callback_raise_simple_error: %s' % (e,) ) -print( 'TEST: call C++ that will catch SimpleError' ) +message( 'TEST: call C++ that will catch SimpleError' ) try: answer = simple.func_with_callback_catch_simple_error( callback_raise_simple_error, 'fred' ) - print( 'PASS func_with_callback_catch_simple_error returned %r' % (answer,) ) + message( 'PASS func_with_callback_catch_simple_error returned %r' % (answer,) ) except simple.SimpleError as e: - print( 'FAIL func_with_callback_catch_simple_error: %s' % (e,) ) + message( 'FAIL func_with_callback_catch_simple_error: %s' % (e,) ) -print( 'TEST: raise SimpleError' ) +message( 'TEST: raise SimpleError' ) try: raise simple.SimpleError( 'Hello!' ) except simple.SimpleError as e: - print( 'PASS caught SimpleError - %s' % (e,) ) + message( 'PASS caught SimpleError - %s' % (e,) ) -print( 'TEST: call old style class functions' ) +message( 'TEST: call old style class functions' ) old_style_class = simple.old_style_class() old_style_class.old_style_class_func_noargs() old_style_class.old_style_class_func_varargs() @@ -71,24 +79,24 @@ old_style_class.old_style_class_func_keyword( name=6, value=7 ) old_style_class.old_style_class_func_keyword( 4, 5 ) old_style_class.old_style_class_func_keyword( 4, 5, name=6, value=7 ) -print( 'TEST: Derived class functions' ) +message( 'TEST: Derived class functions' ) class Derived(simple.new_style_class): def __init__( self ): simple.new_style_class.__init__( self ) def derived_func( self, arg ): - print( 'derived_func' ) + message( 'derived_func' ) super().func_noargs() def derived_func_bad( self, arg ): - print( 'derived_func_bad' ) + message( 'derived_func_bad' ) raise ValueError( 'derived_func_bad value error' ) def func_noargs( self ): - print( 'derived func_noargs' ) + message( 'derived func_noargs' ) d = Derived() -print( dir( d ) ) +message( repr(dir( d )) ) d.derived_func( "arg" ) d.func_noargs() d.func_varargs() @@ -98,22 +106,22 @@ d.func_keyword( name=6, value=7 ) d.func_keyword( 4, 5 ) d.func_keyword( 4, 5, name=6, value=7 ) -print( d.value ) +message( d.value ) d.value = "a string" -print( d.value ) +message( d.value ) d.new_var = 99 d.func_varargs_call_member( "derived_func" ) result = d.func_varargs_call_member( "derived_func_bad" ) -print( 'derived_func_bad caught error: %r' % (result,) ) +message( 'derived_func_bad caught error: %r' % (result,) ) -print( 'TEST: pass derived class to C++ world' ) +message( 'TEST: pass derived class to C++ world' ) result = simple.derived_class_test( d, 5, 9 ) -print( 'derived_class_test result %r' % (result,) ) +message( 'derived_class_test result %r' % (result,) ) -print( 'TEST: new_style_class functions' ) +message( 'TEST: new_style_class functions' ) new_style_class = simple.new_style_class() -print( dir( new_style_class ) ) +message( repr(dir( new_style_class )) ) new_style_class.func_noargs() new_style_class.func_varargs() new_style_class.func_varargs( 4 ) @@ -124,13 +132,13 @@ new_style_class.func_keyword( 4, 5, name=6, value=7 ) try: new_style_class.func_noargs_raise_exception() - print( 'Error: did not raised RuntimeError' ) + message( 'Error: did not raised RuntimeError' ) sys.exit( 1 ) except RuntimeError as e: - print( 'Raised %r' % (str(e),) ) + message( 'Raised %r' % (str(e),) ) -print( 'TEST: dereference new style class' ) +message( 'TEST: dereference new style class' ) new_style_class = None diff --git a/Import/pycxx-7.0.3/Demo/Python3/test_simple2.py b/Import/pycxx-7.1.0/Demo/Python3/test_simple2.py similarity index 100% rename from Import/pycxx-7.0.3/Demo/Python3/test_simple2.py rename to Import/pycxx-7.1.0/Demo/Python3/test_simple2.py diff --git a/Import/pycxx-7.0.3/Doc/Python2/PyCXX.html b/Import/pycxx-7.1.0/Doc/Python2/PyCXX.html similarity index 99% rename from Import/pycxx-7.0.3/Doc/Python2/PyCXX.html rename to Import/pycxx-7.1.0/Doc/Python2/PyCXX.html index 28c390a01410660ef85562cad28cfd7816616922..6a99c1b237ef344c00f7a93d05fd98f0dd5a8b4c 100644 --- a/Import/pycxx-7.0.3/Doc/Python2/PyCXX.html +++ b/Import/pycxx-7.1.0/Doc/Python2/PyCXX.html @@ -1958,6 +1958,8 @@ support. Then we adds the methods.

"demonstrate how to document amethod"); add_varargs_method("assign", &range::assign); add_varargs_method("value", &range::value); + + behaviors().readyType(); } diff --git a/Import/pycxx-7.0.3/Doc/Python2/style.css b/Import/pycxx-7.1.0/Doc/Python2/style.css similarity index 100% rename from Import/pycxx-7.0.3/Doc/Python2/style.css rename to Import/pycxx-7.1.0/Doc/Python2/style.css diff --git a/Import/pycxx-7.0.3/Doc/Python3/PyCXX.html b/Import/pycxx-7.1.0/Doc/Python3/PyCXX.html similarity index 98% rename from Import/pycxx-7.0.3/Doc/Python3/PyCXX.html rename to Import/pycxx-7.1.0/Doc/Python3/PyCXX.html index f409941f6b394e6e88cf190a136852f86351f6af..a3bccd2f8805d614bc31a76cd1a4dc326cbf9c6b 100644 --- a/Import/pycxx-7.0.3/Doc/Python3/PyCXX.html +++ b/Import/pycxx-7.1.0/Doc/Python3/PyCXX.html @@ -20,6 +20,7 @@
  • Overview
  • Download and Installation
  • Example code
  • +
  • PyCXX - Supporting Python 3 limited API (PEP-384)
  • PyCXX - Supporting Python 2 and Python 3
  • Use of namespaces
  • Wrapper for standard objects: <CXX/Objects.hxx>
  • @@ -89,6 +90,8 @@ PyCXX Paul. -- Barry Scott.

    PyCXX Version 6.1 and later supports both Python 2 and Python 3.

    +

    PyCXX Version 7.1 and later support the Python 3 limited API (PEP-384).

    +

    PyCXX is a set of C++ facilities to make it easier to write Python extensions. The chief way in which PyCXX makes it easier to write Python extensions is that it greatly increases the probability that your program will not make a reference-counting error and @@ -156,6 +159,26 @@ can be used to build and run the example code.

    Demo/range.hxx, Demo/range.cxxImpliments the range object use by example.cxx. +

    PyCXX - Supporting Python 3 limited API (PEP-384)

    + +

    Starting with Python 3.4 and PyCXX 7.1.0 it is possible to create extensions that use +the Python limited API. (It was not possible to support Python 3.3)

    + +

    Choose the oldest version of python that you want support and the binary +extension will run in that version and all the newer versions.

    + +

    Define Py_LIMITED_API when compiling all your code and the PyCXX code.

    +

    The value of Py_LIMITED_API is the first python version that you want to support.

    +

    +

      +
    • Python 3.4 or later: Defined Py_LIMITED_API as 0x03040000 +
    • Python 3.5 or later: Defined Py_LIMITED_API as 0x03050000 +
    • etc. +
    + +

    Note: Some of the PyCXX API cannot be supported in the Py_LIMITED_API mode. +The header files only include classes and functions that can be supported.

    +

    PyCXX - Supporting Python 2 and Python 3

    It is possible to have common code that can be compiled to work with Python 2 or Python 3.

    @@ -2229,6 +2252,8 @@ support. Then we adds the methods.

    add_varargs_method( "amethod", &range::amethod, "demonstrate how to document amethod" ); add_varargs_method( "assign", &range::assign ); add_varargs_method( "value", &range::value ); + + behaviors().readyType(); }

    Do not forget to add the call range::init_type() to some module's init function. You will want diff --git a/Import/pycxx-7.0.3/Doc/Python3/make_contents.py b/Import/pycxx-7.1.0/Doc/Python3/make_contents.py similarity index 100% rename from Import/pycxx-7.0.3/Doc/Python3/make_contents.py rename to Import/pycxx-7.1.0/Doc/Python3/make_contents.py diff --git a/Import/pycxx-7.0.3/Doc/Python3/style.css b/Import/pycxx-7.1.0/Doc/Python3/style.css similarity index 100% rename from Import/pycxx-7.0.3/Doc/Python3/style.css rename to Import/pycxx-7.1.0/Doc/Python3/style.css diff --git a/Import/pycxx-7.0.3/Lib/__init__.py b/Import/pycxx-7.1.0/Lib/__init__.py similarity index 100% rename from Import/pycxx-7.0.3/Lib/__init__.py rename to Import/pycxx-7.1.0/Lib/__init__.py diff --git a/Import/pycxx-7.1.0/PyCXX-Release-Notes.txt b/Import/pycxx-7.1.0/PyCXX-Release-Notes.txt new file mode 100644 index 0000000000000000000000000000000000000000..a69a9db75c2e26d3554494dd600a11d15ed9ee9c --- /dev/null +++ b/Import/pycxx-7.1.0/PyCXX-Release-Notes.txt @@ -0,0 +1,5 @@ +Version: 7.1.0 (04-August-2018) + +Can now build with Py_LIMITED_API, requires Python 3.4 or later. + +Changes to support Python 3.7 diff --git a/Import/pycxx-7.0.3/README.html b/Import/pycxx-7.1.0/README.html similarity index 98% rename from Import/pycxx-7.0.3/README.html rename to Import/pycxx-7.1.0/README.html index a0145ee4fa8eb698c42764f2dfb203aa7b10e962..c68408c36ae85081c5c3790592827e4172a465df 100644 --- a/Import/pycxx-7.0.3/README.html +++ b/Import/pycxx-7.1.0/README.html @@ -74,6 +74,10 @@ p.param {background-color: #eeeeee; border-top: lightskyblue solid 4}

    Revision History

    +

    Version: 7.1.0 (24-August-2018)

    + +

    Add support for Py_LIMITED_API aka PEP-384

    +

    Version: 7.0.3 (23-April-2017)

    Update Py::Long to support long long consitently between Python2 and Python3.

    diff --git a/Import/pycxx-7.1.0/README.txt b/Import/pycxx-7.1.0/README.txt new file mode 100644 index 0000000000000000000000000000000000000000..2667a84725e7299379d6d6df080a9eadd7a64c9f --- /dev/null +++ b/Import/pycxx-7.1.0/README.txt @@ -0,0 +1,5 @@ +Version: 7.1.0 (24-August-2018) + +Can now build with Py_LIMITED_API, requires Python 3.4 or later. + +Changes to support Python 3.7 diff --git a/Import/pycxx-7.0.3/RegressionTests/mem-leak.py b/Import/pycxx-7.1.0/RegressionTests/mem-leak.py similarity index 100% rename from Import/pycxx-7.0.3/RegressionTests/mem-leak.py rename to Import/pycxx-7.1.0/RegressionTests/mem-leak.py diff --git a/Import/pycxx-7.0.3/Src/IndirectPythonInterface.cxx b/Import/pycxx-7.1.0/Src/IndirectPythonInterface.cxx similarity index 87% rename from Import/pycxx-7.0.3/Src/IndirectPythonInterface.cxx rename to Import/pycxx-7.1.0/Src/IndirectPythonInterface.cxx index de0ca7f47ae32aa31835696a318c550433cc9018..ca6238561cc960be72f77a63920655fed4615e5f 100644 --- a/Import/pycxx-7.0.3/Src/IndirectPythonInterface.cxx +++ b/Import/pycxx-7.1.0/Src/IndirectPythonInterface.cxx @@ -43,11 +43,15 @@ bool _CFunction_Check( PyObject *op ) { return op->ob_type == _CFunction_Type( bool _Complex_Check( PyObject *op ) { return op->ob_type == _Complex_Type(); } bool _Dict_Check( PyObject *op ) { return op->ob_type == _Dict_Type(); } bool _Float_Check( PyObject *op ) { return op->ob_type == _Float_Type(); } +#if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) bool _Function_Check( PyObject *op ) { return op->ob_type == _Function_Type(); } +#endif bool _Boolean_Check( PyObject *op ) { return op->ob_type == _Bool_Type(); } bool _List_Check( PyObject *op ) { return op->ob_type == _List_Type(); } bool _Long_Check( PyObject *op ) { return op->ob_type == _Long_Type(); } +#if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) bool _Method_Check( PyObject *op ) { return op->ob_type == _Method_Type(); } +#endif bool _Module_Check( PyObject *op ) { return op->ob_type == _Module_Type(); } bool _Range_Check( PyObject *op ) { return op->ob_type == _Range_Type(); } bool _Slice_Check( PyObject *op ) { return op->ob_type == _Slice_Type(); } @@ -66,32 +70,36 @@ bool _Bytes_Check( PyObject *op ) { return op->ob_type == _Bytes_Type(); } #if defined(PY_WIN32_DELAYLOAD_PYTHON_DLL) -#if defined(MS_WINDOWS) -#include +# if defined(MS_WINDOWS) +# include static HMODULE python_dll; -#define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) \ +# define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) \ static PyObject *ptr_Exc_##eclass = NULL; -#if PY_MAJOR_VERSION == 2 -#include "CXX/Python2/cxx_standard_exceptions.hxx" -#else -#include "CXX/Python3/cxx_standard_exceptions.hxx" -#endif +# if PY_MAJOR_VERSION == 2 +# include "CXX/Python2/cxx_standard_exceptions.hxx" +# else +# include "CXX/Python3/cxx_standard_exceptions.hxx" +# endif -#undef PYCXX_STANDARD_EXCEPTION +# undef PYCXX_STANDARD_EXCEPTION static PyTypeObject *ptr__CFunction_Type = NULL; static PyTypeObject *ptr__Complex_Type = NULL; static PyTypeObject *ptr__Dict_Type = NULL; static PyTypeObject *ptr__Float_Type = NULL; +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) static PyTypeObject *ptr__Function_Type = NULL; +# endif static PyTypeObject *ptr__Bool_Type = NULL; static PyTypeObject *ptr__List_Type = NULL; static PyTypeObject *ptr__Long_Type = NULL; +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) static PyTypeObject *ptr__Method_Type = NULL; +# endif static PyTypeObject *ptr__Module_Type = NULL; static PyTypeObject *ptr__Range_Type = NULL; static PyTypeObject *ptr__Slice_Type = NULL; @@ -99,15 +107,16 @@ static PyTypeObject *ptr__TraceBack_Type = NULL; static PyTypeObject *ptr__Tuple_Type = NULL; static PyTypeObject *ptr__Type_Type = NULL; static PyTypeObject *ptr__Unicode_Type = NULL; -#if PY_MAJOR_VERSION == 2 +# if PY_MAJOR_VERSION == 2 static PyTypeObject *ptr__Int_Type = NULL; static PyTypeObject *ptr__String_Type = NULL; static PyTypeObject *ptr__CObject_Type = NULL; -#endif -#if PY_MAJOR_VERSION >= 3 +# endif +# if PY_MAJOR_VERSION >= 3 static PyTypeObject *ptr__Bytes_Type = NULL; -#endif +# endif +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) static int *ptr_Py_DebugFlag = NULL; static int *ptr_Py_InteractiveFlag = NULL; static int *ptr_Py_OptimizeFlag = NULL; @@ -115,10 +124,11 @@ static int *ptr_Py_NoSiteFlag = NULL; static int *ptr_Py_VerboseFlag = NULL; static char **ptr__Py_PackageContext = NULL; +# endif -#ifdef Py_REF_DEBUG +# ifdef Py_REF_DEBUG int *ptr_Py_RefTotal; -#endif +# endif //-------------------------------------------------------------------------------- @@ -189,11 +199,11 @@ static char **GetCharPointer_as_CharPointerPointer( const char *name ) } -#ifdef _DEBUG +# ifdef _DEBUG static const char python_dll_name_format[] = "PYTHON%1.1d%1.1d_D.DLL"; -#else +# else static const char python_dll_name_format[] = "PYTHON%1.1d%1.1d.DLL"; -#endif +# endif //-------------------------------------------------------------------------------- bool InitialisePythonIndirectInterface() @@ -208,45 +218,51 @@ bool InitialisePythonIndirectInterface() try { -#ifdef Py_REF_DEBUG +# ifdef Py_REF_DEBUG ptr_Py_RefTotal = GetInt_as_IntPointer( "_Py_RefTotal" ); -#endif +# endif +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) ptr_Py_DebugFlag = GetInt_as_IntPointer( "Py_DebugFlag" ); ptr_Py_InteractiveFlag = GetInt_as_IntPointer( "Py_InteractiveFlag" ); ptr_Py_OptimizeFlag = GetInt_as_IntPointer( "Py_OptimizeFlag" ); ptr_Py_NoSiteFlag = GetInt_as_IntPointer( "Py_NoSiteFlag" ); ptr_Py_VerboseFlag = GetInt_as_IntPointer( "Py_VerboseFlag" ); ptr__Py_PackageContext = GetCharPointer_as_CharPointerPointer( "_Py_PackageContext" ); +# endif -#define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) +# define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) ptr_Exc_#eclass = GetPyTypeObject_As_PyTypeObjectPointer( "PyExc_" #eclass ); -#if PY_MAJOR_VERSION == 2 -#include "CXX/Python2/cxx_standard_exceptions.hxx" -#else -#include "CXX/Python3/cxx_standard_exceptions.hxx" -#endif +# if PY_MAJOR_VERSION == 2 +# include "CXX/Python2/cxx_standard_exceptions.hxx" +# else +# include "CXX/Python3/cxx_standard_exceptions.hxx" +# endif -#undef PYCXX_STANDARD_EXCEPTION +# undef PYCXX_STANDARD_EXCEPTION ptr__PyNone = GetPyObject_As_PyObjectPointer( "_Py_NoneStruct" ); -#if PY_MAJOR_VERSION == 2 +# if PY_MAJOR_VERSION == 2 ptr__PyFalse = GetPyObject_As_PyObjectPointer( "_Py_ZeroStruct" ); -#else +# else ptr__PyFalse = GetPyObject_As_PyObjectPointer( "_Py_FalseStruct" ); -#endif +# endif ptr__PyTrue = GetPyObject_As_PyObjectPointer( "_Py_TrueStruct" ); ptr__CFunction_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyCFunction_Type" ); ptr__Complex_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyComplex_Type" ); ptr__Dict_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyDict_Type" ); ptr__Float_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyFloat_Type" ); +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) ptr__Function_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyFunction_Type" ); +# endif ptr__Bool_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyBool_Type" ); ptr__List_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyList_Type" ); ptr__Long_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyLong_Type" ); +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) ptr__Method_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyMethod_Type" ); +# endif ptr__Module_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyModule_Type" ); ptr__Range_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyRange_Type" ); ptr__Slice_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PySlice_Type" ); @@ -254,14 +270,14 @@ bool InitialisePythonIndirectInterface() ptr__Tuple_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyTuple_Type" ); ptr__Type_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyType_Type" ); ptr__Unicode_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyUnicode_Type" ); -#if PY_MAJOR_VERSION == 2 +# if PY_MAJOR_VERSION == 2 ptr__String_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyString_Type" ); ptr__Int_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyInt_Type" ); ptr__CObject_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyCObject_Type" ); -#endif -#if PY_MAJOR_VERSION >= 3 +# endif +# if PY_MAJOR_VERSION >= 3 ptr__Bytes_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyBytes_Type" ); -#endif +# endif } catch( GetAddressException &e ) { @@ -298,17 +314,17 @@ PyObject *_Exc_NotImplementedError() { return ptr__Exc_NotImplementedError; } PyObject *_Exc_OSError() { return ptr__Exc_OSError; } PyObject *_Exc_OverflowError() { return ptr__Exc_OverflowError; } PyObject *_Exc_RuntimeError() { return ptr__Exc_RuntimeError; } -#if PY_MAJOR_VERSION == 2 +# if PY_MAJOR_VERSION == 2 PyObject *_Exc_StandardError() { return ptr__Exc_StandardError; } -#endif +# endif PyObject *_Exc_SyntaxError() { return ptr__Exc_SyntaxError; } PyObject *_Exc_SystemError() { return ptr__Exc_SystemError; } PyObject *_Exc_SystemExit() { return ptr__Exc_SystemExit; } PyObject *_Exc_TypeError() { return ptr__Exc_TypeError; } PyObject *_Exc_ValueError() { return ptr__Exc_ValueError; } -#ifdef MS_WINDOWS +# ifdef MS_WINDOWS PyObject *_Exc_WindowsError() { return ptr__Exc_WindowsError; } -#endif +# endif PyObject *_Exc_ZeroDivisionError() { return ptr__Exc_ZeroDivisionError; } PyObject *_Exc_IndentationError() { return ptr__Exc_IndentationError; } PyObject *_Exc_TabError() { return ptr__Exc_TabError; } @@ -327,11 +343,15 @@ PyTypeObject *_CFunction_Type() { return ptr__CFunction_Type; } PyTypeObject *_Complex_Type() { return ptr__Complex_Type; } PyTypeObject *_Dict_Type() { return ptr__Dict_Type; } PyTypeObject *_Float_Type() { return ptr__Float_Type; } +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) PyTypeObject *_Function_Type() { return ptr__Function_Type; } +# endif PyTypeObject *_Bool_Type() { return ptr__Bool_Type; } PyTypeObject *_List_Type() { return ptr__List_Type; } PyTypeObject *_Long_Type() { return ptr__Long_Type; } +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) PyTypeObject *_Method_Type() { return ptr__Method_Type; } +# endif PyTypeObject *_Module_Type() { return ptr__Module_Type; } PyTypeObject *_Range_Type() { return ptr__Range_Type; } PyTypeObject *_Slice_Type() { return ptr__Slice_Type; } @@ -339,39 +359,40 @@ PyTypeObject *_TraceBack_Type() { return ptr__TraceBack_Type; } PyTypeObject *_Tuple_Type() { return ptr__Tuple_Type; } PyTypeObject *_Type_Type() { return ptr__Type_Type; } PyTypeObject *_Unicode_Type() { return ptr__Unicode_Type; } -#if PY_MAJOR_VERSION == 2 +# if PY_MAJOR_VERSION == 2 PyTypeObject *_String_Type() { return ptr__String_Type; } PyTypeObject *_Int_Type() { return ptr__Int_Type; } PyTypeObject *_CObject_Type() { return ptr__CObject_Type; } -#endif -#if PY_MAJOR_VERSION >= 3 +# endif +# if PY_MAJOR_VERSION >= 3 PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } -#endif - -char *__Py_PackageContext() { return *ptr__Py_PackageContext; } - +# endif // // wrap the Python Flag variables // +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) int &_Py_DebugFlag() { return *ptr_Py_DebugFlag; } int &_Py_InteractiveFlag() { return *ptr_Py_InteractiveFlag; } int &_Py_OptimizeFlag() { return *ptr_Py_OptimizeFlag; } int &_Py_NoSiteFlag() { return *ptr_Py_NoSiteFlag; } int &_Py_VerboseFlag() { return *ptr_Py_VerboseFlag; } +# endif -#if 0 -#define Py_INCREF(op) ( \ +char *__Py_PackageContext() { return *ptr__Py_PackageContext; } + +# if 0 +# define Py_INCREF(op) ( \ _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \ ((PyObject*)(op))->ob_refcnt++) -#define Py_DECREF(op) \ +# define Py_DECREF(op) \ if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ --((PyObject*)(op))->ob_refcnt != 0) \ _Py_CHECK_REFCNT(op) \ else \ _Py_Dealloc((PyObject *)(op)) -#endif +# endif void _XINCREF( PyObject *op ) { @@ -379,9 +400,9 @@ void _XINCREF( PyObject *op ) if( op == NULL ) return; -#ifdef Py_REF_DEBUG +# ifdef Py_REF_DEBUG (*ptr_Py_RefTotal)++; -#endif +# endif (op)->ob_refcnt++; } @@ -392,18 +413,18 @@ void _XDECREF( PyObject *op ) if( op == NULL ) return; -#ifdef Py_REF_DEBUG +# ifdef Py_REF_DEBUG (*ptr_Py_RefTotal)--; -#endif +# endif if (--(op)->ob_refcnt == 0) _Py_Dealloc((PyObject *)(op)); } -#else -#error "Can only delay load under Win32" -#endif +# else +# error "Can only delay load under Win32" +# endif #else @@ -416,16 +437,16 @@ void _XDECREF( PyObject *op ) // // Wrap variables as function calls // -#define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) \ +# define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) \ PyObject *_Exc_##eclass() { return ::PyExc_##eclass; } -#if PY_MAJOR_VERSION == 2 -#include "CXX/Python2/cxx_standard_exceptions.hxx" -#else -#include "CXX/Python3/cxx_standard_exceptions.hxx" -#endif +# if PY_MAJOR_VERSION == 2 +# include "CXX/Python2/cxx_standard_exceptions.hxx" +# else +# include "CXX/Python3/cxx_standard_exceptions.hxx" +# endif -#undef PYCXX_STANDARD_EXCEPTION +# undef PYCXX_STANDARD_EXCEPTION // // wrap items in Object.h @@ -439,11 +460,15 @@ PyTypeObject *_CFunction_Type() { return &PyCFunction_Type; } PyTypeObject *_Complex_Type() { return &PyComplex_Type; } PyTypeObject *_Dict_Type() { return &PyDict_Type; } PyTypeObject *_Float_Type() { return &PyFloat_Type; } +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) PyTypeObject *_Function_Type() { return &PyFunction_Type; } +# endif PyTypeObject *_Bool_Type() { return &PyBool_Type; } PyTypeObject *_List_Type() { return &PyList_Type; } PyTypeObject *_Long_Type() { return &PyLong_Type; } +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) PyTypeObject *_Method_Type() { return &PyMethod_Type; } +# endif PyTypeObject *_Module_Type() { return &PyModule_Type; } PyTypeObject *_Range_Type() { return &PyRange_Type; } PyTypeObject *_Slice_Type() { return &PySlice_Type; } @@ -451,24 +476,30 @@ PyTypeObject *_TraceBack_Type() { return &PyTraceBack_Type; } PyTypeObject *_Tuple_Type() { return &PyTuple_Type; } PyTypeObject *_Type_Type() { return &PyType_Type; } PyTypeObject *_Unicode_Type() { return &PyUnicode_Type; } -#if PY_MAJOR_VERSION == 2 +# if PY_MAJOR_VERSION == 2 PyTypeObject *_String_Type() { return &PyString_Type; } PyTypeObject *_Int_Type() { return &PyInt_Type; } PyTypeObject *_CObject_Type() { return &PyCObject_Type; } -#endif -#if PY_MAJOR_VERSION >= 3 +# endif +# if PY_MAJOR_VERSION >= 3 PyTypeObject *_Bytes_Type() { return &PyBytes_Type; } -#endif +# endif // // wrap flags // +# if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) int &_Py_DebugFlag() { return Py_DebugFlag; } int &_Py_InteractiveFlag() { return Py_InteractiveFlag; } int &_Py_OptimizeFlag() { return Py_OptimizeFlag; } int &_Py_NoSiteFlag() { return Py_NoSiteFlag; } int &_Py_VerboseFlag() { return Py_VerboseFlag; } +# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 +const char *__Py_PackageContext() { return _Py_PackageContext; } +# else char *__Py_PackageContext() { return _Py_PackageContext; } +# endif +# endif // // Needed to keep the abstactions for delayload interface diff --git a/Import/pycxx-7.0.3/Src/Python2/cxx_exceptions.cxx b/Import/pycxx-7.1.0/Src/Python2/cxx_exceptions.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/Python2/cxx_exceptions.cxx rename to Import/pycxx-7.1.0/Src/Python2/cxx_exceptions.cxx diff --git a/Import/pycxx-7.0.3/Src/Python2/cxx_extensions.cxx b/Import/pycxx-7.1.0/Src/Python2/cxx_extensions.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/Python2/cxx_extensions.cxx rename to Import/pycxx-7.1.0/Src/Python2/cxx_extensions.cxx diff --git a/Import/pycxx-7.0.3/Src/Python2/cxxextensions.c b/Import/pycxx-7.1.0/Src/Python2/cxxextensions.c similarity index 100% rename from Import/pycxx-7.0.3/Src/Python2/cxxextensions.c rename to Import/pycxx-7.1.0/Src/Python2/cxxextensions.c diff --git a/Import/pycxx-7.0.3/Src/Python2/cxxsupport.cxx b/Import/pycxx-7.1.0/Src/Python2/cxxsupport.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/Python2/cxxsupport.cxx rename to Import/pycxx-7.1.0/Src/Python2/cxxsupport.cxx diff --git a/Import/pycxx-7.0.3/Src/Python3/cxx_exceptions.cxx b/Import/pycxx-7.1.0/Src/Python3/cxx_exceptions.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/Python3/cxx_exceptions.cxx rename to Import/pycxx-7.1.0/Src/Python3/cxx_exceptions.cxx diff --git a/Import/pycxx-7.0.3/Src/Python3/cxx_extensions.cxx b/Import/pycxx-7.1.0/Src/Python3/cxx_extensions.cxx similarity index 87% rename from Import/pycxx-7.0.3/Src/Python3/cxx_extensions.cxx rename to Import/pycxx-7.1.0/Src/Python3/cxx_extensions.cxx index c11cbbfac098df51acc028dcbc79176d4a028799..0dba75207a7afcdbc489e408ce43545ee8d0721f 100644 --- a/Import/pycxx-7.0.3/Src/Python3/cxx_extensions.cxx +++ b/Import/pycxx-7.1.0/Src/Python3/cxx_extensions.cxx @@ -152,7 +152,11 @@ PyMethodDef *MethodTable::table() //================================================================================ ExtensionModuleBase::ExtensionModuleBase( const char *name ) : m_module_name( name ) +#if defined( Py_LIMITED_API ) +, m_full_module_name( m_module_name ) +#else , m_full_module_name( __Py_PackageContext() != NULL ? std::string( __Py_PackageContext() ) : m_module_name ) +#endif , m_method_table() //m_module_def , m_module( NULL ) @@ -228,7 +232,7 @@ extern "C" // All the following functions redirect the call from Python // onto the matching virtual function in PythonExtensionBase // -#ifdef PYCXX_PYTHON_2TO3 +#if defined( PYCXX_PYTHON_2TO3 ) && !defined( Py_LIMITED_API ) static int print_handler( PyObject *, FILE *, int ); #endif static PyObject *getattr_handler( PyObject *, char * ); @@ -280,8 +284,10 @@ extern "C" static PyObject *number_power_handler( PyObject *, PyObject *, PyObject * ); // Buffer +#if !defined( Py_LIMITED_API ) static int buffer_get_handler( PyObject *, Py_buffer *, int ); static void buffer_release_handler( PyObject *, Py_buffer * ); +#endif } extern "C" void standard_dealloc( PyObject *p ) @@ -291,158 +297,142 @@ extern "C" void standard_dealloc( PyObject *p ) bool PythonType::readyType() { +#if defined( Py_LIMITED_API ) + if( !tp_object ) + { + std::vector spec_slots( slots.size() + 1 ); + int index = 0; + + for (std::unordered_map::const_iterator i = slots.cbegin(); i != slots.cend(); i++) + { + spec_slots[ index ].slot = i->first; + spec_slots[ index ].pfunc = i->second; + index++; + } + spec_slots[ index ].slot = 0; + spec->slots = spec_slots.data(); + tp_object = reinterpret_cast( PyType_FromSpec(spec) ); + } + return tp_object != NULL; +#else return PyType_Ready( table ) >= 0; +#endif } -PythonType &PythonType::supportSequenceType( int methods_to_support ) -{ - if( !sequence_table ) +#if defined( Py_LIMITED_API ) +#define FILL_SEQUENCE_SLOT(slot) \ + if( methods_to_support&support_sequence_ ## slot ) { \ + slots[ Py_sq_ ## slot ] = reinterpret_cast( sequence_ ## slot ## _handler ); \ + } +#else +#define FILL_SEQUENCE_SLOT(slot) \ + if( methods_to_support&support_sequence_ ## slot ) { \ + sequence_table->sq_ ## slot = sequence_ ## slot ## _handler; \ + } +#endif + +PythonType &PythonType::supportSequenceType( int methods_to_support ) { +#if !defined( Py_LIMITED_API ) + if(sequence_table) { - sequence_table = new PySequenceMethods; - memset( sequence_table, 0, sizeof( PySequenceMethods ) ); // ensure new fields are 0 - table->tp_as_sequence = sequence_table; - if( methods_to_support&support_sequence_length ) - { - sequence_table->sq_length = sequence_length_handler; - } - if( methods_to_support&support_sequence_concat ) - { - sequence_table->sq_concat = sequence_concat_handler; - } - if( methods_to_support&support_sequence_repeat ) - { - sequence_table->sq_repeat = sequence_repeat_handler; - } - if( methods_to_support&support_sequence_item ) - { - sequence_table->sq_item = sequence_item_handler; - } - if( methods_to_support&support_sequence_ass_item ) - { - sequence_table->sq_ass_item = sequence_ass_item_handler; - } - if( methods_to_support&support_sequence_inplace_concat ) - { - sequence_table->sq_inplace_concat = sequence_inplace_concat_handler; - } - if( methods_to_support&support_sequence_inplace_repeat ) - { - sequence_table->sq_inplace_repeat = sequence_inplace_repeat_handler; - } - if( methods_to_support&support_sequence_contains ) - { - sequence_table->sq_contains = sequence_contains_handler; - } + return *this; } + sequence_table = new PySequenceMethods; + memset( sequence_table, 0, sizeof( PySequenceMethods ) ); // ensure new fields are 0 + table->tp_as_sequence = sequence_table; +#endif + + FILL_SEQUENCE_SLOT(length) + FILL_SEQUENCE_SLOT(concat) + FILL_SEQUENCE_SLOT(repeat) + FILL_SEQUENCE_SLOT(item) + FILL_SEQUENCE_SLOT(ass_item) + FILL_SEQUENCE_SLOT(inplace_concat) + FILL_SEQUENCE_SLOT(inplace_repeat) + FILL_SEQUENCE_SLOT(contains) return *this; } +#undef FILL_SEQUENCE_SLOT + +#if defined( Py_LIMITED_API ) +#define FILL_MAPPING_SLOT(slot) \ + if( methods_to_support&support_mapping_ ## slot ) { \ + slots[ Py_mp_ ## slot ] = reinterpret_cast( mapping_ ## slot ## _handler ); \ + } +#else +#define FILL_MAPPING_SLOT(slot) \ + if( methods_to_support&support_mapping_ ## slot ) { \ + mapping_table->mp_ ## slot = mapping_ ## slot ## _handler; \ + } +#endif + PythonType &PythonType::supportMappingType( int methods_to_support ) { - if( !mapping_table ) +#if !defined( Py_LIMITED_API ) + if( mapping_table ) { - mapping_table = new PyMappingMethods; - memset( mapping_table, 0, sizeof( PyMappingMethods ) ); // ensure new fields are 0 - table->tp_as_mapping = mapping_table; - - if( methods_to_support&support_mapping_length ) - { - mapping_table->mp_length = mapping_length_handler; - } - if( methods_to_support&support_mapping_subscript ) - { - mapping_table->mp_subscript = mapping_subscript_handler; - } - if( methods_to_support&support_mapping_ass_subscript ) - { - mapping_table->mp_ass_subscript = mapping_ass_subscript_handler; - } + return *this; } + mapping_table = new PyMappingMethods; + memset( mapping_table, 0, sizeof( PyMappingMethods ) ); // ensure new fields are 0 + table->tp_as_mapping = mapping_table; +#endif + FILL_MAPPING_SLOT(length) + FILL_MAPPING_SLOT(subscript) + FILL_MAPPING_SLOT(ass_subscript) return *this; } +#undef FILL_MAPPING_SLOT + +#if defined( Py_LIMITED_API ) +#define FILL_NUMBER_SLOT(slot) \ + if( methods_to_support&support_number_ ## slot ) { \ + slots[ Py_nb_ ## slot ] = reinterpret_cast( number_ ## slot ## _handler ); \ + } +#else +#define FILL_NUMBER_SLOT(slot) \ + if( methods_to_support&support_number_ ## slot ) { \ + number_table->nb_ ## slot = number_ ## slot ## _handler; \ + } +#endif + PythonType &PythonType::supportNumberType( int methods_to_support ) { - if( !number_table ) +#if !defined( Py_LIMITED_API ) + if( number_table ) { - number_table = new PyNumberMethods; - memset( number_table, 0, sizeof( PyNumberMethods ) ); // ensure new fields are 0 - table->tp_as_number = number_table; - - if( methods_to_support&support_number_add ) - { - number_table->nb_add = number_add_handler; - } - if( methods_to_support&support_number_subtract ) - { - number_table->nb_subtract = number_subtract_handler; - } - if( methods_to_support&support_number_multiply ) - { - number_table->nb_multiply = number_multiply_handler; - } - if( methods_to_support&support_number_remainder ) - { - number_table->nb_remainder = number_remainder_handler; - } - if( methods_to_support&support_number_divmod ) - { - number_table->nb_divmod = number_divmod_handler; - } - if( methods_to_support&support_number_power ) - { - number_table->nb_power = number_power_handler; - } - if( methods_to_support&support_number_negative ) - { - number_table->nb_negative = number_negative_handler; - } - if( methods_to_support&support_number_positive ) - { - number_table->nb_positive = number_positive_handler; - } - if( methods_to_support&support_number_absolute ) - { - number_table->nb_absolute = number_absolute_handler; - } - if( methods_to_support&support_number_invert ) - { - number_table->nb_invert = number_invert_handler; - } - if( methods_to_support&support_number_lshift ) - { - number_table->nb_lshift = number_lshift_handler; - } - if( methods_to_support&support_number_rshift ) - { - number_table->nb_rshift = number_rshift_handler; - } - if( methods_to_support&support_number_and ) - { - number_table->nb_and = number_and_handler; - } - if( methods_to_support&support_number_xor ) - { - number_table->nb_xor = number_xor_handler; - } - if( methods_to_support&support_number_or ) - { - number_table->nb_or = number_or_handler; - } - if( methods_to_support&support_number_int ) - { - number_table->nb_int = number_int_handler; - } - if( methods_to_support&support_number_float ) - { - number_table->nb_float = number_float_handler; - } - - // QQQ lots of new methods to add + return *this; } + number_table = new PyNumberMethods; + memset( number_table, 0, sizeof( PyNumberMethods ) ); // ensure new fields are 0 + table->tp_as_number = number_table; +#endif + + FILL_NUMBER_SLOT(add) + FILL_NUMBER_SLOT(subtract) + FILL_NUMBER_SLOT(multiply) + FILL_NUMBER_SLOT(remainder) + FILL_NUMBER_SLOT(divmod) + FILL_NUMBER_SLOT(power) + FILL_NUMBER_SLOT(negative) + FILL_NUMBER_SLOT(positive) + FILL_NUMBER_SLOT(absolute) + FILL_NUMBER_SLOT(invert) + FILL_NUMBER_SLOT(lshift) + FILL_NUMBER_SLOT(rshift) + FILL_NUMBER_SLOT(and) + FILL_NUMBER_SLOT(xor) + FILL_NUMBER_SLOT(or) + FILL_NUMBER_SLOT(int) + FILL_NUMBER_SLOT(float) return *this; } +#undef FILL_NUMBER_SLOT + +#if !defined( Py_LIMITED_API ) PythonType &PythonType::supportBufferType( int methods_to_support ) { if( !buffer_table ) @@ -462,10 +452,27 @@ PythonType &PythonType::supportBufferType( int methods_to_support ) } return *this; } +#endif // if you define one sequence method you must define // all of them except the assigns +#if defined( Py_LIMITED_API ) +PythonType::PythonType( size_t basic_size, int itemsize, const char *default_name ) +: spec( new PyType_Spec ) +{ + memset( spec, 0, sizeof( PyType_Spec ) ); + spec->name = const_cast( default_name ); + spec->basicsize = basic_size; + spec->itemsize = itemsize; + spec->flags = Py_TPFLAGS_DEFAULT; + + slots[ Py_tp_dealloc ] = reinterpret_cast( standard_dealloc ); + + tp_object = 0; +} + +#else PythonType::PythonType( size_t basic_size, int itemsize, const char *default_name ) : table( new PyTypeObject ) , sequence_table( NULL ) @@ -558,102 +565,172 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam table->tp_next = 0; #endif } +#endif PythonType::~PythonType() { +#if defined( Py_LIMITED_API ) + delete spec; + PyObject_Free( tp_object ); +#else delete table; delete sequence_table; delete mapping_table; delete number_table; delete buffer_table; +#endif } PyTypeObject *PythonType::type_object() const { +#if defined( Py_LIMITED_API ) + return tp_object; +#else return table; +#endif } PythonType &PythonType::name( const char *nam ) { +#if defined( Py_LIMITED_API ) + spec->name = nam; +#else table->tp_name = const_cast( nam ); +#endif return *this; } const char *PythonType::getName() const { +#if defined( Py_LIMITED_API ) + return spec->name; +#else return table->tp_name; +#endif } PythonType &PythonType::doc( const char *d ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_doc ] = reinterpret_cast( const_cast( d ) ); +#else table->tp_doc = const_cast( d ); +#endif return *this; } const char *PythonType::getDoc() const { +#if defined( Py_LIMITED_API ) + if( tp_object ) + return reinterpret_cast( PyType_GetSlot( tp_object, Py_tp_doc ) ); + + std::unordered_map::const_iterator slot = slots.find( Py_tp_doc ); + if( slot == slots.end() ) + return NULL; + return reinterpret_cast( slot->second ); +#else return table->tp_doc; +#endif } PythonType &PythonType::set_tp_dealloc( void (*tp_dealloc)( PyObject *self ) ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_dealloc ] = reinterpret_cast( tp_dealloc ); +#else table->tp_dealloc = tp_dealloc; +#endif return *this; } PythonType &PythonType::set_tp_init( int (*tp_init)( PyObject *self, PyObject *args, PyObject *kwds ) ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_init ] = reinterpret_cast( tp_init ); +#else table->tp_init = tp_init; +#endif return *this; } PythonType &PythonType::set_tp_new( PyObject *(*tp_new)( PyTypeObject *subtype, PyObject *args, PyObject *kwds ) ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_new ] = reinterpret_cast( tp_new ); +#else table->tp_new = tp_new; +#endif return *this; } PythonType &PythonType::set_methods( PyMethodDef *methods ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_methods ] = reinterpret_cast( methods ); +#else table->tp_methods = methods; +#endif return *this; } PythonType &PythonType::supportClass() { +#if defined( Py_LIMITED_API ) + spec->flags |= Py_TPFLAGS_BASETYPE; +#else table->tp_flags |= Py_TPFLAGS_BASETYPE; +#endif return *this; } #ifdef PYCXX_PYTHON_2TO3 +#if !defined( Py_LIMITED_API ) PythonType &PythonType::supportPrint() { table->tp_print = print_handler; return *this; } #endif +#endif PythonType &PythonType::supportGetattr() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_getattr ] = reinterpret_cast( getattr_handler ); +#else table->tp_getattr = getattr_handler; +#endif return *this; } PythonType &PythonType::supportSetattr() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_setattr ] = reinterpret_cast( setattr_handler ); +#else table->tp_setattr = setattr_handler; +#endif return *this; } PythonType &PythonType::supportGetattro() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_getattro ] = reinterpret_cast( getattro_handler ); +#else table->tp_getattro = getattro_handler; +#endif return *this; } PythonType &PythonType::supportSetattro() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_setattro ] = reinterpret_cast( setattro_handler ); +#else table->tp_setattro = setattro_handler; +#endif return *this; } @@ -667,31 +744,51 @@ PythonType &PythonType::supportCompare( void ) PythonType &PythonType::supportRichCompare() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_richcompare ] = reinterpret_cast( rich_compare_handler ); +#else table->tp_richcompare = rich_compare_handler; +#endif return *this; } PythonType &PythonType::supportRepr() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_repr ] = reinterpret_cast( repr_handler ); +#else table->tp_repr = repr_handler; +#endif return *this; } PythonType &PythonType::supportStr() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_str ] = reinterpret_cast( str_handler ); +#else table->tp_str = str_handler; +#endif return *this; } PythonType &PythonType::supportHash() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_hash ] = reinterpret_cast( hash_handler ); +#else table->tp_hash = hash_handler; +#endif return *this; } PythonType &PythonType::supportCall() { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_call ] = reinterpret_cast( call_handler ); +#else table->tp_call = call_handler; +#endif return *this; } @@ -699,11 +796,19 @@ PythonType &PythonType::supportIter( int methods_to_support ) { if( methods_to_support&support_iter_iter ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_iter ] = reinterpret_cast( iter_handler ); +#else table->tp_iter = iter_handler; +#endif } if( methods_to_support&support_iter_iternext ) { +#if defined( Py_LIMITED_API ) + slots[ Py_tp_iternext ] = reinterpret_cast( iternext_handler ); +#else table->tp_iternext = iternext_handler; +#endif } return *this; } @@ -715,7 +820,7 @@ PythonType &PythonType::supportIter( int methods_to_support ) //-------------------------------------------------------------------------------- PythonExtensionBase *getPythonExtensionBase( PyObject *self ) { - if( self->ob_type->tp_flags&Py_TPFLAGS_BASETYPE ) + if(PyType_HasFeature(self->ob_type, Py_TPFLAGS_BASETYPE)) { PythonClassInstance *instance = reinterpret_cast( self ); return instance->m_pycxx_object; @@ -726,7 +831,7 @@ PythonExtensionBase *getPythonExtensionBase( PyObject *self ) } } -#ifdef PYCXX_PYTHON_2TO3 +#if defined( PYCXX_PYTHON_2TO3 ) && !defined ( Py_LIMITED_API ) extern "C" int print_handler( PyObject *self, FILE *fp, int flags ) { try @@ -1256,6 +1361,7 @@ extern "C" PyObject *number_power_handler( PyObject *self, PyObject *x1, PyObjec } // Buffer +#ifndef Py_LIMITED_API extern "C" int buffer_get_handler( PyObject *self, Py_buffer *buf, int flags ) { try @@ -1275,6 +1381,7 @@ extern "C" void buffer_release_handler( PyObject *self, Py_buffer *buf ) p->buffer_release( buf ); // NOTE: No way to indicate error to Python } +#endif //================================================================================ // @@ -1388,7 +1495,7 @@ int PythonExtensionBase::genericSetAttro( const String &name, const Object &valu return PyObject_GenericSetAttr( selfPtr(), name.ptr(), value.ptr() ); } -#ifdef PYCXX_PYTHON_2TO3 +#if defined( PYCXX_PYTHON_2TO3 ) && !defined( Py_LIMITED_API ) int PythonExtensionBase::print( FILE *, int ) { missing_method( print ); @@ -1605,6 +1712,7 @@ Object PythonExtensionBase::number_power( const Object &, const Object & ) // Buffer +#ifndef Py_LIMITED_API int PythonExtensionBase::buffer_get( Py_buffer * /*buf*/, int /*flags*/ ) { missing_method( buffer_get ); @@ -1616,6 +1724,7 @@ int PythonExtensionBase::buffer_release( Py_buffer * /*buf*/ ) // memory is dynamic. return 0; } +#endif //-------------------------------------------------------------------------------- // diff --git a/Import/pycxx-7.0.3/Src/Python3/cxxextensions.c b/Import/pycxx-7.1.0/Src/Python3/cxxextensions.c similarity index 100% rename from Import/pycxx-7.0.3/Src/Python3/cxxextensions.c rename to Import/pycxx-7.1.0/Src/Python3/cxxextensions.c diff --git a/Import/pycxx-7.0.3/Src/Python3/cxxsupport.cxx b/Import/pycxx-7.1.0/Src/Python3/cxxsupport.cxx similarity index 98% rename from Import/pycxx-7.0.3/Src/Python3/cxxsupport.cxx rename to Import/pycxx-7.1.0/Src/Python3/cxxsupport.cxx index dfda4d31fa28f4cdda0928b0deb9487f93631651..f69a1768b6f0c73ef7b92c20023d4991518b41ae 100644 --- a/Import/pycxx-7.0.3/Src/Python3/cxxsupport.cxx +++ b/Import/pycxx-7.1.0/Src/Python3/cxxsupport.cxx @@ -38,7 +38,10 @@ #include "CXX/Objects.hxx" namespace Py { +#if !defined(Py_LIMITED_API) Py_UNICODE unicode_null_string[1] = { 0 }; +#endif +Py_UCS4 ucs4_null_string[1] = { 0 }; Type Object::type() const { diff --git a/Import/pycxx-7.0.3/Src/cxx_exceptions.cxx b/Import/pycxx-7.1.0/Src/cxx_exceptions.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/cxx_exceptions.cxx rename to Import/pycxx-7.1.0/Src/cxx_exceptions.cxx diff --git a/Import/pycxx-7.0.3/Src/cxx_extensions.cxx b/Import/pycxx-7.1.0/Src/cxx_extensions.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/cxx_extensions.cxx rename to Import/pycxx-7.1.0/Src/cxx_extensions.cxx diff --git a/Import/pycxx-7.0.3/Src/cxxextensions.c b/Import/pycxx-7.1.0/Src/cxxextensions.c similarity index 100% rename from Import/pycxx-7.0.3/Src/cxxextensions.c rename to Import/pycxx-7.1.0/Src/cxxextensions.c diff --git a/Import/pycxx-7.0.3/Src/cxxsupport.cxx b/Import/pycxx-7.1.0/Src/cxxsupport.cxx similarity index 100% rename from Import/pycxx-7.0.3/Src/cxxsupport.cxx rename to Import/pycxx-7.1.0/Src/cxxsupport.cxx diff --git a/Import/pycxx-7.1.0/build-all.cmd b/Import/pycxx-7.1.0/build-all.cmd new file mode 100644 index 0000000000000000000000000000000000000000..6bbbab3f1a0e2180de927b063ffeed1a8a76935b --- /dev/null +++ b/Import/pycxx-7.1.0/build-all.cmd @@ -0,0 +1,42 @@ +if not "%1%2" == "" goto :build_%1_%2 + +:build_27_32 + call build-unlimited-api.cmd 27 win32 9.0 +if not "%1%2" == "" goto :eof + +:build_33_32 + call build-unlimited-api.cmd 33 win32 10.0 +if not "%1%2" == "" goto :eof + +:build_34_32 + call build-unlimited-api.cmd 34 win32 10.0 + call build-limited-api.cmd 34 win32 10.0 3.4 +if not "%1%2" == "" goto :eof + +:build_35_32 + call build-unlimited-api.cmd 35 win32 14.0 + call build-limited-api.cmd 35 win32 14.0 3.4 + call build-limited-api.cmd 35 win32 14.0 3.5 +if not "%1%2" == "" goto :eof + +:build_27_64 + call build-unlimited-api.cmd 27 win64 9.0 +if not "%1%2" == "" goto :eof + +:build_35_64 + call build-unlimited-api.cmd 35 win64 14.0 + call build-limited-api.cmd 35 win64 14.0 3.4 + call build-limited-api.cmd 35 win64 14.0 3.5 +if not "%1%2" == "" goto :eof + +:build_36_64 + call build-unlimited-api.cmd 36 win64 14.0 + call build-limited-api.cmd 36 win64 14.0 3.4 + call build-limited-api.cmd 36 win64 14.0 3.6 +if not "%1%2" == "" goto :eof + +:build_37_64 + call build-unlimited-api.cmd 37 win64 14.0 + call build-limited-api.cmd 37 win64 14.0 3.4 + call build-limited-api.cmd 37 win64 14.0 3.7 +if not "%1%2" == "" goto :eof diff --git a/Import/pycxx-7.1.0/build-all.sh b/Import/pycxx-7.1.0/build-all.sh new file mode 100755 index 0000000000000000000000000000000000000000..a45675bd06c1ee8f55bdf60df82394b658f57a51 --- /dev/null +++ b/Import/pycxx-7.1.0/build-all.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -x +set -e +set -o pipefail + +for PYTHON in \ + python2.6 \ + python2.7 \ + python3.3 \ + python3.4 \ + python3.5 \ + python3.6 \ + python3.7 \ + python3.8 \ + python3.9 \ + ; +do + if which $PYTHON >/dev/null + then + echo "Info: Found ${PYTHON}" + ./build-unlimited-api.sh ${PYTHON} + + case "${PYTHON}" in + python3.3) + ;; + python3.*) + ./build-limited-api.sh ${PYTHON} ${PYTHON#python} + ;; + esac + fi +done diff --git a/Import/pycxx-7.1.0/build-limited-api.cmd b/Import/pycxx-7.1.0/build-limited-api.cmd new file mode 100644 index 0000000000000000000000000000000000000000..c403e41a8fae0f8633b98e7e020a6a84ac255f38 --- /dev/null +++ b/Import/pycxx-7.1.0/build-limited-api.cmd @@ -0,0 +1,25 @@ +setlocal +rem Mm e.g. 24 36 etc +set PYTHON_VER=%1 +rem win32 or win64 +set PYTHON_ARCH=%2 +rem 10.0, 14.0 +set VC_VER=%3 +set API=%4 + +if %PYTHON_ARCH% == win32 ( + call "C:\Program Files (x86)\Microsoft Visual Studio %VC_VER%\VC\vcvarsall.bat" +) +if %PYTHON_ARCH% == win64 ( + call "C:\Program Files (x86)\Microsoft Visual Studio %VC_VER%\VC\bin\amd64\vcvars64.bat" +) + +if exist c:\python%PYTHON_VER%.%PYTHON_ARCH%\python.exe ( + c:\python%PYTHON_VER%.%PYTHON_ARCH%\python setup_makefile.py %PYTHON_ARCH% tmp-%PYTHON_ARCH%-python%PYTHON_VER%-limited-%API%-build.mak --limited-api=%API% + if errorlevel 1 exit /b 1 + nmake -f tmp-%PYTHON_ARCH%-python%PYTHON_VER%-limited-%API%-build.mak clean all 2>&1 | c:\unxutils\tee tmp-%PYTHON_ARCH%-python%PYTHON_VER%-limited-%API%-build.log + if not exist obj\pycxx_iter.pyd exit /b 1 + nmake -f tmp-%PYTHON_ARCH%-python%PYTHON_VER%-limited-%API%-build.mak test 2>&1 | c:\unxutils\tee tmp-%PYTHON_ARCH%-python%PYTHON_VER%-limited-%API%-test.log + echo All done +) +endlocal diff --git a/Import/pycxx-7.1.0/build-limited-api.sh b/Import/pycxx-7.1.0/build-limited-api.sh new file mode 100755 index 0000000000000000000000000000000000000000..b630c22f7cf09b104496a372e0c060685e5d0e36 --- /dev/null +++ b/Import/pycxx-7.1.0/build-limited-api.sh @@ -0,0 +1,24 @@ +#!/bin/bash +set -x +set -e +set -o pipefail + +PYTHON=${1? python exe} +API=${2? api version} + +case "$( uname )" in +Darwin) + OS=macosx + ;; +Linux): + OS=linux + ;; +*) + echo Unknown OS assuming Linux + OS=linux + ;; +esac + +${PYTHON} setup_makefile.py ${OS} tmp-$PYTHON-limited-api.mak --limited-api=${API} +make -f tmp-$PYTHON-limited-api.mak clean 2>&1 | tee tmp-$PYTHON-limited-api.log +make -f tmp-$PYTHON-limited-api.mak test 2>&1 | tee -a tmp-$PYTHON-limited-api.log diff --git a/Import/pycxx-7.1.0/build-unlimited-api.cmd b/Import/pycxx-7.1.0/build-unlimited-api.cmd new file mode 100644 index 0000000000000000000000000000000000000000..dde17fa563f883c369b1dd9c57756eb6397bcf5a --- /dev/null +++ b/Import/pycxx-7.1.0/build-unlimited-api.cmd @@ -0,0 +1,31 @@ +setlocal +rem Mm e.g. 27 36 etc +set PYTHON_VER=%1 +rem win32 or win64 +set PYTHON_ARCH=%2 +rem 9.0, 14.0 +set VC_VER=%3 + +if %PYTHON_ARCH% == win32 ( + if %VC_VER% == 9.0 ( + call "%LOCALAPPDATA%\Programs\Common\Microsoft\Visual C++ for Python\%VC_VER%\vcvarsall.bat" x86 + ) else ( + call "C:\Program Files (x86)\Microsoft Visual Studio %VC_VER%\VC\vcvarsall.bat" + ) +) +if %PYTHON_ARCH% == win64 ( + if %VC_VER% == 9.0 ( + call "%LOCALAPPDATA%\Programs\Common\Microsoft\Visual C++ for Python\%VC_VER%\vcvarsall.bat" x64 + ) else ( + call "C:\Program Files (x86)\Microsoft Visual Studio %VC_VER%\VC\bin\amd64\vcvars64.bat" + ) +) + +if exist c:\python%PYTHON_VER%.%PYTHON_ARCH%\python.exe ( + c:\python%PYTHON_VER%.%PYTHON_ARCH%\python setup_makefile.py %PYTHON_ARCH% tmp-%PYTHON_ARCH%-python%PYTHON_VER%-unlimited-build.mak + if errorlevel 1 exit /b 1 + nmake -f tmp-%PYTHON_ARCH%-python%PYTHON_VER%-unlimited-build.mak clean all 2>&1 | c:\unxutils\tee tmp-%PYTHON_ARCH%-python%PYTHON_VER%-unlimited-build.log + if not exist obj\pycxx_iter.pyd exit /b 1 + nmake -f tmp-%PYTHON_ARCH%-python%PYTHON_VER%-unlimited-build.mak test 2>&1 | c:\unxutils\tee tmp-%PYTHON_ARCH%-python%PYTHON_VER%-unlimited-test.log +) +endlocal diff --git a/Import/pycxx-7.1.0/build-unlimited-api.sh b/Import/pycxx-7.1.0/build-unlimited-api.sh new file mode 100755 index 0000000000000000000000000000000000000000..9c3a869d212a53fa6e02dc59cc980a33ecdc11d2 --- /dev/null +++ b/Import/pycxx-7.1.0/build-unlimited-api.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -x +set -e +set -o pipefail + +PYTHON=${1? python exe} + +case "$( uname )" in +Darwin) + OS=macosx + ;; +Linux): + OS=linux + ;; +*) + echo Unknown OS assuming Linux + OS=linux + ;; +esac + +${PYTHON} setup_makefile.py ${OS} tmp-$PYTHON-unlimited-api.mak +make -f tmp-$PYTHON-unlimited-api.mak clean 2>&1 | tee tmp-$PYTHON-unlimited-api.log +make -f tmp-$PYTHON-unlimited-api.mak test 2>&1 | tee -a tmp-$PYTHON-unlimited-api.log diff --git a/Import/pycxx-7.0.3/how_to_release_pycxx.txt b/Import/pycxx-7.1.0/how_to_release_pycxx.txt similarity index 89% rename from Import/pycxx-7.0.3/how_to_release_pycxx.txt rename to Import/pycxx-7.1.0/how_to_release_pycxx.txt index ed5bd531b24acf0cd2aa496b4205a4a6017e8309..8db345eb0c5333aac5fd910c062a6b8e209654fb 100644 --- a/Import/pycxx-7.0.3/how_to_release_pycxx.txt +++ b/Import/pycxx-7.1.0/how_to_release_pycxx.txt @@ -2,8 +2,7 @@ How to release PyCXX -------------------- 0. Update CXX/Version.hxx with the releases version number - Update README.html, PyCXX-Release-Notes.txt - and SourceForge/index.html with change log info + Update README.html, PyCXX-Release-Notes.txt with change log info 1. Tag the source using tag_pycxx.py (depends on pysvn). 2. Create the source kit using make_src_kit.py 3. Add new File release on sourceforge. diff --git a/Import/pycxx-7.0.3/make_src_kit.py b/Import/pycxx-7.1.0/make_src_kit.py similarity index 89% rename from Import/pycxx-7.0.3/make_src_kit.py rename to Import/pycxx-7.1.0/make_src_kit.py index f568d7e06ce996a73c6fde8513d6bb71e0f279ec..ba1cd18452b521cf0a30bd43823b396ddbf0cb6b 100644 --- a/Import/pycxx-7.0.3/make_src_kit.py +++ b/Import/pycxx-7.1.0/make_src_kit.py @@ -33,7 +33,9 @@ def main( argv ): print( 'Info: Creating %s.tar.gz' % kit_dir ) os.chdir( tmp_dir ) - os.system( 'tar czf %s.tar.gz %s' % (kit_dir, kit_name) ) + cmd = 'tar czf %s.tar.gz --exclude=%s/SourceForge %s' % (kit_dir, kit_name, kit_name) + os.system( cmd ) + print( cmd ) return 0 diff --git a/Import/pycxx-7.0.3/run_tests.cmd b/Import/pycxx-7.1.0/run_tests.cmd similarity index 100% rename from Import/pycxx-7.0.3/run_tests.cmd rename to Import/pycxx-7.1.0/run_tests.cmd diff --git a/Import/pycxx-7.0.3/setup.py b/Import/pycxx-7.1.0/setup.py similarity index 100% rename from Import/pycxx-7.0.3/setup.py rename to Import/pycxx-7.1.0/setup.py diff --git a/Import/pycxx-7.0.3/setup_makefile.py b/Import/pycxx-7.1.0/setup_makefile.py similarity index 91% rename from Import/pycxx-7.0.3/setup_makefile.py rename to Import/pycxx-7.1.0/setup_makefile.py index 4d96651417d37c0f0b524218d0e898750f98df9e..d1e8829de3d91f6be9a09d7874cdeba4adbf3b36 100644 --- a/Import/pycxx-7.0.3/setup_makefile.py +++ b/Import/pycxx-7.1.0/setup_makefile.py @@ -1,4 +1,4 @@ - +# # Copyright (c) 2010-2011 Barry A. Scott # import os @@ -22,6 +22,7 @@ class Setup: self.opt_debug = False self.opt_pycxx_debug = False + self.opt_limited_api = None self.platform = args[0] del args[0] @@ -34,10 +35,25 @@ class Setup: self.opt_debug = True del args[0] - if args[0] == '--pycxx-debug': + elif args[0] == '--pycxx-debug': self.opt_pycxx_debug = True del args[0] + elif args[0] == '--limited-api': + self.opt_limited_api = '0x03040000' + del args[0] + + elif args[0].startswith( '--limited-api=' ): + api = args[0][len('--limited-api='):] + if api.startswith( '0x' ): + self.opt_limited_api = api + else: + major, minor = [int(s) for s in api.split('.')] + minor *= 0x10000 + major *= 0x1000000 + self.opt_limited_api = '0x%x' % (major+minor) + del args[0] + else: raise ValueError( 'Unknown arg %r' % (args[0],) ) @@ -184,12 +200,16 @@ class Compiler: raise ValueError( 'Cannot translate string (%s)' % (e,) ) +# MSVC 9.0 and later versions class Win32CompilerMSVC90(Compiler): def __init__( self, setup ): Compiler.__init__( self, setup ) self._addVar( 'PYTHONDIR', sys.exec_prefix ) - self._addVar( 'PYTHON_LIBNAME', 'python%d%d' % (sys.version_info[0], sys.version_info[1]) ) + if setup.opt_limited_api is None: + self._addVar( 'PYTHON_LIBNAME', 'python%d%d' % (sys.version_info[0], sys.version_info[1]) ) + else: + self._addVar( 'PYTHON_LIBNAME', 'python3' ) self._addVar( 'PYTHON_INCLUDE', r'%(PYTHONDIR)s\include' ) self._addVar( 'PYTHON_LIB', r'%(PYTHONDIR)s\libs' ) self._addVar( 'PYTHON', sys.executable ) @@ -205,7 +225,7 @@ class Win32CompilerMSVC90(Compiler): def generateMakefileHeader( self ): self.makePrint( '#' ) - self.makePrint( '# Bemacs Makefile generated by setup.py' ) + self.makePrint( '# PyCXX Makefile generated by setup_makefile.py' ) self.makePrint( '#' ) self.makePrint( 'CCC=cl /nologo /W4' ) self.makePrint( 'CC=cl /nologo /W4' ) @@ -279,6 +299,7 @@ class Win32CompilerMSVC90(Compiler): self._addVar( 'DEMO_DIR', 'Demo\Python%d' % (sys.version_info[0],) ) self._addVar( 'PYCXX_DEBUG', '-DPYCXX_DEBUG=1' if self.setup.opt_pycxx_debug else '' ) + self._addVar( 'PYCXX_API', ('-DPy_LIMITED_API=%s' % (self.setup.opt_limited_api,)) if self.setup.opt_limited_api else '' ) self._addVar( 'CCCFLAGS', r'/Zi /MT /EHsc ' @@ -286,7 +307,8 @@ class Win32CompilerMSVC90(Compiler): r'-D_CRT_NONSTDC_NO_DEPRECATE ' r'-U_DEBUG ' r'-D%(DEBUG)s ' - r'%(PYCXX_DEBUG)s' ) + r'%(PYCXX_DEBUG)s' + r'%(PYCXX_API)s' ) def ruleTest( self, python_test ): rules = [] @@ -327,7 +349,7 @@ class CompilerGCC(Compiler): def generateMakefileHeader( self ): self.makePrint( '#' ) - self.makePrint( '# Bemacs Makefile generated by setup.py' ) + self.makePrint( '# PyCXX Makefile generated by setup_makefile.py' ) self.makePrint( '#' ) self.makePrint( '' ) @@ -415,13 +437,15 @@ class MacOsxCompilerGCC(CompilerGCC): self._addVar( 'DEMO_DIR', 'Demo/Python%d' % (sys.version_info[0],) ) self._addVar( 'PYCXX_DEBUG', '-DPYCXX_DEBUG=1' if self.setup.opt_pycxx_debug else '' ) + self._addVar( 'PYCXX_API', ('-DPy_LIMITED_API=%s' % (self.setup.opt_limited_api,)) if self.setup.opt_limited_api else '' ) self._addVar( 'CCCFLAGS', '-g ' '-Wall -fPIC -fexceptions -frtti ' '-I. -ISrc -I%(PYTHON_INCLUDE)s ' '-D%(DEBUG)s ' - '%(PYCXX_DEBUG)s' ) + '%(PYCXX_DEBUG)s' + '%(PYCXX_API)s' ) self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' '-framework System ' @@ -442,12 +466,14 @@ class LinuxCompilerGCC(CompilerGCC): self._addVar( 'PYTHON_VERSION', '%d.%d' % (sys.version_info[0], sys.version_info[1]) ) self._addVar( 'PYTHON_INCLUDE', distutils.sysconfig.get_python_inc() ) self._addVar( 'PYCXX_DEBUG', '-DPYCXX_DEBUG=1' if self.setup.opt_pycxx_debug else '' ) + self._addVar( 'PYCXX_API', ('-DPy_LIMITED_API=%s' % (self.setup.opt_limited_api,)) if self.setup.opt_limited_api else '' ) self._addVar( 'CCCFLAGS', '-g ' '-Wall -fPIC -fexceptions -frtti ' '-I. -ISrc -I%(PYTHON_INCLUDE)s ' '-D%(DEBUG)s ' - '%(PYCXX_DEBUG)s' ) + '%(PYCXX_DEBUG)s' + '%(PYCXX_API)s' ) self._addVar( 'LDEXE', '%(CCC)s -g' ) self._addVar( 'LDSHARED', '%(CCC)s -shared -g ' ) diff --git a/Import/pycxx-7.0.3/tag_pycxx.py b/Import/pycxx-7.1.0/tag_pycxx.py similarity index 100% rename from Import/pycxx-7.0.3/tag_pycxx.py rename to Import/pycxx-7.1.0/tag_pycxx.py diff --git a/Kit/Windows/setup_kit_files.py b/Kit/Windows/setup_kit_files.py index ffd9f3f0831c0c217ebac2bfcd564da07557c10b..62a5bdc323a76ba5ff95bb7399f6471916665dd1 100644 --- a/Kit/Windows/setup_kit_files.py +++ b/Kit/Windows/setup_kit_files.py @@ -102,6 +102,9 @@ class InnoSetup: elif self.vc_ver == '14.0': redist_year = '2015' + elif self.vc_ver == '14.1': + redist_year = '2015' + else: print( 'Error: Unsupported VC_VER of %s' % (self.vc_ver,) ) return 1 diff --git a/Source/create__init__.py b/Source/create__init__.py index c0a637c77aa0f1322caa378c69841b5002aa624f..fa36a1dfd4a6192df2950868ca0a4bfb44996077 100644 --- a/Source/create__init__.py +++ b/Source/create__init__.py @@ -17,11 +17,25 @@ block_end_index = pysvn__init__file_contents.index( '### IMPORT BLOCK END\n' ) + if sys.version_info[0] >= 3: module_name = 'pysvn.%s' % (module_name,) -replacement = [ ' import %s\n' % (module_name,) ] +replacement = [] +if sys.platform == 'win32': + replacement.append(''' + import os + old_path = os.environ['PATH'] + os.environ['PATH'] = '%s;%s' % (os.path.dirname( __file__ ), old_path) +''') + +replacement.append( ' import %s\n' % (module_name,) ) if module_name != '_pysvn': replacement.append( ' _pysvn = %s\n' % (module_name,) ) +if sys.platform == 'win32': + replacement.append(''' + os.environ['PATH'] = old_path + del os +''') + pysvn__init__file_contents[ block_begin_index:block_end_index ] = replacement f = open( init_output, 'w' ) diff --git a/Source/pysvn.cpp b/Source/pysvn.cpp index 583fbae73ef34f35a09613a6e5aa9965f15a6769..750a8f10cadb0cdc9faecaacb37eb78bb5a03c5a 100644 --- a/Source/pysvn.cpp +++ b/Source/pysvn.cpp @@ -21,6 +21,7 @@ #include "pysvn_docs.hpp" #include "pysvn_version.hpp" #include "svn_version.h" +#include "svn_ra.h" #include "pysvn_static_strings.hpp" @@ -35,6 +36,10 @@ extern "C" int pysvn_breakpoint() return 0; } +#if defined(MS_WINDOWS) +const svn_version_t *ra_ver; +#endif + pysvn_module::pysvn_module() : Py::ExtensionModule( "pysvn" ) , client_error() @@ -44,6 +49,12 @@ pysvn_module::pysvn_module() apr_initialize(); apr_pool_initialize(); +#if defined(MS_WINDOWS) + // on windows the libsvn_ra-1.dll must be forced to load when pysvn loads + // otherwise a random version from the PATH is loaded or none is found + ra_ver = svn_ra_version(); +#endif + client_error.init( *this, "ClientError" ); pysvn_client::init_type(); diff --git a/Source/pysvn/__init__.py.template b/Source/pysvn/__init__.py.template index e2d752263a4cb1c72459a96a28362c8e6067efff..e5d0e630a23804d4eee9cee4b1952dd0f1350f47 100644 --- a/Source/pysvn/__init__.py.template +++ b/Source/pysvn/__init__.py.template @@ -109,8 +109,6 @@ SVN_DIRENT_LAST_AUTHOR = 0x00020 SVN_DIRENT_ALL = 0xffffffff try: - maj_min = sys.version_info[:2] - ### IMPORT BLOCK BEGIN raise ImportError( 'pysvn __init__.py has not been created by the build system correctly' ) ### IMPORT BLOCK END diff --git a/Source/pysvn_callbacks.cpp b/Source/pysvn_callbacks.cpp index 7ff9e70d81b7396530a6b97a793f098f02797f03..b968a3932957a52845a90a6f03bd4896d8b7ba7e 100644 --- a/Source/pysvn_callbacks.cpp +++ b/Source/pysvn_callbacks.cpp @@ -79,7 +79,7 @@ void pysvn_context::checkForError( Py::ExtensionExceptionType &exception_for_err // see if any errors occurred in the callbacks if( !m_error_message.empty() ) { - throw Py::Exception( exception_for_error, m_error_message ); + throw Py::BaseException( exception_for_error, m_error_message ); } } diff --git a/Source/pysvn_client.cpp b/Source/pysvn_client.cpp index 22a10a4286f7c0d5116e24e64be6e436b8dfaf2f..5599cc30c10183474c002c87262265e8715b9df1 100644 --- a/Source/pysvn_client.cpp +++ b/Source/pysvn_client.cpp @@ -775,14 +775,14 @@ void pysvn_client::checkThreadPermission() { if( m_context.hasPermission() ) { - throw Py::Exception( m_module.client_error, + throw Py::BaseException( m_module.client_error, "client in use on another thread" ); } } void pysvn_client::throw_client_error( SvnException &e ) { - throw Py::Exception( + throw Py::BaseException( m_module.client_error, e.pythonExceptionArg( m_exception_style ) ); } diff --git a/Source/pysvn_transaction.cpp b/Source/pysvn_transaction.cpp index e7e194afefec653715539b172cf711f789ef3fce..82a7a4e9b3843a4ca9571ef7db5d6c96a08dbf2e 100644 --- a/Source/pysvn_transaction.cpp +++ b/Source/pysvn_transaction.cpp @@ -68,7 +68,7 @@ pysvn_transaction::~pysvn_transaction() void pysvn_transaction::throw_client_error( SvnException &e ) { - throw Py::Exception( + throw Py::BaseException( m_module.client_error, e.pythonExceptionArg( m_exception_style ) ); } diff --git a/Source/setup_configure.py b/Source/setup_configure.py index e9b610c69dbc4549ff6c679ce21dab99c56d7284..17687c2f8f238fc1593f7c18c0cfc0438fd90232 100644 --- a/Source/setup_configure.py +++ b/Source/setup_configure.py @@ -1,6 +1,6 @@ # # ==================================================================== -# Copyright (c) 2005-2016 Barry A Scott. All rights reserved. +# Copyright (c) 2005-2018 Barry A Scott. All rights reserved. # # This software is licensed as described in the file LICENSE.txt, # which you should have received as part of this distribution. @@ -25,7 +25,7 @@ class SetupError(Exception): pass # version of PyCXX that we require -min_pycxx_version = (6, 2, 8) +min_pycxx_version = (7, 0, 2) _debug = False @@ -715,7 +715,7 @@ class Win32CompilerMSVC90(Compiler): return '.obj' def getTouchCommand( self ): - return r'c:\UnxUtils\touch' + return r'C:\UnxUtils\usr\local\wbin\touch.exe' def generateMakefileHeader( self ): self.makePrint( '#' ) @@ -832,6 +832,7 @@ class Win32CompilerMSVC90(Compiler): r'%(SVN_LIB)s\libsvn_ra-1.lib', r'%(SVN_LIB)s\libsvn_ra_local-1.lib', r'%(SVN_LIB)s\libsvn_ra_svn-1.lib', + r'%(SVN_LIB)s\libsvn_ra_serf-1.lib', r'%(SVN_LIB)s\libsvn_repos-1.lib', r'%(SVN_LIB)s\libsvn_subr-1.lib', r'%(SVN_LIB)s\libsvn_wc-1.lib', @@ -1138,7 +1139,7 @@ class MacOsxCompilerGCC(CompilerGCC): '-D%(DEBUG)s', ] - if self.pycxx_version >= (7, 0, 0): + if False and self.pycxx_version >= (7, 0, 0): # PYSVN uses PYCXX in backward compat mode py_cflags_list.append( r'-DPYCXX_6_2_COMPATIBILITY=1' ) diff --git a/Tests/test-01.unix.known_good-py2-svn1.11.log b/Tests/test-01.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..3abbd95ad5f5575c4cf443392cfe2b93fbe35f11 --- /dev/null +++ b/Tests/test-01.unix.known_good-py2-svn1.11.log @@ -0,0 +1,935 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-01 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-01 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: mkdir tmp +Info: PYSVN command /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos +Info: Testing - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk -m test-01 add trunk +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test -m test-01 add test +commit_finalizing . +Info: Testing - ls +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: ls file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos -v -R + 2 barry - 01-Apr-2018 12:10:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk + 2 barry - 01-Apr-2018 12:10:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test +Info: Testing - checkout +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Checked out revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn/Extension/Tests/find.py /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: Testing - add +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add --force file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file6.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2/file8.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add --non-recursive folder3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder3 +commit_finalizing . +Revision 3 +Info: Setup to test access to deleted files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit mod file +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +commit_finalizing . +Revision 4 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: rm file6.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit delete file +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +commit_finalizing . +Revision 5 +Info: Testing - update - get a new wc that will update +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Checked out revision 5 +Info: Testing - - checkin a mod from wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit modified file +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1.txt +commit_finalizing . +Revision 6 +Info: Testing - update +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Updated to revision 6 +Info: Testing - the rest in lexical order +Info: Testing - annotate +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: annotate /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +A /trunk/test/file1.txt +A /trunk/test/file1.txt +1| r3 | barry | 2018-04-01T11:10:50.747418Z | test add file 1 +2| r6 | barry | 2018-04-01T11:10:54.145616Z | line 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: annotate -r 3:4 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file6.txt +A /trunk/test/file6.txt +A /trunk/test/file6.txt +1| r3 | barry | 2018-04-01T11:10:50.747418Z | test add file 6 +2| r4 | barry | 2018-04-01T11:10:51.150123Z | test mod file 6 +Info: Testing - cat +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: cat -r head file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt +test add file 1 +line 2 + +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: cat -r 4 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file6.txt +test add file 6 +test mod file 6 + +Info: Testing - cleanup +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: cleanup /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: pysvn command: cleanup . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: Testing - copy +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags -m test-01 add tags +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: copy file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags/version1 +Log message +--- ------- +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls -v file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags + 8 barry - 01-Apr-2018 12:10:58 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags/version1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: copy /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: propset svn:eol-style native /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 -m copy test +commit_copied /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +commit_finalizing . +Revision 9 +Info: Testing - diff +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: diff /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt (revision 9) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt (working copy) +@@ -1,2 +1,3 @@ + test add file 1 + line 2 ++new line + +Info: Testing - export +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export --native-eol CR file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export --native-eol LF file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export --native-eol CRLF file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder3 +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/folder2/file8.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/folder2/file8.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/folder2/file8.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/folder2/file8.txt +Info: Testing - info +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 12:10:54 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +Name: file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 6 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 12:10:54 +Text Last Updated: 01-Apr-2018 12:10:55 +Checksum: d17a5219a23a23ce7f363b75e09ec043 +Info: Testing - log +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: log /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +------------------------------------------------------------ +rev 9: barry | 01-Apr-2018 12:10:59 | 1 lines +copy test +------------------------------------------------------------ +rev 6: barry | 01-Apr-2018 12:10:54 | 1 lines +commit modified file +------------------------------------------------------------ +rev 5: barry | 01-Apr-2018 12:10:52 | 1 lines +commit delete file +------------------------------------------------------------ +rev 4: barry | 01-Apr-2018 12:10:51 | 1 lines +commit mod file +------------------------------------------------------------ +rev 3: barry | 01-Apr-2018 12:10:50 | 1 lines +commit added files +------------------------------------------------------------ +rev 2: barry | 01-Apr-2018 12:10:48 | 1 lines +test-01 add test +------------------------------------------------------------ +rev 1: barry | 01-Apr-2018 12:10:48 | 1 lines +test-01 add trunk +------------------------------------------------------------ +Info: Testing - ls +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1b.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file3.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file4.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file5.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder1 +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls -v file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test + 6 barry 23 01-Apr-2018 12:10:54 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt + 9 barry 23 01-Apr-2018 12:10:59 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1b.txt + 3 barry 16 01-Apr-2018 12:10:50 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2.txt + 3 barry 16 01-Apr-2018 12:10:50 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file3.txt + 3 barry 16 01-Apr-2018 12:10:50 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file4.txt + 3 barry 16 01-Apr-2018 12:10:50 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file5.txt + 3 barry - 01-Apr-2018 12:10:50 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder1 + 3 barry - 01-Apr-2018 12:10:50 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls -v /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 barry 23 01-Apr-2018 12:10:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 9 barry 23 01-Apr-2018 12:10:59 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + 3 barry 16 01-Apr-2018 12:10:50 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + 3 barry 16 01-Apr-2018 12:10:50 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt + 3 barry 16 01-Apr-2018 12:10:50 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 3 barry 16 01-Apr-2018 12:10:50 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 3 barry - 01-Apr-2018 12:10:50 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 3 barry - 01-Apr-2018 12:10:50 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: Testing - merge - done below +Info: Testing - mkdir - done above +Info: Testing - move +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: move file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2b.txt +Log message +--- ------- +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: move /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 -m move wc test +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +commit_copied /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +commit_finalizing . +Revision 11 +Info: Testing - status +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 -m change wc1 for status -u to detect +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +commit_finalizing . +Revision 12 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + D 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt + M 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: update +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Updated to revision 12 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + D 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt + M 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 -m prop change +Nothing to commit +Info: Testing - propdel +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propset test:prop1 del_me file4.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Properties on 'file4.txt': + test:prop1: del_me +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propdel test:prop1 file4.txt +property_deleted /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Info: Testing - propget +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propset svn:eol-style native file4.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propget svn:eol-style file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt: native +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propget unknown file4.txt +Info: Testing - proplist - see above +Info: Testing - propset +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Properties on 'file4.txt': + svn:eol-style: native +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propset svn:eol-style native file4.txt +property_modified /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Properties on 'file4.txt': + svn:eol-style: native +Info: Testing - remove +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: remove file5.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: status + M file4.txt +D file5.txt +Info: Testing - resolved +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test -m make a conflict part 1 +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +commit_finalizing . +Revision 13 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +callback_conflict_resolver + action: + base_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.r6 + is_binary: False + kind: + merged_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + mime_type: None + my_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.mine + node_kind: + operation: + path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + property_name: None + reason: + repos_url: {'node_kind': , 'path_in_repos': u'trunk/test/file4.txt', 'peg_rev': , 'repos_url': u'file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos'} + repos_url: {'node_kind': , 'path_in_repos': u'trunk/test/file4.txt', 'peg_rev': , 'repos_url': u'file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos'} + their_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.r13 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_done /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_starting /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Updated to revision 13 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: status +CM file4.txt +? file4.txt.mine +? file4.txt.r13 +? file4.txt.r6 +D file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: cp /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.mine /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: resolved /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +R /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_done /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_starting /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt -m resolve a confict part 2 +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +commit_finalizing . +Revision 14 +Info: Testing - revert +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revert file5.txt +R /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: status +Info: Testing - revproplist +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revproplist file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Revision: 14 +svn:author: barry +svn:date: 2018-04-01T11:11:09.147406Z +svn:log: resolve a confict part 2 +Info: Testing - revpropget +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropget svn:log file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Revision: 14 +svn:log: resolve a confict part 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropget no_such_prop file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Revision: 14 +no_such_prop: None +Info: Testing - revpropset +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropset svn:log Hello world file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Testing - revpropdel +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropdel svn:log file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Testing - status - see above +Info: Testing - relocate +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: mkdir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: mv /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 01-Apr-2018 12:10:48 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: relocate file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 01-Apr-2018 12:10:48 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 12:10:54 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: relocate file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 12:10:54 +Info: Testing - switch +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 12:10:54 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: switch /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/tags/version1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/tags/version1 +Repository UUID: 29716637-e768-43f2-9441-80592def7c27 +Revision: 14 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 8 +Last Changed Date: 01-Apr-2018 12:10:58 +Info: Testing - update - see above +Info: Testing - merge +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder3 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +Checked out revision 14 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: add file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: add file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: commit -m add test merge files . +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 15 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: copy file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test-branch +Log message +--- ------- +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder3 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +Updated to revision 16 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: add file-merge-3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: rm file-merge-1.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: commit -m change test merge files . +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-3.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 17 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: merge --dry-run --revision 16:17 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-3.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +merge_begin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_completed /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_elide_info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +merge_record_info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_record_info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +merge_record_info_begin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_record_info_begin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: merge --revision 16:17 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_completed /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: status /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +A + /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: diff /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt (revision 16) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt (nonexistent) +@@ -1 +0,0 @@ +-test add file merge 1 +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt (revision 16) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt (working copy) +@@ -1 +1,2 @@ + test add file merge 2 ++modify merge 2 +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-3.txt +=================================================================== +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch (revision 16) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch (working copy) + +Property changes on: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +___________________________________________________________________ +Added: svn:mergeinfo +## -0,0 +0,1 ## + Merged /trunk/test:r17 + +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: Command: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn/Extension/Tests/test_01_set_get_tests.py /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/configdir +Info: test_01_set_get_tests start +Info: test_01_set_get_tests import pysvn +Info: test_01_set_get_tests pysvn.Client( /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/configdir ) +Info: Initial values +Info: get_auth_cache() => 1 +Info: get_auto_props() => 0 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: Change values 1 +Info: Changed values 1 +Info: get_auth_cache() => 0 +Info: get_auto_props() => 0 +Info: get_default_password() => 'thepass' +Info: get_default_username() => 'auser' +Info: get_interactive() => 0 +Info: get_store_passwords() => 0 +Info: Change values 2 +Info: Changed values 2 +Info: get_auth_cache() => 1 +Info: get_auto_props() => 1 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: test_01_set_get_tests dealloc Client() +Info: test_01_set_get_tests done +Info: Testing - import +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import -m test-01 add import +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message no spaces /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import-file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import file1A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message %20 in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import%20file1B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in file, none in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import-file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in file, space in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import file2A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in file, %20 in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import%20file2B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file-merge-3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file1A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file1B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file2A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file2B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import-file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import-file2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Updated to revision 24 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: log --limit 6 --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +------------------------------------------------------------ +rev 24: barry | 01-Apr-2018 12:11:18 | 1 lines +Changed paths: + A /trunk/test/import/import file2B.txt +space in file, %20 in url +------------------------------------------------------------ +rev 23: barry | 01-Apr-2018 12:11:18 | 1 lines +Changed paths: + A /trunk/test/import/import file2A.txt +space in file, space in url +------------------------------------------------------------ +rev 22: barry | 01-Apr-2018 12:11:17 | 1 lines +Changed paths: + A /trunk/test/import/import-file2.txt +space in file, none in url +------------------------------------------------------------ +rev 21: barry | 01-Apr-2018 12:11:17 | 1 lines +Changed paths: + A /trunk/test/import/import file1B.txt +%20 in url +------------------------------------------------------------ +rev 20: barry | 01-Apr-2018 12:11:17 | 1 lines +Changed paths: + A /trunk/test/import/import file1A.txt +space in url +------------------------------------------------------------ +rev 19: barry | 01-Apr-2018 12:11:17 | 1 lines +Changed paths: + A /trunk/test/import/import-file1.txt +no spaces +------------------------------------------------------------ diff --git a/Tests/test-01.unix.known_good-py3-svn1.11.log b/Tests/test-01.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..f6be6161b8de463890385587c891cd3cf9f0060f --- /dev/null +++ b/Tests/test-01.unix.known_good-py3-svn1.11.log @@ -0,0 +1,935 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-01 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-01 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: mkdir tmp +Info: PYSVN command /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos +Info: Testing - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk -m test-01 add trunk +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test -m test-01 add test +commit_finalizing . +Info: Testing - ls +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: ls file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos -v -R + 2 barry - 01-Apr-2018 09:55:46 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk + 2 barry - 01-Apr-2018 09:55:46 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test +Info: Testing - checkout +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Checked out revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn/Extension/Tests/find.py /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: Testing - add +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add --force file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add file6.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2/file8.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: add --non-recursive folder3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/folder3 +commit_finalizing . +Revision 3 +Info: Setup to test access to deleted files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit mod file +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +commit_finalizing . +Revision 4 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: rm file6.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit delete file +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file6.txt +commit_finalizing . +Revision 5 +Info: Testing - update - get a new wc that will update +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Checked out revision 5 +Info: Testing - - checkin a mod from wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin -m commit modified file +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1.txt +commit_finalizing . +Revision 6 +Info: Testing - update +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Updated to revision 6 +Info: Testing - the rest in lexical order +Info: Testing - annotate +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: annotate /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +A /trunk/test/file1.txt +A /trunk/test/file1.txt +1| r3 | barry | 2018-04-01T08:55:48.656649Z | test add file 1 +2| r6 | barry | 2018-04-01T08:55:52.264880Z | line 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: annotate -r 3:4 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file6.txt +A /trunk/test/file6.txt +A /trunk/test/file6.txt +1| r3 | barry | 2018-04-01T08:55:48.656649Z | test add file 6 +2| r4 | barry | 2018-04-01T08:55:49.246188Z | test mod file 6 +Info: Testing - cat +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: cat -r head file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt +test add file 1 +line 2 + +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: cat -r 4 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file6.txt +test add file 6 +test mod file 6 + +Info: Testing - cleanup +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: cleanup /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: pysvn command: cleanup . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: Testing - copy +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags -m test-01 add tags +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: copy file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags/version1 +Log message +--- ------- +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls -v file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags + 8 barry - 01-Apr-2018 09:55:56 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/tags/version1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: copy /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: propset svn:eol-style native /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 -m copy test +commit_copied /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +commit_finalizing . +Revision 9 +Info: Testing - diff +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: diff /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt (revision 9) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt (working copy) +@@ -1,2 +1,3 @@ + test add file 1 + line 2 ++new line + +Info: Testing - export +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export --native-eol CR file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export --native-eol LF file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: export --native-eol CRLF file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder3 +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.native/folder1/folder2/file8.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.cr/folder1/folder2/file8.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.lf/folder1/folder2/file8.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/file7.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/export1.crlf/folder1/folder2/file8.txt +Info: Testing - info +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 09:55:52 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +Name: file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 6 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 09:55:52 +Text Last Updated: 01-Apr-2018 09:55:53 +Checksum: d17a5219a23a23ce7f363b75e09ec043 +Info: Testing - log +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: log /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +------------------------------------------------------------ +rev 9: barry | 01-Apr-2018 09:55:57 | 1 lines +copy test +------------------------------------------------------------ +rev 6: barry | 01-Apr-2018 09:55:52 | 1 lines +commit modified file +------------------------------------------------------------ +rev 5: barry | 01-Apr-2018 09:55:50 | 1 lines +commit delete file +------------------------------------------------------------ +rev 4: barry | 01-Apr-2018 09:55:49 | 1 lines +commit mod file +------------------------------------------------------------ +rev 3: barry | 01-Apr-2018 09:55:48 | 1 lines +commit added files +------------------------------------------------------------ +rev 2: barry | 01-Apr-2018 09:55:46 | 1 lines +test-01 add test +------------------------------------------------------------ +rev 1: barry | 01-Apr-2018 09:55:45 | 1 lines +test-01 add trunk +------------------------------------------------------------ +Info: Testing - ls +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1b.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file3.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file4.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file5.txt +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder1 +file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls -v file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test + 6 barry 23 01-Apr-2018 09:55:52 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1.txt + 9 barry 23 01-Apr-2018 09:55:57 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file1b.txt + 3 barry 16 01-Apr-2018 09:55:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2.txt + 3 barry 16 01-Apr-2018 09:55:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file3.txt + 3 barry 16 01-Apr-2018 09:55:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file4.txt + 3 barry 16 01-Apr-2018 09:55:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file5.txt + 3 barry - 01-Apr-2018 09:55:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder1 + 3 barry - 01-Apr-2018 09:55:48 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: ls -v /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 barry 23 01-Apr-2018 09:55:52 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 9 barry 23 01-Apr-2018 09:55:57 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + 3 barry 16 01-Apr-2018 09:55:48 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + 3 barry 16 01-Apr-2018 09:55:48 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt + 3 barry 16 01-Apr-2018 09:55:48 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 3 barry 16 01-Apr-2018 09:55:48 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 3 barry - 01-Apr-2018 09:55:48 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 3 barry - 01-Apr-2018 09:55:48 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: Testing - merge - done below +Info: Testing - mkdir - done above +Info: Testing - move +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: move file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk/test/file2b.txt +Log message +--- ------- +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: move /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 -m move wc test +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +commit_copied /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +commit_finalizing . +Revision 11 +Info: Testing - status +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 -m change wc1 for status -u to detect +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +commit_finalizing . +Revision 12 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + D 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt + M 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: update +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file2.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file3.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Updated to revision 12 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: status --show-updates --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 + M 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test + 6 6 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt + D 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt + A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt + 11 11 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt + M 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/file7.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2 + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder1/folder2/file8.txt + 6 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/folder3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 -m prop change +Nothing to commit +Info: Testing - propdel +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propset test:prop1 del_me file4.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Properties on 'file4.txt': + test:prop1: del_me +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propdel test:prop1 file4.txt +property_deleted /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Info: Testing - propget +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propset svn:eol-style native file4.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propget svn:eol-style file4.txt +/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt: native +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propget unknown file4.txt +Info: Testing - proplist - see above +Info: Testing - propset +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Properties on 'file4.txt': + svn:eol-style: native +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: propset svn:eol-style native file4.txt +property_modified /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: proplist -v file4.txt +Properties on 'file4.txt': + svn:eol-style: native +Info: Testing - remove +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: remove file5.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: status + M file4.txt +D file5.txt +Info: Testing - resolved +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test -m make a conflict part 1 +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +commit_finalizing . +Revision 13 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +callback_conflict_resolver + action: + base_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.r6 + is_binary: False + kind: + merged_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + mime_type: None + my_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.mine + node_kind: + operation: + path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt + property_name: None + reason: + src_left_version: {'node_kind': , 'path_in_repos': 'trunk/test/file4.txt', 'peg_rev': , 'repos_url': 'file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos'} + src_right_version: {'node_kind': , 'path_in_repos': 'trunk/test/file4.txt', 'peg_rev': , 'repos_url': 'file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos'} + their_file: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.r13 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_done /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_starting /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Updated to revision 13 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: status +CM file4.txt +? file4.txt.mine +? file4.txt.r13 +? file4.txt.r6 +D file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: cp /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt.mine /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: resolved /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +R /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_done /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +conflict_resolver_starting /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: checkin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt -m resolve a confict part 2 +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +commit_finalizing . +Revision 14 +Info: Testing - revert +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revert file5.txt +R /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file5.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: status +Info: Testing - revproplist +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revproplist file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Revision: 14 +svn:author: barry +svn:date: 2018-04-01T08:56:09.258530Z +svn:log: resolve a confict part 2 +Info: Testing - revpropget +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropget svn:log file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Revision: 14 +svn:log: resolve a confict part 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropget no_such_prop file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Revision: 14 +no_such_prop: None +Info: Testing - revpropset +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropset svn:log Hello world file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Testing - revpropdel +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: revpropdel svn:log file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Testing - status - see above +Info: Testing - relocate +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: mkdir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: mv /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 01-Apr-2018 09:55:46 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: relocate file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 01-Apr-2018 09:55:46 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 09:55:52 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: relocate file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/repos/trunk file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 09:55:52 +Info: Testing - switch +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 6 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 01-Apr-2018 09:55:52 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: switch /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/tags/version1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file1b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file2b.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file3b.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test/file4.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2 +Name: . +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/tags/version1 +Repository UUID: 26afa6a8-5039-46b3-bd95-8bf0b505475b +Revision: 14 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 8 +Last Changed Date: 01-Apr-2018 09:55:56 +Info: Testing - update - see above +Info: Testing - merge +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/folder3 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +Checked out revision 14 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc2/test +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: add file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: add file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: commit -m add test merge files . +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 15 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: copy file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test-branch +Log message +--- ------- +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/folder3 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3 +Updated to revision 16 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: add file-merge-3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: rm file-merge-1.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: commit -m change test merge files . +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-3.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 17 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: merge --dry-run --revision 16:17 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-3.txt +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +merge_begin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_completed /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_elide_info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +merge_record_info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_record_info /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +merge_record_info_begin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_record_info_begin /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: merge --revision 16:17 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +merge_completed /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: status /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch + M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +D /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +A + /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-3.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: diff /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt (revision 16) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-1.txt (nonexistent) +@@ -1 +0,0 @@ +-test add file merge 1 +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt (revision 16) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-2.txt (working copy) +@@ -1 +1,2 @@ + test add file merge 2 ++modify merge 2 +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch/file-merge-3.txt +=================================================================== +Index: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +=================================================================== +--- /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch (revision 16) ++++ /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch (working copy) + +Property changes on: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test-branch +___________________________________________________________________ +Added: svn:mergeinfo +## -0,0 +0,1 ## + Merged /trunk/test:r17 + +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn/Extension/Tests/test_01_set_get_tests.py /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/configdir +Info: test_01_set_get_tests start +Info: test_01_set_get_tests import pysvn +Info: test_01_set_get_tests pysvn.Client( /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/configdir ) +Info: Initial values +Info: get_auth_cache() => 1 +Info: get_auto_props() => 0 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: Change values 1 +Info: Changed values 1 +Info: get_auth_cache() => 0 +Info: get_auto_props() => 0 +Info: get_default_password() => 'thepass' +Info: get_default_username() => 'auser' +Info: get_interactive() => 0 +Info: get_store_passwords() => 0 +Info: Change values 2 +Info: Changed values 2 +Info: get_auth_cache() => 1 +Info: get_auto_props() => 1 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: test_01_set_get_tests dealloc Client() +Info: test_01_set_get_tests done +Info: Testing - import +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import -m test-01 add import +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message no spaces /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import-file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import file1A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message %20 in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import%20file1B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import1.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in file, none in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import-file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in file, space in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import file2A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: import --message space in file, %20 in url /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/root/repos/trunk/test/import/import%20file2B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/tmp/import 2.txt +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file-merge-1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file1b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file2b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file3b.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file4.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/file5.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1/file7.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder1/folder2/file8.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test-branch/folder3 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file-merge-2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file-merge-3.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file1A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file1B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file2A.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import file2B.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import-file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/import/import-file2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1/test/file4.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +Updated to revision 24 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc3/test +Info: pysvn command: log --limit 6 --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-01/wc1 +------------------------------------------------------------ +rev 24: barry | 01-Apr-2018 09:56:21 | 1 lines +Changed paths: + A /trunk/test/import/import file2B.txt +space in file, %20 in url +------------------------------------------------------------ +rev 23: barry | 01-Apr-2018 09:56:21 | 1 lines +Changed paths: + A /trunk/test/import/import file2A.txt +space in file, space in url +------------------------------------------------------------ +rev 22: barry | 01-Apr-2018 09:56:20 | 1 lines +Changed paths: + A /trunk/test/import/import-file2.txt +space in file, none in url +------------------------------------------------------------ +rev 21: barry | 01-Apr-2018 09:56:20 | 1 lines +Changed paths: + A /trunk/test/import/import file1B.txt +%20 in url +------------------------------------------------------------ +rev 20: barry | 01-Apr-2018 09:56:20 | 1 lines +Changed paths: + A /trunk/test/import/import file1A.txt +space in url +------------------------------------------------------------ +rev 19: barry | 01-Apr-2018 09:56:20 | 1 lines +Changed paths: + A /trunk/test/import/import-file1.txt +no spaces +------------------------------------------------------------ diff --git a/Tests/test-01.win32.known_good-py2-svn1.11.log b/Tests/test-01.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..1a45244d66cdafa52cdb664d1208d258365e1651 --- /dev/null +++ b/Tests/test-01.win32.known_good-py2-svn1.11.log @@ -0,0 +1,956 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win32\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-01 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-01 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:\repos +Info: Test - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-01 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-01 add test" +commit_finalizing . +Info: Test - ls + +Info: PYSVN CMD ls file:///b:/repos -v -R + 2 barry - 02-Apr-2018 19:34:10 file:///B:/repos/trunk + 2 barry - 02-Apr-2018 19:34:10 file:///B:/repos/trunk/test +Info: Test - checkout + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD dir b:\wc1 /s /b /a-h +b:\wc1\test +b:\wc1\.svn\entries +b:\wc1\.svn\format +b:\wc1\.svn\pristine +b:\wc1\.svn\tmp +b:\wc1\.svn\wc.db +b:\wc1\.svn\wc.db-journal + +Info: CMD cd /d b:\wc1\test +Info: Test - add +Info: Create File file1.txt - test add file 1 +Info: Create File file2.txt - test add file 2 +Info: Create File file3.txt - test add file 3 +Info: Create File file4.txt - test add file 4 +Info: Create File file5.txt - test add file 5 + +Info: CMD mkdir folder1 +Info: Create File folder1\file7.txt - test add file 7 + +Info: CMD mkdir folder1\folder2 +Info: Create File folder1\folder2\file8.txt - test add file 8 + +Info: CMD mkdir folder3 +Info: Create File folder3\file9.txt - test add file 9 + +Info: CMD mkdir folder3\folder4 +Info: Create File folder3\folder4\file10.txt - test add file 10 + +Info: PYSVN CMD add file1.txt +A B:/wc1/test/file1.txt + +Info: PYSVN CMD add file2.txt +A B:/wc1/test/file2.txt + +Info: PYSVN CMD add file3.txt +A B:/wc1/test/file3.txt + +Info: PYSVN CMD add file4.txt +A B:/wc1/test/file4.txt + +Info: PYSVN CMD add --force file5.txt +A B:/wc1/test/file5.txt + +Info: PYSVN CMD add folder1 +A B:/wc1/test/folder1 +A B:/wc1/test/folder1/file7.txt +A B:/wc1/test/folder1/folder2 +A B:/wc1/test/folder1/folder2/file8.txt + +Info: PYSVN CMD add --non-recursive folder3 +A B:/wc1/test/folder3 + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file1.txt +A B:/wc1/test/file2.txt +A B:/wc1/test/file3.txt +A B:/wc1/test/file4.txt +A B:/wc1/test/file5.txt +A B:/wc1/test/folder1 +A B:/wc1/test/folder1/file7.txt +A B:/wc1/test/folder1/folder2 +A B:/wc1/test/folder1/folder2/file8.txt +A B:/wc1/test/folder3 +commit_finalizing . +Revision 3 +Info: Test - update - get a new wc that will update + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc2 +A B:/wc2/test +A B:/wc2/test/file1.txt +A B:/wc2/test/file2.txt +A B:/wc2/test/file3.txt +A B:/wc2/test/file4.txt +A B:/wc2/test/file5.txt +A B:/wc2/test/folder1 +A B:/wc2/test/folder1/file7.txt +A B:/wc2/test/folder1/folder2 +A B:/wc2/test/folder1/folder2/file8.txt +A B:/wc2/test/folder3 +U B:/wc2 +update_started B:/wc2 +Checked out revision 3 +Info: Test - - checkin a mod from wc1 +Info: Append File b:\wc1\test\file1.txt - line 2 + +Info: PYSVN CMD checkin -m "commit modified file" +M B:/wc1/test/file1.txt +commit_finalizing . +Revision 4 + +Info: PYSVN CMD checkin -m "commit modified file" +Nothing to commit +Info: Test - update + +Info: PYSVN CMD update b:\wc2 +U B:/wc2 +U B:/wc2/test +U B:/wc2/test/file1.txt +update_started B:/wc2 +Updated to revision 4 +Info: Test - the rest in lexical order +Info: Test - annotate + +Info: PYSVN CMD annotate b:\wc2\test\file1.txt +A /trunk/test/file1.txt +A /trunk/test/file1.txt +1| r3 | barry | 2018-04-02T18:34:12.561156Z | test add file 1 +2| r4 | barry | 2018-04-02T18:34:13.275019Z | line 2 +Info: Test - cat + +Info: PYSVN CMD cat -r head file:///b:/repos/trunk/test/file1.txt +test add file 1 +line 2 + +Info: Test - cleanup +Info: Test - copy + +Info: PYSVN CMD mkdir file:///b:/repos/tags -m "test-01 add tags" +commit_finalizing . +Info: Create File msg.tmp - tag the trunk + +Info: PYSVN CMD copy file:///b:/repos/trunk file:///b:/repos/tags/version1 +Log message +--- ------- +commit_finalizing . + +Info: PYSVN CMD ls -v file:///b:/repos/tags + 6 barry - 02-Apr-2018 19:34:14 file:///B:/repos/tags/version1 + +Info: PYSVN CMD copy b:\wc2\test\file1.txt b:\wc2\test\file1b.txt +A B:/wc2/test/file1b.txt + +Info: PYSVN CMD propset svn:eol-style native b:\wc2\test\file1b.txt +property_added B:/wc2/test/file1b.txt + +Info: PYSVN CMD checkin b:\wc2 -m "copy test" +commit_copied B:/wc2/test/file1b.txt +commit_finalizing . +Revision 7 +Info: Test - diff +Info: Append File b:\wc2\test\file1b.txt - new line + +Info: PYSVN CMD diff b:\wc2 +Index: B:/wc2/test/file1b.txt +=================================================================== +--- B:/wc2/test/file1b.txt (revision 7) ++++ B:/wc2/test/file1b.txt (working copy) +@@ -1,2 +1,3 @@ + test add file 1 + line 2 ++new line + +Info: Test - export + +Info: PYSVN CMD export file:///b:/repos/trunk/test b:\export1.native +A B:/export1.native +A B:/export1.native/file1.txt +A B:/export1.native/file1b.txt +A B:/export1.native/file2.txt +A B:/export1.native/file3.txt +A B:/export1.native/file4.txt +A B:/export1.native/file5.txt +A B:/export1.native/folder1 +A B:/export1.native/folder1/file7.txt +A B:/export1.native/folder1/folder2 +A B:/export1.native/folder1/folder2/file8.txt +A B:/export1.native/folder3 + +Info: PYSVN CMD export --native-eol CR file:///b:/repos/trunk/test b:\export1.cr +A B:/export1.cr +A B:/export1.cr/file1.txt +A B:/export1.cr/file1b.txt +A B:/export1.cr/file2.txt +A B:/export1.cr/file3.txt +A B:/export1.cr/file4.txt +A B:/export1.cr/file5.txt +A B:/export1.cr/folder1 +A B:/export1.cr/folder1/file7.txt +A B:/export1.cr/folder1/folder2 +A B:/export1.cr/folder1/folder2/file8.txt +A B:/export1.cr/folder3 + +Info: PYSVN CMD export --native-eol LF file:///b:/repos/trunk/test b:\export1.lf +A B:/export1.lf +A B:/export1.lf/file1.txt +A B:/export1.lf/file1b.txt +A B:/export1.lf/file2.txt +A B:/export1.lf/file3.txt +A B:/export1.lf/file4.txt +A B:/export1.lf/file5.txt +A B:/export1.lf/folder1 +A B:/export1.lf/folder1/file7.txt +A B:/export1.lf/folder1/folder2 +A B:/export1.lf/folder1/folder2/file8.txt +A B:/export1.lf/folder3 + +Info: PYSVN CMD export --native-eol CRLF file:///b:/repos/trunk/test b:\export1.crlf +A B:/export1.crlf +A B:/export1.crlf/file1.txt +A B:/export1.crlf/file1b.txt +A B:/export1.crlf/file2.txt +A B:/export1.crlf/file3.txt +A B:/export1.crlf/file4.txt +A B:/export1.crlf/file5.txt +A B:/export1.crlf/folder1 +A B:/export1.crlf/folder1/file7.txt +A B:/export1.crlf/folder1/folder2 +A B:/export1.crlf/folder1/folder2/file8.txt +A B:/export1.crlf/folder3 + +Info: CMD dir /s /b b:\export1.native +b:\export1.native\file1.txt +b:\export1.native\file1b.txt +b:\export1.native\file2.txt +b:\export1.native\file3.txt +b:\export1.native\file4.txt +b:\export1.native\file5.txt +b:\export1.native\folder1 +b:\export1.native\folder3 +b:\export1.native\folder1\file7.txt +b:\export1.native\folder1\folder2 +b:\export1.native\folder1\folder2\file8.txt + +Info: CMD dir /s /b b:\export1.cr +b:\export1.cr\file1.txt +b:\export1.cr\file1b.txt +b:\export1.cr\file2.txt +b:\export1.cr\file3.txt +b:\export1.cr\file4.txt +b:\export1.cr\file5.txt +b:\export1.cr\folder1 +b:\export1.cr\folder3 +b:\export1.cr\folder1\file7.txt +b:\export1.cr\folder1\folder2 +b:\export1.cr\folder1\folder2\file8.txt + +Info: CMD dir /s /b b:\export1.lf +b:\export1.lf\file1.txt +b:\export1.lf\file1b.txt +b:\export1.lf\file2.txt +b:\export1.lf\file3.txt +b:\export1.lf\file4.txt +b:\export1.lf\file5.txt +b:\export1.lf\folder1 +b:\export1.lf\folder3 +b:\export1.lf\folder1\file7.txt +b:\export1.lf\folder1\folder2 +b:\export1.lf\folder1\folder2\file8.txt + +Info: CMD dir /s /b b:\export1.crlf +b:\export1.crlf\file1.txt +b:\export1.crlf\file1b.txt +b:\export1.crlf\file2.txt +b:\export1.crlf\file3.txt +b:\export1.crlf\file4.txt +b:\export1.crlf\file5.txt +b:\export1.crlf\folder1 +b:\export1.crlf\folder3 +b:\export1.crlf\folder1\file7.txt +b:\export1.crlf\folder1\folder2 +b:\export1.crlf\folder1\folder2\file8.txt +Info: Test - info + +Info: PYSVN CMD info b:\wc2\test +Path: b:\wc2\test +Name: . +Url: file:///B:/repos/trunk/test +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 19:34:13 + +Info: PYSVN CMD info b:\wc2\test\file1.txt +Path: b:\wc2\test\file1.txt +Name: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 4 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 19:34:13 +Text Last Updated: 02-Apr-2018 19:34:13 +Checksum: cb0b37e264ebcc467e9f37a069e034d7 +Info: Test - log + +Info: PYSVN CMD log b:\wc2 +------------------------------------------------------------ +rev 7: barry | 02-Apr-2018 19:34:15 | 1 lines +copy test +------------------------------------------------------------ +rev 4: barry | 02-Apr-2018 19:34:13 | 1 lines +commit modified file +------------------------------------------------------------ +rev 3: barry | 02-Apr-2018 19:34:12 | 1 lines +commit added files +------------------------------------------------------------ +rev 2: barry | 02-Apr-2018 19:34:10 | 1 lines +test-01 add test +------------------------------------------------------------ +rev 1: barry | 02-Apr-2018 19:34:09 | 1 lines +test-01 add trunk +------------------------------------------------------------ +Info: Test - ls + +Info: PYSVN CMD ls file:///b:/repos/trunk/test +file:///B:/repos/trunk/test/file1.txt +file:///B:/repos/trunk/test/file1b.txt +file:///B:/repos/trunk/test/file2.txt +file:///B:/repos/trunk/test/file3.txt +file:///B:/repos/trunk/test/file4.txt +file:///B:/repos/trunk/test/file5.txt +file:///B:/repos/trunk/test/folder1 +file:///B:/repos/trunk/test/folder3 + +Info: PYSVN CMD ls -v file:///b:/repos/trunk/test + 4 barry 25 02-Apr-2018 19:34:13 file:///B:/repos/trunk/test/file1.txt + 7 barry 23 02-Apr-2018 19:34:15 file:///B:/repos/trunk/test/file1b.txt + 3 barry 17 02-Apr-2018 19:34:12 file:///B:/repos/trunk/test/file2.txt + 3 barry 17 02-Apr-2018 19:34:12 file:///B:/repos/trunk/test/file3.txt + 3 barry 17 02-Apr-2018 19:34:12 file:///B:/repos/trunk/test/file4.txt + 3 barry 17 02-Apr-2018 19:34:12 file:///B:/repos/trunk/test/file5.txt + 3 barry - 02-Apr-2018 19:34:12 file:///B:/repos/trunk/test/folder1 + 3 barry - 02-Apr-2018 19:34:12 file:///B:/repos/trunk/test/folder3 + +Info: PYSVN CMD ls b:\wc2\test +B:/wc2/test/file1.txt +B:/wc2/test/file1b.txt +B:/wc2/test/file2.txt +B:/wc2/test/file3.txt +B:/wc2/test/file4.txt +B:/wc2/test/file5.txt +B:/wc2/test/folder1 +B:/wc2/test/folder3 + +Info: PYSVN CMD ls -v b:\wc2\test + 4 barry 25 02-Apr-2018 19:34:13 B:/wc2/test/file1.txt + 7 barry 23 02-Apr-2018 19:34:15 B:/wc2/test/file1b.txt + 3 barry 17 02-Apr-2018 19:34:12 B:/wc2/test/file2.txt + 3 barry 17 02-Apr-2018 19:34:12 B:/wc2/test/file3.txt + 3 barry 17 02-Apr-2018 19:34:12 B:/wc2/test/file4.txt + 3 barry 17 02-Apr-2018 19:34:12 B:/wc2/test/file5.txt + 3 barry - 02-Apr-2018 19:34:12 B:/wc2/test/folder1 + 3 barry - 02-Apr-2018 19:34:12 B:/wc2/test/folder3 +Info: Test - merge - see below +Info: Test - mkdir - done above +Info: Test - move +Info: Create File msg.tmp - move url test + +Info: PYSVN CMD move file:///b:/repos/trunk/test/file2.txt file:///b:/repos/trunk/test/file2b.txt +Log message +--- ------- +commit_finalizing . + +Info: PYSVN CMD move b:\wc2\test\file3.txt b:\wc2\test\file3b.txt +A B:/wc2/test/file3b.txt +D B:/wc2/test/file3.txt + +Info: PYSVN CMD checkin b:\wc2 -m "move wc test" +D B:/wc2/test/file3.txt +M B:/wc2/test/file1b.txt +commit_copied B:/wc2/test/file3b.txt +commit_finalizing . +Revision 9 +Info: Test - status +Info: Append File b:\wc1\test\file4.txt - file 4 is changing + +Info: PYSVN CMD checkin b:\wc1 -m "change wc1 for status -u to detect" +M B:/wc1/test/file4.txt +commit_finalizing . +Revision 10 + +Info: PYSVN CMD status b:\wc2 + +Info: PYSVN CMD status --verbose b:\wc2 + 4 4 barry B:\wc2 + 4 4 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 9 9 barry B:\wc2\test\file1b.txt + 4 3 barry B:\wc2\test\file2.txt + 9 9 barry B:\wc2\test\file3b.txt + 4 3 barry B:\wc2\test\file4.txt + 4 3 barry B:\wc2\test\file5.txt + 4 3 barry B:\wc2\test\folder1 + 4 3 barry B:\wc2\test\folder1\file7.txt + 4 3 barry B:\wc2\test\folder1\folder2 + 4 3 barry B:\wc2\test\folder1\folder2\file8.txt + 4 3 barry B:\wc2\test\folder3 + +Info: PYSVN CMD status --show-updates b:\wc2 + M B:\wc2\test + D B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + M B:\wc2\test\file4.txt + +Info: PYSVN CMD status --show-updates --verbose b:\wc2 + 4 4 barry B:\wc2 + M 4 4 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 9 9 barry B:\wc2\test\file1b.txt + D 4 3 barry B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + 9 9 barry B:\wc2\test\file3b.txt + M 4 3 barry B:\wc2\test\file4.txt + 4 3 barry B:\wc2\test\file5.txt + 4 3 barry B:\wc2\test\folder1 + 4 3 barry B:\wc2\test\folder1\file7.txt + 4 3 barry B:\wc2\test\folder1\folder2 + 4 3 barry B:\wc2\test\folder1\folder2\file8.txt + 4 3 barry B:\wc2\test\folder3 + +Info: PYSVN CMD update +A B:/wc1/test/file1b.txt +A B:/wc1/test/file2b.txt +A B:/wc1/test/file3b.txt +D B:/wc1/test/file2.txt +D B:/wc1/test/file3.txt +U B:/wc1 +U B:/wc1/test +update_started B:/wc1/test +Updated to revision 10 + +Info: PYSVN CMD status --show-updates b:\wc2 + M B:\wc2\test + D B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + M B:\wc2\test\file4.txt + +Info: PYSVN CMD status --show-updates --verbose b:\wc2 + 4 4 barry B:\wc2 + M 4 4 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 9 9 barry B:\wc2\test\file1b.txt + D 4 3 barry B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + 9 9 barry B:\wc2\test\file3b.txt + M 4 3 barry B:\wc2\test\file4.txt + 4 3 barry B:\wc2\test\file5.txt + 4 3 barry B:\wc2\test\folder1 + 4 3 barry B:\wc2\test\folder1\file7.txt + 4 3 barry B:\wc2\test\folder1\folder2 + 4 3 barry B:\wc2\test\folder1\folder2\file8.txt + 4 3 barry B:\wc2\test\folder3 + +Info: PYSVN CMD checkin b:\wc2 -m "prop change" +Nothing to commit +Info: Test - propdel + +Info: CMD cd /d b:\wc2\test + +Info: PYSVN CMD propset test:prop1 del_me file4.txt +property_added B:/wc2/test/file4.txt + +Info: PYSVN CMD proplist -v file4.txt +Properties on 'file4.txt': + test:prop1: del_me + +Info: PYSVN CMD propdel test:prop1 file4.txt +property_deleted B:/wc2/test/file4.txt + +Info: PYSVN CMD proplist -v file4.txt +Info: Test - propget + +Info: PYSVN CMD propget svn:eol-style file4.txt +Info: Test - proplist - see above +Info: Test - propset + +Info: CMD cd /d b:\wc2\test + +Info: PYSVN CMD proplist -v file4.txt + +Info: PYSVN CMD propset svn:eol-style native file4.txt +property_added B:/wc2/test/file4.txt + +Info: PYSVN CMD proplist -v file4.txt +Properties on 'file4.txt': + svn:eol-style: native +Info: Test - remove + +Info: CMD cd /d b:\wc2\test + +Info: PYSVN CMD remove file5.txt +D B:/wc2/test/file5.txt + +Info: PYSVN CMD status +MM file4.txt +D file5.txt +Info: Test - resolved +Info: Append File b:\wc1\test\file4.txt - conflict in file4 yes +Info: Append File b:\wc2\test\file4.txt - conflict in file4 no + +Info: PYSVN CMD checkin b:\wc1\test -m "make a conflict part 1" +M B:/wc1/test/file4.txt +commit_finalizing . +Revision 11 + +Info: PYSVN CMD update b:\wc2\test +callback_conflict_resolver + action: + base_file: B:\wc2\test\file4.txt.r4 + is_binary: False + kind: + merged_file: B:\wc2\test\file4.txt + mime_type: None + my_file: B:\wc2\test\file4.txt.mine + node_kind: + operation: + path: B:/wc2/test/file4.txt + property_name: None + reason: + repos_url: {'node_kind': , 'path_in_repos': u'trunk/test/file4.txt', 'peg_rev': , 'repos_url': u'file:///B:/repos'} + repos_url: {'node_kind': , 'path_in_repos': u'trunk/test/file4.txt', 'peg_rev': , 'repos_url': u'file:///B:/repos'} + their_file: B:\wc2\test\file4.txt.r11 +A B:/wc2/test/file2b.txt +D B:/wc2/test/file2.txt +U B:/wc2 +U B:/wc2/test +U B:/wc2/test/file4.txt +conflict_resolver_done B:/wc2/test/file4.txt +conflict_resolver_starting B:/wc2/test/file4.txt +update_started B:/wc2/test +Updated to revision 11 + +Info: PYSVN CMD status +CM file4.txt +? file4.txt.mine +? file4.txt.r11 +? file4.txt.r4 +D file5.txt + +Info: CMD copy b:\wc2\test\file4.txt.mine b:\wc2\test\file4.txt + 1 file(s) copied. + +Info: PYSVN CMD resolved b:\wc2\test\file4.txt +R B:/wc2/test/file4.txt +conflict_resolver_done B:/wc2/test/file4.txt +conflict_resolver_starting B:/wc2/test/file4.txt + +Info: PYSVN CMD checkin b:\wc2\test\file4.txt -m "resolve a confict part 2" +M B:/wc2/test/file4.txt +commit_finalizing . +Revision 12 +Info: Test - revert + +Info: PYSVN CMD revert file5.txt +R B:/wc2/test/file5.txt + +Info: PYSVN CMD status +Info: Test - revproplist + +Info: PYSVN CMD revproplist file:///b:/repos/trunk +Revision: 12 +svn:author: barry +svn:date: 2018-04-02T18:34:21.697985Z +svn:log: resolve a confict part 2 +Info: Test - revpropget + +Info: PYSVN CMD revpropget svn:log file:///b:/repos/trunk +Revision: 12 +svn:log: resolve a confict part 2 + +Info: PYSVN CMD revpropget no_such_prop file:///b:/repos/trunk +Revision: 12 +no_such_prop: None +Info: Test - revpropset + +Info: PYSVN CMD revpropset svn:log "Hello world" file:///b:/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Test - revpropdel + +Info: PYSVN CMD revpropdel svn:log file:///b:/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Test - status - see above +Info: Test - relocate + +Info: CMD mkdir b:\root + +Info: CMD move b:\repos b:\root + 1 dir(s) moved. + +Info: PYSVN CMD info b:\wc1 +Path: b:\wc1 +Name: . +Url: file:///B:/repos/trunk +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 02-Apr-2018 19:34:10 + +Info: PYSVN CMD relocate file:///b:/repos/trunk file:///b:/root/repos/trunk b:\wc1 + +Info: PYSVN CMD info b:\wc1 +Path: b:\wc1 +Name: . +Url: file:///B:/root/repos/trunk +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 02-Apr-2018 19:34:10 + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/repos/trunk +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 19:34:13 + +Info: PYSVN CMD relocate file:///b:/repos/trunk file:///b:/root/repos/trunk b:\wc2 + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/root/repos/trunk +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 19:34:13 +Info: Test - switch + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/root/repos/trunk +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 19:34:13 + +Info: PYSVN CMD switch b:\wc2 file:///b:/root/repos/tags/version1 +A B:/wc2/test/file2.txt +A B:/wc2/test/file3.txt +D B:/wc2/test/file1b.txt +D B:/wc2/test/file2b.txt +D B:/wc2/test/file3b.txt +U B:/wc2 +U B:/wc2/test +U B:/wc2/test/file4.txt + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/root/repos/tags/version1 +Repository UUID: 383c1d92-6283-d54d-a54e-8830d52813ca +Revision: 12 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 02-Apr-2018 19:34:14 +Info: Test - update - see above +Info: Test - Info: Testing - merge + +Info: PYSVN CMD checkout file:///b:/root/repos/trunk b:\wc3 +A B:/wc3/test +A B:/wc3/test/file1.txt +A B:/wc3/test/file1b.txt +A B:/wc3/test/file2b.txt +A B:/wc3/test/file3b.txt +A B:/wc3/test/file4.txt +A B:/wc3/test/file5.txt +A B:/wc3/test/folder1 +A B:/wc3/test/folder1/file7.txt +A B:/wc3/test/folder1/folder2 +A B:/wc3/test/folder1/folder2/file8.txt +A B:/wc3/test/folder3 +U B:/wc3 +update_started B:/wc3 +Checked out revision 12 + +Info: CMD cd b:\wc3\test +Info: Create File file-merge-1.txt - test add file merge 1 +Info: Create File file-merge-2.txt - test add file merge 2 + +Info: PYSVN CMD add file-merge-1.txt +A B:/wc3/test/file-merge-1.txt + +Info: PYSVN CMD add file-merge-2.txt +A B:/wc3/test/file-merge-2.txt + +Info: PYSVN CMD commit -m "add test merge files" . +A B:/wc3/test/file-merge-1.txt +A B:/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 13 +Info: Create File msg.tmp - make a branch + +Info: PYSVN CMD copy file:///b:/root/repos/trunk/test file:///b:/root/repos/trunk/test-branch +Log message +--- ------- +commit_finalizing . + +Info: PYSVN CMD update b:\wc3 +A B:/wc3/test-branch +A B:/wc3/test-branch/file-merge-1.txt +A B:/wc3/test-branch/file-merge-2.txt +A B:/wc3/test-branch/file1.txt +A B:/wc3/test-branch/file1b.txt +A B:/wc3/test-branch/file2b.txt +A B:/wc3/test-branch/file3b.txt +A B:/wc3/test-branch/file4.txt +A B:/wc3/test-branch/file5.txt +A B:/wc3/test-branch/folder1 +A B:/wc3/test-branch/folder1/file7.txt +A B:/wc3/test-branch/folder1/folder2 +A B:/wc3/test-branch/folder1/folder2/file8.txt +A B:/wc3/test-branch/folder3 +U B:/wc3 +update_started B:/wc3 +Updated to revision 14 +Info: Create File file-merge-3.txt - test add file merge 3 + +Info: PYSVN CMD add file-merge-3.txt +A B:/wc3/test/file-merge-3.txt + +Info: PYSVN CMD rm file-merge-1.txt +D B:/wc3/test/file-merge-1.txt +Info: Append File file-merge-2.txt - modify merge 2 + +Info: PYSVN CMD commit -m "change test merge files" . +A B:/wc3/test/file-merge-3.txt +D B:/wc3/test/file-merge-1.txt +M B:/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 15 + +Info: PYSVN CMD merge --dry-run --revision 14:15 file:///b:/root/repos/trunk/test b:\wc3\test-branch +A B:/wc3/test-branch/file-merge-3.txt +D B:/wc3/test-branch/file-merge-1.txt +U B:/wc3/test-branch/file-merge-2.txt +U B:/wc3/test-branch/file-merge-2.txt +merge_begin B:/wc3/test-branch +merge_completed B:/wc3/test-branch +merge_elide_info B:/wc3/test-branch/file-merge-2.txt +merge_record_info B:/wc3/test-branch +merge_record_info B:/wc3/test-branch/file-merge-2.txt +merge_record_info_begin B:/wc3/test-branch +merge_record_info_begin B:/wc3/test-branch/file-merge-2.txt + +Info: PYSVN CMD merge --revision 14:15 file:///b:/root/repos/trunk/test b:\wc3\test-branch +merge_completed B:/wc3/test-branch + +Info: PYSVN CMD status b:\wc3\test-branch + M B:\wc3\test-branch +D B:\wc3\test-branch\file-merge-1.txt +M B:\wc3\test-branch\file-merge-2.txt +A + B:\wc3\test-branch\file-merge-3.txt + +Info: PYSVN CMD diff b:\wc3\test-branch +Index: B:/wc3/test-branch/file-merge-1.txt +=================================================================== +--- B:/wc3/test-branch/file-merge-1.txt (revision 14) ++++ B:/wc3/test-branch/file-merge-1.txt (nonexistent) +@@ -1 +0,0 @@ +-test add file merge 1 +Index: B:/wc3/test-branch/file-merge-2.txt +=================================================================== +--- B:/wc3/test-branch/file-merge-2.txt (revision 14) ++++ B:/wc3/test-branch/file-merge-2.txt (working copy) +@@ -1 +1,2 @@ + test add file merge 2 ++modify merge 2 +Index: B:/wc3/test-branch/file-merge-3.txt +=================================================================== +Index: B:/wc3/test-branch +=================================================================== +--- B:/wc3/test-branch (revision 14) ++++ B:/wc3/test-branch (working copy) + +Property changes on: B:/wc3/test-branch +___________________________________________________________________ +Added: svn:mergeinfo +## -0,0 +0,1 ## + Merged /trunk/test:r15 + + +Info: CMD c:\python27.Win32\python.exe -u C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_01_set_get_tests.py b:\configdir +Info: test_01_set_get_tests start +Info: test_01_set_get_tests import pysvn +Info: test_01_set_get_tests pysvn.Client( b:\configdir ) +Info: Initial values +Info: get_auth_cache() => 1 +Info: get_auto_props() => 0 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: Change values 1 +Info: Changed values 1 +Info: get_auth_cache() => 0 +Info: get_auto_props() => 0 +Info: get_default_password() => 'thepass' +Info: get_default_username() => 'auser' +Info: get_interactive() => 0 +Info: get_store_passwords() => 0 +Info: Change values 2 +Info: Changed values 2 +Info: get_auth_cache() => 1 +Info: get_auto_props() => 1 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: test_01_set_get_tests dealloc Client() +Info: test_01_set_get_tests done +Info: Test - import + +Info: CMD mkdir b:\tmp +Info: Create File b:\tmp\import1.txt - import file 1 +Info: Create File "b:\tmp\import 2.txt" - import file 2 + +Info: PYSVN CMD mkdir "file:///b:/root/repos/trunk/test/import" -m "test-01 add import" +commit_finalizing . + +Info: PYSVN CMD import --message "no spaces" "b:\tmp\import1.txt" "file:///b:/root/repos/trunk/test/import/import-file1.txt" +A B:/tmp/import1.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in url" "b:\tmp\import1.txt" "file:///b:/root/repos/trunk/test/import/import file1A.txt" +A B:/tmp/import1.txt +commit_finalizing . + +Info: PYSVN CMD import --message "0 in url" "b:\tmp\import1.txt" "file:///b:/root/repos/trunk/test/import/import0file1B.txt" +A B:/tmp/import1.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in file, none in url" "b:\tmp\import 2.txt" "file:///b:/root/repos/trunk/test/import/import-file2.txt" +A B:/tmp/import 2.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in file, space in url" "b:\tmp\import 2.txt" "file:///b:/root/repos/trunk/test/import/import file2A.txt" +A B:/tmp/import 2.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in file, 0 in url" "b:\tmp\import 2.txt" "file:///b:/root/repos/trunk/test/import/import0file2B.txt" +A B:/tmp/import 2.txt +commit_finalizing . + +Info: PYSVN CMD update b:\wc1 +A B:/wc1/test-branch +A B:/wc1/test-branch/file-merge-1.txt +A B:/wc1/test-branch/file-merge-2.txt +A B:/wc1/test-branch/file1.txt +A B:/wc1/test-branch/file1b.txt +A B:/wc1/test-branch/file2b.txt +A B:/wc1/test-branch/file3b.txt +A B:/wc1/test-branch/file4.txt +A B:/wc1/test-branch/file5.txt +A B:/wc1/test-branch/folder1 +A B:/wc1/test-branch/folder1/file7.txt +A B:/wc1/test-branch/folder1/folder2 +A B:/wc1/test-branch/folder1/folder2/file8.txt +A B:/wc1/test-branch/folder3 +A B:/wc1/test/file-merge-2.txt +A B:/wc1/test/file-merge-3.txt +A B:/wc1/test/import +A B:/wc1/test/import/import file1A.txt +A B:/wc1/test/import/import file2A.txt +A B:/wc1/test/import/import-file1.txt +A B:/wc1/test/import/import-file2.txt +A B:/wc1/test/import/import0file1B.txt +A B:/wc1/test/import/import0file2B.txt +U B:/wc1 +U B:/wc1/test +U B:/wc1/test/file4.txt +update_started B:/wc1 +Updated to revision 22 + +Info: PYSVN CMD log --limit 6 --verbose b:\wc1 +------------------------------------------------------------ +rev 22: barry | 02-Apr-2018 19:34:29 | 1 lines +Changed paths: + A /trunk/test/import/import0file2B.txt +space in file, 0 in url +------------------------------------------------------------ +rev 21: barry | 02-Apr-2018 19:34:29 | 1 lines +Changed paths: + A /trunk/test/import/import file2A.txt +space in file, space in url +------------------------------------------------------------ +rev 20: barry | 02-Apr-2018 19:34:28 | 1 lines +Changed paths: + A /trunk/test/import/import-file2.txt +space in file, none in url +------------------------------------------------------------ +rev 19: barry | 02-Apr-2018 19:34:28 | 1 lines +Changed paths: + A /trunk/test/import/import0file1B.txt +0 in url +------------------------------------------------------------ +rev 18: barry | 02-Apr-2018 19:34:27 | 1 lines +Changed paths: + A /trunk/test/import/import file1A.txt +space in url +------------------------------------------------------------ +rev 17: barry | 02-Apr-2018 19:34:27 | 1 lines +Changed paths: + A /trunk/test/import/import-file1.txt +no spaces +------------------------------------------------------------ +Info: Test - end diff --git a/Tests/test-01.win32.known_good-py3-svn1.11.log b/Tests/test-01.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..63a70f3951ff6fc9c5707f66da93ee6686ee68b4 --- /dev/null +++ b/Tests/test-01.win32.known_good-py3-svn1.11.log @@ -0,0 +1,956 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-01 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-01 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:\repos +Info: Test - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-01 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-01 add test" +commit_finalizing . +Info: Test - ls + +Info: PYSVN CMD ls file:///b:/repos -v -R + 2 barry - 02-Apr-2018 11:35:44 file:///B:/repos/trunk + 2 barry - 02-Apr-2018 11:35:44 file:///B:/repos/trunk/test +Info: Test - checkout + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD dir b:\wc1 /s /b /a-h +b:\wc1\test +b:\wc1\.svn\entries +b:\wc1\.svn\format +b:\wc1\.svn\pristine +b:\wc1\.svn\tmp +b:\wc1\.svn\wc.db +b:\wc1\.svn\wc.db-journal + +Info: CMD cd /d b:\wc1\test +Info: Test - add +Info: Create File file1.txt - test add file 1 +Info: Create File file2.txt - test add file 2 +Info: Create File file3.txt - test add file 3 +Info: Create File file4.txt - test add file 4 +Info: Create File file5.txt - test add file 5 + +Info: CMD mkdir folder1 +Info: Create File folder1\file7.txt - test add file 7 + +Info: CMD mkdir folder1\folder2 +Info: Create File folder1\folder2\file8.txt - test add file 8 + +Info: CMD mkdir folder3 +Info: Create File folder3\file9.txt - test add file 9 + +Info: CMD mkdir folder3\folder4 +Info: Create File folder3\folder4\file10.txt - test add file 10 + +Info: PYSVN CMD add file1.txt +A B:/wc1/test/file1.txt + +Info: PYSVN CMD add file2.txt +A B:/wc1/test/file2.txt + +Info: PYSVN CMD add file3.txt +A B:/wc1/test/file3.txt + +Info: PYSVN CMD add file4.txt +A B:/wc1/test/file4.txt + +Info: PYSVN CMD add --force file5.txt +A B:/wc1/test/file5.txt + +Info: PYSVN CMD add folder1 +A B:/wc1/test/folder1 +A B:/wc1/test/folder1/file7.txt +A B:/wc1/test/folder1/folder2 +A B:/wc1/test/folder1/folder2/file8.txt + +Info: PYSVN CMD add --non-recursive folder3 +A B:/wc1/test/folder3 + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file1.txt +A B:/wc1/test/file2.txt +A B:/wc1/test/file3.txt +A B:/wc1/test/file4.txt +A B:/wc1/test/file5.txt +A B:/wc1/test/folder1 +A B:/wc1/test/folder1/file7.txt +A B:/wc1/test/folder1/folder2 +A B:/wc1/test/folder1/folder2/file8.txt +A B:/wc1/test/folder3 +commit_finalizing . +Revision 3 +Info: Test - update - get a new wc that will update + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc2 +A B:/wc2/test +A B:/wc2/test/file1.txt +A B:/wc2/test/file2.txt +A B:/wc2/test/file3.txt +A B:/wc2/test/file4.txt +A B:/wc2/test/file5.txt +A B:/wc2/test/folder1 +A B:/wc2/test/folder1/file7.txt +A B:/wc2/test/folder1/folder2 +A B:/wc2/test/folder1/folder2/file8.txt +A B:/wc2/test/folder3 +U B:/wc2 +update_started B:/wc2 +Checked out revision 3 +Info: Test - - checkin a mod from wc1 +Info: Append File b:\wc1\test\file1.txt - line 2 + +Info: PYSVN CMD checkin -m "commit modified file" +M B:/wc1/test/file1.txt +commit_finalizing . +Revision 4 + +Info: PYSVN CMD checkin -m "commit modified file" +Nothing to commit +Info: Test - update + +Info: PYSVN CMD update b:\wc2 +U B:/wc2 +U B:/wc2/test +U B:/wc2/test/file1.txt +update_started B:/wc2 +Updated to revision 4 +Info: Test - the rest in lexical order +Info: Test - annotate + +Info: PYSVN CMD annotate b:\wc2\test\file1.txt +A /trunk/test/file1.txt +A /trunk/test/file1.txt +1| r3 | barry | 2018-04-02T10:35:46.371054Z | test add file 1 +2| r4 | barry | 2018-04-02T10:35:47.178306Z | line 2 +Info: Test - cat + +Info: PYSVN CMD cat -r head file:///b:/repos/trunk/test/file1.txt +test add file 1 +line 2 + +Info: Test - cleanup +Info: Test - copy + +Info: PYSVN CMD mkdir file:///b:/repos/tags -m "test-01 add tags" +commit_finalizing . +Info: Create File msg.tmp - tag the trunk + +Info: PYSVN CMD copy file:///b:/repos/trunk file:///b:/repos/tags/version1 +Log message +--- ------- +commit_finalizing . + +Info: PYSVN CMD ls -v file:///b:/repos/tags + 6 barry - 02-Apr-2018 11:35:48 file:///B:/repos/tags/version1 + +Info: PYSVN CMD copy b:\wc2\test\file1.txt b:\wc2\test\file1b.txt +A B:/wc2/test/file1b.txt + +Info: PYSVN CMD propset svn:eol-style native b:\wc2\test\file1b.txt +property_added B:/wc2/test/file1b.txt + +Info: PYSVN CMD checkin b:\wc2 -m "copy test" +commit_copied B:/wc2/test/file1b.txt +commit_finalizing . +Revision 7 +Info: Test - diff +Info: Append File b:\wc2\test\file1b.txt - new line + +Info: PYSVN CMD diff b:\wc2 +Index: B:/wc2/test/file1b.txt +=================================================================== +--- B:/wc2/test/file1b.txt (revision 7) ++++ B:/wc2/test/file1b.txt (working copy) +@@ -1,2 +1,3 @@ + test add file 1 + line 2 ++new line + +Info: Test - export + +Info: PYSVN CMD export file:///b:/repos/trunk/test b:\export1.native +A B:/export1.native +A B:/export1.native/file1.txt +A B:/export1.native/file1b.txt +A B:/export1.native/file2.txt +A B:/export1.native/file3.txt +A B:/export1.native/file4.txt +A B:/export1.native/file5.txt +A B:/export1.native/folder1 +A B:/export1.native/folder1/file7.txt +A B:/export1.native/folder1/folder2 +A B:/export1.native/folder1/folder2/file8.txt +A B:/export1.native/folder3 + +Info: PYSVN CMD export --native-eol CR file:///b:/repos/trunk/test b:\export1.cr +A B:/export1.cr +A B:/export1.cr/file1.txt +A B:/export1.cr/file1b.txt +A B:/export1.cr/file2.txt +A B:/export1.cr/file3.txt +A B:/export1.cr/file4.txt +A B:/export1.cr/file5.txt +A B:/export1.cr/folder1 +A B:/export1.cr/folder1/file7.txt +A B:/export1.cr/folder1/folder2 +A B:/export1.cr/folder1/folder2/file8.txt +A B:/export1.cr/folder3 + +Info: PYSVN CMD export --native-eol LF file:///b:/repos/trunk/test b:\export1.lf +A B:/export1.lf +A B:/export1.lf/file1.txt +A B:/export1.lf/file1b.txt +A B:/export1.lf/file2.txt +A B:/export1.lf/file3.txt +A B:/export1.lf/file4.txt +A B:/export1.lf/file5.txt +A B:/export1.lf/folder1 +A B:/export1.lf/folder1/file7.txt +A B:/export1.lf/folder1/folder2 +A B:/export1.lf/folder1/folder2/file8.txt +A B:/export1.lf/folder3 + +Info: PYSVN CMD export --native-eol CRLF file:///b:/repos/trunk/test b:\export1.crlf +A B:/export1.crlf +A B:/export1.crlf/file1.txt +A B:/export1.crlf/file1b.txt +A B:/export1.crlf/file2.txt +A B:/export1.crlf/file3.txt +A B:/export1.crlf/file4.txt +A B:/export1.crlf/file5.txt +A B:/export1.crlf/folder1 +A B:/export1.crlf/folder1/file7.txt +A B:/export1.crlf/folder1/folder2 +A B:/export1.crlf/folder1/folder2/file8.txt +A B:/export1.crlf/folder3 + +Info: CMD dir /s /b b:\export1.native +b:\export1.native\file1.txt +b:\export1.native\file1b.txt +b:\export1.native\file2.txt +b:\export1.native\file3.txt +b:\export1.native\file4.txt +b:\export1.native\file5.txt +b:\export1.native\folder1 +b:\export1.native\folder3 +b:\export1.native\folder1\file7.txt +b:\export1.native\folder1\folder2 +b:\export1.native\folder1\folder2\file8.txt + +Info: CMD dir /s /b b:\export1.cr +b:\export1.cr\file1.txt +b:\export1.cr\file1b.txt +b:\export1.cr\file2.txt +b:\export1.cr\file3.txt +b:\export1.cr\file4.txt +b:\export1.cr\file5.txt +b:\export1.cr\folder1 +b:\export1.cr\folder3 +b:\export1.cr\folder1\file7.txt +b:\export1.cr\folder1\folder2 +b:\export1.cr\folder1\folder2\file8.txt + +Info: CMD dir /s /b b:\export1.lf +b:\export1.lf\file1.txt +b:\export1.lf\file1b.txt +b:\export1.lf\file2.txt +b:\export1.lf\file3.txt +b:\export1.lf\file4.txt +b:\export1.lf\file5.txt +b:\export1.lf\folder1 +b:\export1.lf\folder3 +b:\export1.lf\folder1\file7.txt +b:\export1.lf\folder1\folder2 +b:\export1.lf\folder1\folder2\file8.txt + +Info: CMD dir /s /b b:\export1.crlf +b:\export1.crlf\file1.txt +b:\export1.crlf\file1b.txt +b:\export1.crlf\file2.txt +b:\export1.crlf\file3.txt +b:\export1.crlf\file4.txt +b:\export1.crlf\file5.txt +b:\export1.crlf\folder1 +b:\export1.crlf\folder3 +b:\export1.crlf\folder1\file7.txt +b:\export1.crlf\folder1\folder2 +b:\export1.crlf\folder1\folder2\file8.txt +Info: Test - info + +Info: PYSVN CMD info b:\wc2\test +Path: b:\wc2\test +Name: . +Url: file:///B:/repos/trunk/test +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 11:35:47 + +Info: PYSVN CMD info b:\wc2\test\file1.txt +Path: b:\wc2\test\file1.txt +Name: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 4 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 11:35:47 +Text Last Updated: 02-Apr-2018 11:35:47 +Checksum: cb0b37e264ebcc467e9f37a069e034d7 +Info: Test - log + +Info: PYSVN CMD log b:\wc2 +------------------------------------------------------------ +rev 7: barry | 02-Apr-2018 11:35:49 | 1 lines +copy test +------------------------------------------------------------ +rev 4: barry | 02-Apr-2018 11:35:47 | 1 lines +commit modified file +------------------------------------------------------------ +rev 3: barry | 02-Apr-2018 11:35:46 | 1 lines +commit added files +------------------------------------------------------------ +rev 2: barry | 02-Apr-2018 11:35:44 | 1 lines +test-01 add test +------------------------------------------------------------ +rev 1: barry | 02-Apr-2018 11:35:43 | 1 lines +test-01 add trunk +------------------------------------------------------------ +Info: Test - ls + +Info: PYSVN CMD ls file:///b:/repos/trunk/test +file:///B:/repos/trunk/test/file1.txt +file:///B:/repos/trunk/test/file1b.txt +file:///B:/repos/trunk/test/file2.txt +file:///B:/repos/trunk/test/file3.txt +file:///B:/repos/trunk/test/file4.txt +file:///B:/repos/trunk/test/file5.txt +file:///B:/repos/trunk/test/folder1 +file:///B:/repos/trunk/test/folder3 + +Info: PYSVN CMD ls -v file:///b:/repos/trunk/test + 4 barry 25 02-Apr-2018 11:35:47 file:///B:/repos/trunk/test/file1.txt + 7 barry 23 02-Apr-2018 11:35:49 file:///B:/repos/trunk/test/file1b.txt + 3 barry 17 02-Apr-2018 11:35:46 file:///B:/repos/trunk/test/file2.txt + 3 barry 17 02-Apr-2018 11:35:46 file:///B:/repos/trunk/test/file3.txt + 3 barry 17 02-Apr-2018 11:35:46 file:///B:/repos/trunk/test/file4.txt + 3 barry 17 02-Apr-2018 11:35:46 file:///B:/repos/trunk/test/file5.txt + 3 barry - 02-Apr-2018 11:35:46 file:///B:/repos/trunk/test/folder1 + 3 barry - 02-Apr-2018 11:35:46 file:///B:/repos/trunk/test/folder3 + +Info: PYSVN CMD ls b:\wc2\test +B:/wc2/test/file1.txt +B:/wc2/test/file1b.txt +B:/wc2/test/file2.txt +B:/wc2/test/file3.txt +B:/wc2/test/file4.txt +B:/wc2/test/file5.txt +B:/wc2/test/folder1 +B:/wc2/test/folder3 + +Info: PYSVN CMD ls -v b:\wc2\test + 4 barry 25 02-Apr-2018 11:35:47 B:/wc2/test/file1.txt + 7 barry 23 02-Apr-2018 11:35:49 B:/wc2/test/file1b.txt + 3 barry 17 02-Apr-2018 11:35:46 B:/wc2/test/file2.txt + 3 barry 17 02-Apr-2018 11:35:46 B:/wc2/test/file3.txt + 3 barry 17 02-Apr-2018 11:35:46 B:/wc2/test/file4.txt + 3 barry 17 02-Apr-2018 11:35:46 B:/wc2/test/file5.txt + 3 barry - 02-Apr-2018 11:35:46 B:/wc2/test/folder1 + 3 barry - 02-Apr-2018 11:35:46 B:/wc2/test/folder3 +Info: Test - merge - see below +Info: Test - mkdir - done above +Info: Test - move +Info: Create File msg.tmp - move url test + +Info: PYSVN CMD move file:///b:/repos/trunk/test/file2.txt file:///b:/repos/trunk/test/file2b.txt +Log message +--- ------- +commit_finalizing . + +Info: PYSVN CMD move b:\wc2\test\file3.txt b:\wc2\test\file3b.txt +A B:/wc2/test/file3b.txt +D B:/wc2/test/file3.txt + +Info: PYSVN CMD checkin b:\wc2 -m "move wc test" +D B:/wc2/test/file3.txt +M B:/wc2/test/file1b.txt +commit_copied B:/wc2/test/file3b.txt +commit_finalizing . +Revision 9 +Info: Test - status +Info: Append File b:\wc1\test\file4.txt - file 4 is changing + +Info: PYSVN CMD checkin b:\wc1 -m "change wc1 for status -u to detect" +M B:/wc1/test/file4.txt +commit_finalizing . +Revision 10 + +Info: PYSVN CMD status b:\wc2 + +Info: PYSVN CMD status --verbose b:\wc2 + 4 4 barry B:\wc2 + 4 4 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 9 9 barry B:\wc2\test\file1b.txt + 4 3 barry B:\wc2\test\file2.txt + 9 9 barry B:\wc2\test\file3b.txt + 4 3 barry B:\wc2\test\file4.txt + 4 3 barry B:\wc2\test\file5.txt + 4 3 barry B:\wc2\test\folder1 + 4 3 barry B:\wc2\test\folder1\file7.txt + 4 3 barry B:\wc2\test\folder1\folder2 + 4 3 barry B:\wc2\test\folder1\folder2\file8.txt + 4 3 barry B:\wc2\test\folder3 + +Info: PYSVN CMD status --show-updates b:\wc2 + M B:\wc2\test + D B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + M B:\wc2\test\file4.txt + +Info: PYSVN CMD status --show-updates --verbose b:\wc2 + 4 4 barry B:\wc2 + M 4 4 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 9 9 barry B:\wc2\test\file1b.txt + D 4 3 barry B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + 9 9 barry B:\wc2\test\file3b.txt + M 4 3 barry B:\wc2\test\file4.txt + 4 3 barry B:\wc2\test\file5.txt + 4 3 barry B:\wc2\test\folder1 + 4 3 barry B:\wc2\test\folder1\file7.txt + 4 3 barry B:\wc2\test\folder1\folder2 + 4 3 barry B:\wc2\test\folder1\folder2\file8.txt + 4 3 barry B:\wc2\test\folder3 + +Info: PYSVN CMD update +A B:/wc1/test/file1b.txt +A B:/wc1/test/file2b.txt +A B:/wc1/test/file3b.txt +D B:/wc1/test/file2.txt +D B:/wc1/test/file3.txt +U B:/wc1 +U B:/wc1/test +update_started B:/wc1/test +Updated to revision 10 + +Info: PYSVN CMD status --show-updates b:\wc2 + M B:\wc2\test + D B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + M B:\wc2\test\file4.txt + +Info: PYSVN CMD status --show-updates --verbose b:\wc2 + 4 4 barry B:\wc2 + M 4 4 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 9 9 barry B:\wc2\test\file1b.txt + D 4 3 barry B:\wc2\test\file2.txt + A B:\wc2\test\file2b.txt + 9 9 barry B:\wc2\test\file3b.txt + M 4 3 barry B:\wc2\test\file4.txt + 4 3 barry B:\wc2\test\file5.txt + 4 3 barry B:\wc2\test\folder1 + 4 3 barry B:\wc2\test\folder1\file7.txt + 4 3 barry B:\wc2\test\folder1\folder2 + 4 3 barry B:\wc2\test\folder1\folder2\file8.txt + 4 3 barry B:\wc2\test\folder3 + +Info: PYSVN CMD checkin b:\wc2 -m "prop change" +Nothing to commit +Info: Test - propdel + +Info: CMD cd /d b:\wc2\test + +Info: PYSVN CMD propset test:prop1 del_me file4.txt +property_added B:/wc2/test/file4.txt + +Info: PYSVN CMD proplist -v file4.txt +Properties on 'file4.txt': + test:prop1: del_me + +Info: PYSVN CMD propdel test:prop1 file4.txt +property_deleted B:/wc2/test/file4.txt + +Info: PYSVN CMD proplist -v file4.txt +Info: Test - propget + +Info: PYSVN CMD propget svn:eol-style file4.txt +Info: Test - proplist - see above +Info: Test - propset + +Info: CMD cd /d b:\wc2\test + +Info: PYSVN CMD proplist -v file4.txt + +Info: PYSVN CMD propset svn:eol-style native file4.txt +property_added B:/wc2/test/file4.txt + +Info: PYSVN CMD proplist -v file4.txt +Properties on 'file4.txt': + svn:eol-style: native +Info: Test - remove + +Info: CMD cd /d b:\wc2\test + +Info: PYSVN CMD remove file5.txt +D B:/wc2/test/file5.txt + +Info: PYSVN CMD status +MM file4.txt +D file5.txt +Info: Test - resolved +Info: Append File b:\wc1\test\file4.txt - conflict in file4 yes +Info: Append File b:\wc2\test\file4.txt - conflict in file4 no + +Info: PYSVN CMD checkin b:\wc1\test -m "make a conflict part 1" +M B:/wc1/test/file4.txt +commit_finalizing . +Revision 11 + +Info: PYSVN CMD update b:\wc2\test +callback_conflict_resolver + action: + base_file: B:\wc2\test\file4.txt.r4 + is_binary: False + kind: + merged_file: B:\wc2\test\file4.txt + mime_type: None + my_file: B:\wc2\test\file4.txt.mine + node_kind: + operation: + path: B:/wc2/test/file4.txt + property_name: None + reason: + src_left_version: {'node_kind': , 'path_in_repos': 'trunk/test/file4.txt', 'peg_rev': , 'repos_url': 'file:///B:/repos'} + src_right_version: {'node_kind': , 'path_in_repos': 'trunk/test/file4.txt', 'peg_rev': , 'repos_url': 'file:///B:/repos'} + their_file: B:\wc2\test\file4.txt.r11 +A B:/wc2/test/file2b.txt +D B:/wc2/test/file2.txt +U B:/wc2 +U B:/wc2/test +U B:/wc2/test/file4.txt +conflict_resolver_done B:/wc2/test/file4.txt +conflict_resolver_starting B:/wc2/test/file4.txt +update_started B:/wc2/test +Updated to revision 11 + +Info: PYSVN CMD status +CM file4.txt +? file4.txt.mine +? file4.txt.r11 +? file4.txt.r4 +D file5.txt + +Info: CMD copy b:\wc2\test\file4.txt.mine b:\wc2\test\file4.txt + 1 file(s) copied. + +Info: PYSVN CMD resolved b:\wc2\test\file4.txt +R B:/wc2/test/file4.txt +conflict_resolver_done B:/wc2/test/file4.txt +conflict_resolver_starting B:/wc2/test/file4.txt + +Info: PYSVN CMD checkin b:\wc2\test\file4.txt -m "resolve a confict part 2" +M B:/wc2/test/file4.txt +commit_finalizing . +Revision 12 +Info: Test - revert + +Info: PYSVN CMD revert file5.txt +R B:/wc2/test/file5.txt + +Info: PYSVN CMD status +Info: Test - revproplist + +Info: PYSVN CMD revproplist file:///b:/repos/trunk +Revision: 12 +svn:author: barry +svn:date: 2018-04-02T10:36:00.639488Z +svn:log: resolve a confict part 2 +Info: Test - revpropget + +Info: PYSVN CMD revpropget svn:log file:///b:/repos/trunk +Revision: 12 +svn:log: resolve a confict part 2 + +Info: PYSVN CMD revpropget no_such_prop file:///b:/repos/trunk +Revision: 12 +no_such_prop: None +Info: Test - revpropset + +Info: PYSVN CMD revpropset svn:log "Hello world" file:///b:/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Test - revpropdel + +Info: PYSVN CMD revpropdel svn:log file:///b:/repos/trunk +Repository has not been enabled to accept revision propchanges; +ask the administrator to create a pre-revprop-change hook +Info: Test - status - see above +Info: Test - relocate + +Info: CMD mkdir b:\root + +Info: CMD move b:\repos b:\root + 1 dir(s) moved. + +Info: PYSVN CMD info b:\wc1 +Path: b:\wc1 +Name: . +Url: file:///B:/repos/trunk +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 02-Apr-2018 11:35:44 + +Info: PYSVN CMD relocate file:///b:/repos/trunk file:///b:/root/repos/trunk b:\wc1 + +Info: PYSVN CMD info b:\wc1 +Path: b:\wc1 +Name: . +Url: file:///B:/root/repos/trunk +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 2 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 2 +Last Changed Date: 02-Apr-2018 11:35:44 + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/repos/trunk +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 11:35:47 + +Info: PYSVN CMD relocate file:///b:/repos/trunk file:///b:/root/repos/trunk b:\wc2 + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/root/repos/trunk +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 11:35:47 +Info: Test - switch + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/root/repos/trunk +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 4 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 4 +Last Changed Date: 02-Apr-2018 11:35:47 + +Info: PYSVN CMD switch b:\wc2 file:///b:/root/repos/tags/version1 +A B:/wc2/test/file2.txt +A B:/wc2/test/file3.txt +D B:/wc2/test/file1b.txt +D B:/wc2/test/file2b.txt +D B:/wc2/test/file3b.txt +U B:/wc2 +U B:/wc2/test +U B:/wc2/test/file4.txt + +Info: PYSVN CMD info b:\wc2 +Path: b:\wc2 +Name: . +Url: file:///B:/root/repos/tags/version1 +Repository UUID: 0a055c6c-77ad-0f44-ac07-d949eb871b7b +Revision: 12 +Node kind: directory +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 6 +Last Changed Date: 02-Apr-2018 11:35:48 +Info: Test - update - see above +Info: Test - Info: Testing - merge + +Info: PYSVN CMD checkout file:///b:/root/repos/trunk b:\wc3 +A B:/wc3/test +A B:/wc3/test/file1.txt +A B:/wc3/test/file1b.txt +A B:/wc3/test/file2b.txt +A B:/wc3/test/file3b.txt +A B:/wc3/test/file4.txt +A B:/wc3/test/file5.txt +A B:/wc3/test/folder1 +A B:/wc3/test/folder1/file7.txt +A B:/wc3/test/folder1/folder2 +A B:/wc3/test/folder1/folder2/file8.txt +A B:/wc3/test/folder3 +U B:/wc3 +update_started B:/wc3 +Checked out revision 12 + +Info: CMD cd b:\wc3\test +Info: Create File file-merge-1.txt - test add file merge 1 +Info: Create File file-merge-2.txt - test add file merge 2 + +Info: PYSVN CMD add file-merge-1.txt +A B:/wc3/test/file-merge-1.txt + +Info: PYSVN CMD add file-merge-2.txt +A B:/wc3/test/file-merge-2.txt + +Info: PYSVN CMD commit -m "add test merge files" . +A B:/wc3/test/file-merge-1.txt +A B:/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 13 +Info: Create File msg.tmp - make a branch + +Info: PYSVN CMD copy file:///b:/root/repos/trunk/test file:///b:/root/repos/trunk/test-branch +Log message +--- ------- +commit_finalizing . + +Info: PYSVN CMD update b:\wc3 +A B:/wc3/test-branch +A B:/wc3/test-branch/file-merge-1.txt +A B:/wc3/test-branch/file-merge-2.txt +A B:/wc3/test-branch/file1.txt +A B:/wc3/test-branch/file1b.txt +A B:/wc3/test-branch/file2b.txt +A B:/wc3/test-branch/file3b.txt +A B:/wc3/test-branch/file4.txt +A B:/wc3/test-branch/file5.txt +A B:/wc3/test-branch/folder1 +A B:/wc3/test-branch/folder1/file7.txt +A B:/wc3/test-branch/folder1/folder2 +A B:/wc3/test-branch/folder1/folder2/file8.txt +A B:/wc3/test-branch/folder3 +U B:/wc3 +update_started B:/wc3 +Updated to revision 14 +Info: Create File file-merge-3.txt - test add file merge 3 + +Info: PYSVN CMD add file-merge-3.txt +A B:/wc3/test/file-merge-3.txt + +Info: PYSVN CMD rm file-merge-1.txt +D B:/wc3/test/file-merge-1.txt +Info: Append File file-merge-2.txt - modify merge 2 + +Info: PYSVN CMD commit -m "change test merge files" . +A B:/wc3/test/file-merge-3.txt +D B:/wc3/test/file-merge-1.txt +M B:/wc3/test/file-merge-2.txt +commit_finalizing . +Revision 15 + +Info: PYSVN CMD merge --dry-run --revision 14:15 file:///b:/root/repos/trunk/test b:\wc3\test-branch +A B:/wc3/test-branch/file-merge-3.txt +D B:/wc3/test-branch/file-merge-1.txt +U B:/wc3/test-branch/file-merge-2.txt +U B:/wc3/test-branch/file-merge-2.txt +merge_begin B:/wc3/test-branch +merge_completed B:/wc3/test-branch +merge_elide_info B:/wc3/test-branch/file-merge-2.txt +merge_record_info B:/wc3/test-branch +merge_record_info B:/wc3/test-branch/file-merge-2.txt +merge_record_info_begin B:/wc3/test-branch +merge_record_info_begin B:/wc3/test-branch/file-merge-2.txt + +Info: PYSVN CMD merge --revision 14:15 file:///b:/root/repos/trunk/test b:\wc3\test-branch +merge_completed B:/wc3/test-branch + +Info: PYSVN CMD status b:\wc3\test-branch + M B:\wc3\test-branch +D B:\wc3\test-branch\file-merge-1.txt +M B:\wc3\test-branch\file-merge-2.txt +A + B:\wc3\test-branch\file-merge-3.txt + +Info: PYSVN CMD diff b:\wc3\test-branch +Index: B:/wc3/test-branch/file-merge-1.txt +=================================================================== +--- B:/wc3/test-branch/file-merge-1.txt (revision 14) ++++ B:/wc3/test-branch/file-merge-1.txt (nonexistent) +@@ -1 +0,0 @@ +-test add file merge 1 +Index: B:/wc3/test-branch/file-merge-2.txt +=================================================================== +--- B:/wc3/test-branch/file-merge-2.txt (revision 14) ++++ B:/wc3/test-branch/file-merge-2.txt (working copy) +@@ -1 +1,2 @@ + test add file merge 2 ++modify merge 2 +Index: B:/wc3/test-branch/file-merge-3.txt +=================================================================== +Index: B:/wc3/test-branch +=================================================================== +--- B:/wc3/test-branch (revision 14) ++++ B:/wc3/test-branch (working copy) + +Property changes on: B:/wc3/test-branch +___________________________________________________________________ +Added: svn:mergeinfo +## -0,0 +0,1 ## + Merged /trunk/test:r15 + + +Info: CMD c:\python35.Win64\python.exe -u C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_01_set_get_tests.py b:\configdir +Info: test_01_set_get_tests start +Info: test_01_set_get_tests import pysvn +Info: test_01_set_get_tests pysvn.Client( b:\configdir ) +Info: Initial values +Info: get_auth_cache() => 1 +Info: get_auto_props() => 0 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: Change values 1 +Info: Changed values 1 +Info: get_auth_cache() => 0 +Info: get_auto_props() => 0 +Info: get_default_password() => 'thepass' +Info: get_default_username() => 'auser' +Info: get_interactive() => 0 +Info: get_store_passwords() => 0 +Info: Change values 2 +Info: Changed values 2 +Info: get_auth_cache() => 1 +Info: get_auto_props() => 1 +Info: get_default_password() => None +Info: get_default_username() => None +Info: get_interactive() => 1 +Info: get_store_passwords() => 1 +Info: test_01_set_get_tests dealloc Client() +Info: test_01_set_get_tests done +Info: Test - import + +Info: CMD mkdir b:\tmp +Info: Create File b:\tmp\import1.txt - import file 1 +Info: Create File "b:\tmp\import 2.txt" - import file 2 + +Info: PYSVN CMD mkdir "file:///b:/root/repos/trunk/test/import" -m "test-01 add import" +commit_finalizing . + +Info: PYSVN CMD import --message "no spaces" "b:\tmp\import1.txt" "file:///b:/root/repos/trunk/test/import/import-file1.txt" +A B:/tmp/import1.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in url" "b:\tmp\import1.txt" "file:///b:/root/repos/trunk/test/import/import file1A.txt" +A B:/tmp/import1.txt +commit_finalizing . + +Info: PYSVN CMD import --message "0 in url" "b:\tmp\import1.txt" "file:///b:/root/repos/trunk/test/import/import0file1B.txt" +A B:/tmp/import1.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in file, none in url" "b:\tmp\import 2.txt" "file:///b:/root/repos/trunk/test/import/import-file2.txt" +A B:/tmp/import 2.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in file, space in url" "b:\tmp\import 2.txt" "file:///b:/root/repos/trunk/test/import/import file2A.txt" +A B:/tmp/import 2.txt +commit_finalizing . + +Info: PYSVN CMD import --message "space in file, 0 in url" "b:\tmp\import 2.txt" "file:///b:/root/repos/trunk/test/import/import0file2B.txt" +A B:/tmp/import 2.txt +commit_finalizing . + +Info: PYSVN CMD update b:\wc1 +A B:/wc1/test-branch +A B:/wc1/test-branch/file-merge-1.txt +A B:/wc1/test-branch/file-merge-2.txt +A B:/wc1/test-branch/file1.txt +A B:/wc1/test-branch/file1b.txt +A B:/wc1/test-branch/file2b.txt +A B:/wc1/test-branch/file3b.txt +A B:/wc1/test-branch/file4.txt +A B:/wc1/test-branch/file5.txt +A B:/wc1/test-branch/folder1 +A B:/wc1/test-branch/folder1/file7.txt +A B:/wc1/test-branch/folder1/folder2 +A B:/wc1/test-branch/folder1/folder2/file8.txt +A B:/wc1/test-branch/folder3 +A B:/wc1/test/file-merge-2.txt +A B:/wc1/test/file-merge-3.txt +A B:/wc1/test/import +A B:/wc1/test/import/import file1A.txt +A B:/wc1/test/import/import file2A.txt +A B:/wc1/test/import/import-file1.txt +A B:/wc1/test/import/import-file2.txt +A B:/wc1/test/import/import0file1B.txt +A B:/wc1/test/import/import0file2B.txt +U B:/wc1 +U B:/wc1/test +U B:/wc1/test/file4.txt +update_started B:/wc1 +Updated to revision 22 + +Info: PYSVN CMD log --limit 6 --verbose b:\wc1 +------------------------------------------------------------ +rev 22: barry | 02-Apr-2018 11:36:08 | 1 lines +Changed paths: + A /trunk/test/import/import0file2B.txt +space in file, 0 in url +------------------------------------------------------------ +rev 21: barry | 02-Apr-2018 11:36:08 | 1 lines +Changed paths: + A /trunk/test/import/import file2A.txt +space in file, space in url +------------------------------------------------------------ +rev 20: barry | 02-Apr-2018 11:36:07 | 1 lines +Changed paths: + A /trunk/test/import/import-file2.txt +space in file, none in url +------------------------------------------------------------ +rev 19: barry | 02-Apr-2018 11:36:07 | 1 lines +Changed paths: + A /trunk/test/import/import0file1B.txt +0 in url +------------------------------------------------------------ +rev 18: barry | 02-Apr-2018 11:36:07 | 1 lines +Changed paths: + A /trunk/test/import/import file1A.txt +space in url +------------------------------------------------------------ +rev 17: barry | 02-Apr-2018 11:36:06 | 1 lines +Changed paths: + A /trunk/test/import/import-file1.txt +no spaces +------------------------------------------------------------ +Info: Test - end diff --git a/Tests/test-03.unix.known_good-py2-svn1.11.log b/Tests/test-03.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..07e8347159af3f8e153c1fe853f3ebbbc5185732 --- /dev/null +++ b/Tests/test-03.unix.known_good-py2-svn1.11.log @@ -0,0 +1,21 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /usr/bin/python2.3 +Info: Client created +Info: Expecting error callback_get_login required +Info: passed +Info: Expecting error unhandled exception in callback_get_login +Traceback (most recent call last): + File "../test_callbacks.py", line 79, in get_login_bad + return retcode, username, password, save +NameError: global name 'retcode' is not defined +Info: passed +Info: Expecting error callback_get_log_message required +Info: passed +Info: Expecting error unhandled exception in callback_get_log_message +Traceback (most recent call last): + File "../test_callbacks.py", line 86, in get_log_message_bad + return bad_var +NameError: global name 'bad_var' is not defined +Info: passed +Info: Expecting error None +Info: Passed 4 diff --git a/Tests/test-03.unix.known_good-py3-svn1.11.log b/Tests/test-03.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..07e8347159af3f8e153c1fe853f3ebbbc5185732 --- /dev/null +++ b/Tests/test-03.unix.known_good-py3-svn1.11.log @@ -0,0 +1,21 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /usr/bin/python2.3 +Info: Client created +Info: Expecting error callback_get_login required +Info: passed +Info: Expecting error unhandled exception in callback_get_login +Traceback (most recent call last): + File "../test_callbacks.py", line 79, in get_login_bad + return retcode, username, password, save +NameError: global name 'retcode' is not defined +Info: passed +Info: Expecting error callback_get_log_message required +Info: passed +Info: Expecting error unhandled exception in callback_get_log_message +Traceback (most recent call last): + File "../test_callbacks.py", line 86, in get_log_message_bad + return bad_var +NameError: global name 'bad_var' is not defined +Info: passed +Info: Expecting error None +Info: Passed 4 diff --git a/Tests/test-03.win32.known_good-py2-svn1.11.log b/Tests/test-03.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..183b6ce3a5b48fe5f3eefff8daeb8d81d833fa50 --- /dev/null +++ b/Tests/test-03.win32.known_good-py2-svn1.11.log @@ -0,0 +1,36 @@ +WorkDir: L:\wc\pysvn\trunk\pysvn\Extension +PYTHON: c:\python23\python.exe +Username: barry + +L:\wc\pysvn\trunk\pysvn\Extension\Tests >setlocal + +L:\wc\pysvn\trunk\pysvn\Extension\Tests >mkdir testroot-03 + +L:\wc\pysvn\trunk\pysvn\Extension\Tests >subst b: L:\wc\pysvn\trunk\pysvn\Extension\Tests\testroot-03 + +L:\wc\pysvn\trunk\pysvn\Extension\Tests >mkdir b:\configdir + +L:\wc\pysvn\trunk\pysvn\Extension\Tests >cd testroot-03 + +L:\wc\pysvn\trunk\pysvn\Extension\Tests\testroot-03 >c:\python23\python.exe ..\test_callbacks.py +Info: Client created +Info: Expecting error callback_get_login required +Info: passed +Info: Expecting error unhandled exception in callback_get_login +Info: passed +Info: Expecting error callback_get_log_message required +Info: passed +Info: Expecting error unhandled exception in callback_get_log_message +Info: passed +Info: Expecting error None +Info: Passed 4 +Traceback (most recent call last): + File "..\test_callbacks.py", line 79, in get_login_bad + return retcode, username, password, save +NameError: global name 'retcode' is not defined +Traceback (most recent call last): + File "..\test_callbacks.py", line 86, in get_log_message_bad + return bad_var +NameError: global name 'bad_var' is not defined + +L:\wc\pysvn\trunk\pysvn\Extension\Tests\testroot-03 >endlocal diff --git a/Tests/test-03.win32.known_good-py3-svn1.11.log b/Tests/test-03.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..a55ec34da938d57ceb1ba14b230191fde77c534c --- /dev/null +++ b/Tests/test-03.win32.known_good-py3-svn1.11.log @@ -0,0 +1,36 @@ +WorkDir: C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31 +PYTHON: c:\python31\python.exe +Username: barry + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests >setlocal + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests >mkdir testroot-03 + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests >subst b: C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests\testroot-03 + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests >mkdir b:\configdir + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests >cd testroot-03 + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests\testroot-03 >c:\python31\python.exe ..\test_callbacks.py +Traceback (most recent call last): + File "..\test_callbacks.py", line 79, in get_login_bad + return retcode, username, password, save +NameError: global name 'retcode' is not defined +Traceback (most recent call last): + File "..\test_callbacks.py", line 86, in get_log_message_bad + return bad_var +NameError: global name 'bad_var' is not defined +Info: Client created +Info: Expecting error callback_get_login required +Info: passed +Info: Expecting error unhandled exception in callback_get_login +Info: passed +Info: Expecting error callback_get_log_message required +Info: passed +Info: Expecting error unhandled exception in callback_get_log_message +Info: passed +Info: Expecting error None +Info: Passed 4 + +C:\BuildRoot\Win32-MSVC90-1.6.5\pysvn\py31\Tests\testroot-03 >endlocal diff --git a/Tests/test-04.unix.known_good-py2-svn1.11.log b/Tests/test-04.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..e1627d76b82838a341cf7d8fd03da270ddeb44fc --- /dev/null +++ b/Tests/test-04.unix.known_good-py2-svn1.11.log @@ -0,0 +1,278 @@ +WorkDir: /home/barry/wc/svn/pysvn-trunk/Extension +PYTHON: /usr/bin/python2.7 +Username: barry +Info: Command: mkdir testroot-04 +Info: Command: cd testroot-04 +Info: Command: mkdir tmp +Info: Command: svnadmin create /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos +Info: Testing - mkdir +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos/trunk -m test-04 add trunk +commit_finalizing . +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos/trunk/test -m test-04 add test +commit_finalizing . +Info: Install hooks +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos/trunk/test/a -m pre-commit test 1 +commit_finalizing . +Info: pre_test_1.output start ------------------------------------ +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 2-2 +Info: pre-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 2-2) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:15.527219Z +svn:log: pre-commit test 1 +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-redhat-linux-gnu) ra_local +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py post-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 3 2-2 is_revision +Info: post-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 3, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:15.779752Z +svn:log: pre-commit test 1 +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +Info: post_test_1.output end ------------------------------------- +Info: Add two files +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos/trunk/test /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a +U /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +Checked out revision 3 +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir add /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1.txt +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir add /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir checkin -m Add two files /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1.txt +commit_finalizing . +Revision 4 +Info: pre_test_1.output start ------------------------------------ +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 3-3 +Info: pre-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 3-3) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:16.082311Z +svn:log: Add two files +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-redhat-linux-gnu) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py post-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 4 3-3 is_revision +Info: post-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 4, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:16.334845Z +svn:log: Add two files +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: post_test_1.output end ------------------------------------- +Info: Mod one file Mod one prop +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir propset svn:eol-style native /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +property_added /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir checkin -m Mod one file Mod one prop /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +M /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +M /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1.txt +commit_finalizing . +Revision 5 +Info: pre_test_1.output start ------------------------------------ +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 4-4 +Info: pre-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 4-4) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:16.595298Z +svn:log: Mod one file Mod one prop +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-redhat-linux-gnu) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py post-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 5 4-4 is_revision +Info: post-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 5, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:16.839549Z +svn:log: Mod one file Mod one prop +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: post_test_1.output end ------------------------------------- +Info: Delete one file +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir rm /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +D /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir checkin -m Delete one file /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +D /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/a/file1.txt +commit_finalizing . +Revision 6 +Info: pre_test_1.output start ------------------------------------ +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 5-5 +Info: pre-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 5-5) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:17.075473Z +svn:log: Delete one file +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-redhat-linux-gnu) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py post-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 6 5-5 is_revision +Info: post-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 6, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:17.344591Z +svn:log: Delete one file +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +Info: post_test_1.output end ------------------------------------- +Info: Copy one file +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir cp /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1.txt /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1copy.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1copy.txt +Info: Command: /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/configdir checkin -m Copy one file /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc +commit_copied /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/wc/file1copy.txt +commit_finalizing . +Revision 7 +Info: pre_test_1.output start ------------------------------------ +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 6-6 +Info: pre-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 6-6) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:17.629948Z +svn:log: Copy one file +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-redhat-linux-gnu) ra_local +Info: changed() ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=5 copyfrom_path=u'/trunk/test/file1.txt' + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +/trunk/test/file1copy.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Tests/test_04_commit_hook_test_1.py post-commit /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos 7 6-6 is_revision +Info: post-commit test 1 +Info: Transaction( /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-04/repos, 7, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T18:50:17.882724Z +svn:log: Copy one file +Info: changed() ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=5 copyfrom_path=u'/trunk/test/file1.txt' + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +/trunk/test/file1copy.txt: kind= +Info: post_test_1.output end ------------------------------------- diff --git a/Tests/test-04.unix.known_good-py3-svn1.11.log b/Tests/test-04.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..2187a4832f4d55815c97ca2a66e88c33713d33e4 --- /dev/null +++ b/Tests/test-04.unix.known_good-py3-svn1.11.log @@ -0,0 +1,278 @@ +WorkDir: /Users/barry/wc/svn/pysvn-next/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: Command: mkdir testroot-04 +Info: Command: cd testroot-04 +Info: Command: mkdir tmp +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos +Info: Testing - mkdir +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos/trunk -m test-04 add trunk +commit_finalizing . +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos/trunk/test -m test-04 add test +commit_finalizing . +Info: Install hooks +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos/trunk/test/a -m pre-commit test 1 +commit_finalizing . +Info: pre_test_1.output start ------------------------------------ +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 2-2 +Info: pre-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 2-2) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:44.939971Z +svn:log: pre-commit test 1 +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-apple-darwin15.4.0) ra_local +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py post-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 3 2-2 is_revision +Info: post-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 3, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:45.754027Z +svn:log: pre-commit test 1 +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +Info: post_test_1.output end ------------------------------------- +Info: Add two files +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir checkout file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos/trunk/test /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a +U /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +update_started /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +Checked out revision 3 +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir add /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1.txt +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir add /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir checkin -m Add two files /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1.txt +commit_finalizing . +Revision 4 +Info: pre_test_1.output start ------------------------------------ +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 3-3 +Info: pre-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 3-3) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:47.299575Z +svn:log: Add two files +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-apple-darwin15.4.0) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py post-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 4 3-3 is_revision +Info: post-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 4, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:48.047189Z +svn:log: Add two files +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: post_test_1.output end ------------------------------------- +Info: Mod one file Mod one prop +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir propset svn:eol-style native /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +property_added /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir checkin -m Mod one file Mod one prop /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +M /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +M /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1.txt +commit_finalizing . +Revision 5 +Info: pre_test_1.output start ------------------------------------ +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 4-4 +Info: pre-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 4-4) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:49.309730Z +svn:log: Mod one file Mod one prop +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-apple-darwin15.4.0) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py post-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 5 4-4 is_revision +Info: post-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 5, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:50.065846Z +svn:log: Mod one file Mod one prop +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=0, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A\n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= +Info: post_test_1.output end ------------------------------------- +Info: Delete one file +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir rm /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +D /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir checkin -m Delete one file /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +D /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/a/file1.txt +commit_finalizing . +Revision 6 +Info: pre_test_1.output start ------------------------------------ +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 5-5 +Info: pre-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 5-5) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:51.261317Z +svn:log: Delete one file +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-apple-darwin15.4.0) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py post-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 6 5-5 is_revision +Info: post-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 6, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:51.933847Z +svn:log: Delete one file +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +Info: post_test_1.output end ------------------------------------- +Info: Copy one file +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir cp /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1.txt /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1copy.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1copy.txt +Info: Command: /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.01.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/configdir checkin -m Copy one file /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc +commit_copied /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/wc/file1copy.txt +commit_finalizing . +Revision 7 +Info: pre_test_1.output start ------------------------------------ +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py pre-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 6-6 +Info: pre-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 6-6) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:54.179349Z +svn:log: Copy one file +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86_64-apple-darwin15.4.0) ra_local +Info: changed() ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=5 copyfrom_path='/trunk/test/file1.txt' + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +/trunk/test/file1copy.txt: kind= +Info: pre_test_1.output end -------------------------------------- +Info: post_test_1.output start ----------------------------------- +/usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Tests/test_04_commit_hook_test_1.py post-commit /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos 7 6-6 is_revision +Info: post-commit test 1 +Info: Transaction( /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-04/repos, 7, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-19T15:15:54.868530Z +svn:log: Copy one file +Info: changed() ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 + contents: 'file1 ROOT ln 2\n' +Info: changed( copy_info=True ) ... +trunk/test/file1copy.txt: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=5 copyfrom_path='/trunk/test/file1.txt' + contents: 'file1 ROOT ln 2\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= +/trunk/test/file1copy.txt: kind= +Info: post_test_1.output end ------------------------------------- diff --git a/Tests/test-04.win32.known_good-py2-svn1.11.log b/Tests/test-04.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..958dc2fc129b99321dc4f49863202e138915e0d2 --- /dev/null +++ b/Tests/test-04.win32.known_good-py2-svn1.11.log @@ -0,0 +1,307 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win64\python.exe +Username: barry + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > setlocal + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > set PYTHONPATH=C:\Users\barry\wc\svn\PySVN\Extension\Source;C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > set PYSVN=c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > mkdir testroot-04 + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-04 + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > cd /d B:\ + +B:\ > svnadmin create b:\repos + +B:\ > rem mkdir + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir mkdir file:///b:/repos/trunk -m "test-01 add trunk" +commit_finalizing . + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir mkdir file:///b:/repos/trunk/test -m "test-01 add test" +commit_finalizing . + +B:\ > rem Install hooks + +B:\ > echo echo c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit %* >b:\pre_test_1.output 1>>b:\repos\hooks\pre-commit.cmd + +B:\ > echo set PYTHONPATH=C:\Users\barry\wc\svn\PySVN\Extension\Source;C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client 1>>b:\repos\hooks\pre-commit.cmd + +B:\ > echo c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit %* >>b:\pre_test_1.output 1>>b:\repos\hooks\pre-commit.cmd + +B:\ > echo echo c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit %* is_revision >b:\post_test_1.output 1>>b:\repos\hooks\post-commit.cmd + +B:\ > echo set PYTHONPATH=C:\Users\barry\wc\svn\PySVN\Extension\Source;C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client 1>>b:\repos\hooks\post-commit.cmd + +B:\ > echo c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit %* is_revision >>b:\post_test_1.output 1>>b:\repos\hooks\post-commit.cmd + +B:\ > rem Add one dir + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir mkdir file:///b:/repos/trunk/test/a -m "pre-commit test 1" +commit_finalizing . + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 2-2 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 2-2) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:40.726001Z +svn:log: pre-commit test 1 +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x64-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 3 2-2 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 3, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:41.116770Z +svn:log: pre-commit test 1 +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > rem Add two files + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir co file:///b:/repos/trunk/test b:\wc +A B:/wc/a +U B:/wc +update_started B:/wc +Checked out revision 3 + +B:\ > echo file1 ROOT 1>b:\wc\file1.txt + +B:\ > echo file1 A 1>b:\wc\a\file1.txt + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir add b:\wc\file1.txt +A B:/wc/file1.txt + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir add b:\wc\a\file1.txt +A B:/wc/a/file1.txt + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir checkin -m "Add two files" b:\wc +A B:/wc/a/file1.txt +A B:/wc/file1.txt +commit_finalizing . +Revision 4 + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 3-3 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 3-3) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:41.460548Z +svn:log: Add two files +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x64-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 4 3-3 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 4, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:41.866829Z +svn:log: Add two files +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > rem Mod one file Mod one prop + +B:\ > echo file1 ROOT ln 2 1>b:\wc\file1.txt + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir propset svn:eol-style native b:\wc\a\file1.txt +property_added B:/wc/a/file1.txt + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir checkin -m "Mod one file Mod one prop" b:\wc +M B:/wc/a/file1.txt +M B:/wc/file1.txt +commit_finalizing . +Revision 5 + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 4-4 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 4-4) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:42.179359Z +svn:log: Mod one file Mod one prop +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x64-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2 \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2 \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 5 4-4 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 5, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:42.585645Z +svn:log: Mod one file Mod one prop +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2 \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2 \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > rem Delete one file + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir rm b:\wc\a\file1.txt +D B:/wc/a/file1.txt + +B:\ > c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir checkin -m "Delete one file" b:\wc +D B:/wc/a/file1.txt +commit_finalizing . +Revision 6 + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 5-5 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 5-5) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:42.898158Z +svn:log: Delete one file +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x64-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 6 5-5 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 6, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-27T19:31:43.241949Z +svn:log: Delete one file +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > endlocal diff --git a/Tests/test-04.win32.known_good-py3-svn1.11.log b/Tests/test-04.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..f354cb5b087d359f7d90fe89d97f4b1a417f140e --- /dev/null +++ b/Tests/test-04.win32.known_good-py3-svn1.11.log @@ -0,0 +1,307 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win32\python.exe +Username: barry + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > setlocal + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > set PYTHONPATH=C:\Users\barry\wc\svn\PySVN\Extension\Source;C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > set PYSVN=c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > mkdir testroot-04 + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-04 + +C:\Users\barry\wc\svn\PySVN\Extension\Tests > cd /d B:\ + +B:\ > svnadmin create b:\repos + +B:\ > rem mkdir + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir mkdir file:///b:/repos/trunk -m "test-01 add trunk" +commit_finalizing . + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir mkdir file:///b:/repos/trunk/test -m "test-01 add test" +commit_finalizing . + +B:\ > rem Install hooks + +B:\ > echo echo c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit %* >b:\pre_test_1.output 1>>b:\repos\hooks\pre-commit.cmd + +B:\ > echo set PYTHONPATH=C:\Users\barry\wc\svn\PySVN\Extension\Source;C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client 1>>b:\repos\hooks\pre-commit.cmd + +B:\ > echo c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit %* >>b:\pre_test_1.output 1>>b:\repos\hooks\pre-commit.cmd + +B:\ > echo echo c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit %* is_revision >b:\post_test_1.output 1>>b:\repos\hooks\post-commit.cmd + +B:\ > echo set PYTHONPATH=C:\Users\barry\wc\svn\PySVN\Extension\Source;C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client 1>>b:\repos\hooks\post-commit.cmd + +B:\ > echo c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit %* is_revision >>b:\post_test_1.output 1>>b:\repos\hooks\post-commit.cmd + +B:\ > rem Add one dir + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir mkdir file:///b:/repos/trunk/test/a -m "pre-commit test 1" +commit_finalizing . + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 2-2 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 2-2) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:21.305330Z +svn:log: pre-commit test 1 +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 3 2-2 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 3, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:21.680347Z +svn:log: pre-commit test 1 +Info: changed() ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a: action='A', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > rem Add two files + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir co file:///b:/repos/trunk/test b:\wc +A B:/wc/a +U B:/wc +update_started B:/wc +Checked out revision 3 + +B:\ > echo file1 ROOT 1>b:\wc\file1.txt + +B:\ > echo file1 A 1>b:\wc\a\file1.txt + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir add b:\wc\file1.txt +A B:/wc/file1.txt + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir add b:\wc\a\file1.txt +A B:/wc/a/file1.txt + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir checkin -m "Add two files" b:\wc +A B:/wc/a/file1.txt +A B:/wc/file1.txt +commit_finalizing . +Revision 4 + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 3-3 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 3-3) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:22.133575Z +svn:log: Add two files +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 4 3-3 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 4, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:22.508576Z +svn:log: Add two files +Info: changed() ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 A \r\n' +trunk/test/file1.txt: action='A', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > rem Mod one file Mod one prop + +B:\ > echo file1 ROOT ln 2 1>b:\wc\file1.txt + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir propset svn:eol-style native b:\wc\a\file1.txt +property_added B:/wc/a/file1.txt + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir checkin -m "Mod one file Mod one prop" b:\wc +M B:/wc/a/file1.txt +M B:/wc/file1.txt +commit_finalizing . +Revision 5 + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 4-4 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 4-4) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:22.883708Z +svn:log: Mod one file Mod one prop +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2 \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2 \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 5 4-4 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 5, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:23.289937Z +svn:log: Mod one file Mod one prop +Info: changed() ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 + contents: 'file1 ROOT ln 2 \r\n' +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='R', kind=, text_mod=1, prop_mod=1 copyfrom_rev=0 copyfrom_path=None + svn:eol-style: native + contents: 'file1 A \n' +trunk/test/file1.txt: action='R', kind=, text_mod=1, prop_mod=0 copyfrom_rev=0 copyfrom_path=None + contents: 'file1 ROOT ln 2 \r\n' +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/a/file1.txt: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > rem Delete one file + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir rm b:\wc\a\file1.txt +D B:/wc/a/file1.txt + +B:\ > c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.02.01 --config-dir b:\configdir checkin -m "Delete one file" b:\wc +D B:/wc/a/file1.txt +commit_finalizing . +Revision 6 + +B:\ > rem pre_test_1.output start ---------------------------------------- + +B:\ > type b:\pre_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py pre-commit B:\repos 5-5 +Info: pre-commit test 1 +Info: Transaction( B:\repos, 5-5) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:23.664960Z +svn:log: Delete one file +svn:txn-client-compat-version: 1.9.3 +svn:txn-user-agent: SVN/1.9.3 (x86-microsoft-windows) ra_local +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem pre_test_1.output end ------------------------------------------ + +B:\ > rem post_test_1.output start ---------------------------------------- + +B:\ > type b:\post_test_1.output +c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Tests\test_04_commit_hook_test_1.py post-commit B:\repos 6 5-5 is_revision +Info: post-commit test 1 +Info: Transaction( B:\repos, 6, is_revision=True) ... +Info: revproplist() ... +svn:author: barry +svn:date: 2016-04-01T15:38:24.071188Z +svn:log: Delete one file +Info: changed() ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 +Info: changed( copy_info=True ) ... +trunk/test/a/file1.txt: action='D', kind=, text_mod=0, prop_mod=0 copyfrom_rev=0 copyfrom_path=None +Info: list() ... +/trunk: kind= +/trunk/test: kind= +/trunk/test/a: kind= +/trunk/test/file1.txt: kind= + +B:\ > rem post_test_1.output end ------------------------------------------ + +B:\ > endlocal diff --git a/Tests/test-05.unix.known_good-py2-svn1.11.log b/Tests/test-05.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..d5bb54c0ef1a9bfb86d38d7d10e51207843e1297 --- /dev/null +++ b/Tests/test-05.unix.known_good-py2-svn1.11.log @@ -0,0 +1,265 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-05 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-05 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: Command: mkdir tmp +Info: PYSVN command /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.02.01 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk -m test-05 add trunk +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test -m test-05 add test +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +Checked out revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: Setup - add files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: add file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: add file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Setup - checkout wc2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 +Checked out revision 3 +Info: Test - status of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - info2 of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: info2 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 3 +Repository UUID: 4c8e1f49-0427-43df-b87e-5993bd844b2b +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:22:37 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 01-Apr-2018 13:22:37 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - list of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 barry 16 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry - 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry 16 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 barry 16 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - lock unlocked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: lock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt -m lock comment test 05 +locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + K 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - info2 of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: info2 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 3 +Repository UUID: 4c8e1f49-0427-43df-b87e-5993bd844b2b +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:22:37 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 01-Apr-2018 13:22:39 +Lock Token: opaquelocktoken:0d6d7e92-8e7a-4815-9b65-60a1cfe3e91a +Lock Comment: +lock comment test 05 +Schedule: normal +Text Last Updated: 01-Apr-2018 13:22:37 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - list of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 barry 16 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + Lock owner: barry + Lock comment: lock comment test 05 + Lock created: 2018-04-01 13:22:39 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry - 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry 16 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + Lock owner: barry + Lock comment: lock comment test 05 + Lock created: 2018-04-01 13:22:39 + 3 barry 16 01-Apr-2018 13:22:37 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - attempt to checkin over a locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: commit -m change when file locked in other wc . +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +failed_locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Commit failed (details follow): +File '/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt' is locked in another working copy +While preparing '/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt' for commit +Cannot verify lock on path '/trunk/test/file1.txt'; no matching lock-token available +Info: Test - lock locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: lock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +failed_lock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Info: Test - lock --force locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: lock --force /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt -m Stealing lock +locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Info: Test - info2 of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: info2 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 3 +Repository UUID: 4c8e1f49-0427-43df-b87e-5993bd844b2b +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:22:37 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 01-Apr-2018 13:22:40 +Lock Token: opaquelocktoken:f0d7ec3a-8b8d-4586-8c03-2f72df423017 +Lock Comment: +Stealing lock +Schedule: normal +Text Last Updated: 01-Apr-2018 13:22:38 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +M K 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +M 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - commit with lock +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: commit -m change when file locked in this wc . +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +commit_finalizing . +Revision 4 +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + K 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - list of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + Lock owner: barry + Lock comment: Stealing lock + Lock created: 2018-04-01 13:22:40 + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - unlock locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: unlock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +unlocked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Info: Test - status of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - list of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + K 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - list of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - update with stolen lock +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Updated to revision 4 +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - info2 of URL +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: info2 --revision HEAD file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 4 +Repository UUID: 4c8e1f49-0427-43df-b87e-5993bd844b2b +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:22:40 +Last changed revision: 4 +Node kind: file +Info: Test - list of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 4 barry 33 01-Apr-2018 13:22:40 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt diff --git a/Tests/test-05.unix.known_good-py3-svn1.11.log b/Tests/test-05.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..0a8a61bd5ae2fde006fcc863b854982954526598 --- /dev/null +++ b/Tests/test-05.unix.known_good-py3-svn1.11.log @@ -0,0 +1,265 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-05 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-05 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: Command: mkdir tmp +Info: PYSVN command /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.02.01 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk -m test-05 add trunk +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test -m test-05 add test +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +Checked out revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: Setup - add files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: add file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: add file2.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Setup - checkout wc2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 +Checked out revision 3 +Info: Test - status of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - info2 of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: info2 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 3 +Repository UUID: 07c33752-4911-485f-9e7c-24c50e925bfc +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:50:54 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 01-Apr-2018 13:50:54 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - list of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 barry 16 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry - 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry 16 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 barry 16 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - lock unlocked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: lock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt -m lock comment test 05 +locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + K 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - info2 of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: info2 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 3 +Repository UUID: 07c33752-4911-485f-9e7c-24c50e925bfc +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:50:54 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 01-Apr-2018 13:50:56 +Lock Token: opaquelocktoken:cb30f534-f114-42d9-8a51-d2efb0986fab +Lock Comment: +lock comment test 05 +Schedule: normal +Text Last Updated: 01-Apr-2018 13:50:54 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - list of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 barry 16 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + Lock owner: barry + Lock comment: lock comment test 05 + Lock created: 2018-04-01 13:50:56 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: pysvn command: list --verbose --fetch-locks /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry - 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 3 barry 16 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + Lock owner: barry + Lock comment: lock comment test 05 + Lock created: 2018-04-01 13:50:56 + 3 barry 16 01-Apr-2018 13:50:54 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - attempt to checkin over a locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: commit -m change when file locked in other wc . +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +failed_locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Commit failed (details follow): +File '/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt' is locked in another working copy +While preparing '/Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt' for commit +Cannot verify lock on path '/trunk/test/file1.txt'; no matching lock-token available +Info: Test - lock locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: lock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +failed_lock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Info: Test - lock --force locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: lock --force /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt -m Stealing lock +locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Info: Test - info2 of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: info2 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + +Path: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 3 +Repository UUID: 07c33752-4911-485f-9e7c-24c50e925bfc +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:50:54 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 01-Apr-2018 13:50:58 +Lock Token: opaquelocktoken:8d98c1c7-fb2c-4377-ab0d-00ac67996da0 +Lock Comment: +Stealing lock +Schedule: normal +Text Last Updated: 01-Apr-2018 13:50:55 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +M K 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +M 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - commit with lock +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: commit -m change when file locked in this wc . +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +commit_finalizing . +Revision 4 +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + K 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - list of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + Lock owner: barry + Lock comment: Stealing lock + Lock created: 2018-04-01 13:50:58 + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - unlock locked file +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: unlock /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +unlocked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt +Info: Test - status of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - list of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file1.txt + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test/file2.txt +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + K 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 3 3 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - list of unlocked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - update with stolen lock +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: update /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt +U /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test +Updated to revision 4 +Info: Test - status of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: status --verbose /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 2 2 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 4 4 barry /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt +Info: Test - info2 of URL +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: info2 --revision HEAD file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/repos/trunk/test/file1.txt +Revision: 4 +Repository UUID: 07c33752-4911-485f-9e7c-24c50e925bfc +Last changed author: barry +Last Changed Date: 01-Apr-2018 13:50:58 +Last changed revision: 4 +Node kind: file +Info: Test - list of locked files +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc2/test +Info: pysvn command: list --verbose --fetch-locks --recursive /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1 + 4 barry - 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file1.txt + 4 barry 33 01-Apr-2018 13:50:58 /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-05/wc1/test/file2.txt diff --git a/Tests/test-05.win32.known_good-py2-svn1.11.log b/Tests/test-05.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..97dbc9c9bcc84be6714ac9fc1e168687bcac945f --- /dev/null +++ b/Tests/test-05.win32.known_good-py2-svn1.11.log @@ -0,0 +1,282 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win32\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.03.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-05 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-05 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-05 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-05 add test" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD cd b:\wc1\test +Info: Setup - add files +Info: Create File file1.txt - test add file 1 +Info: Create File file2.txt - test add file 2 + +Info: PYSVN CMD add file1.txt +A B:/wc1/test/file1.txt + +Info: PYSVN CMD add file2.txt +A B:/wc1/test/file2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file1.txt +A B:/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Setup - checkout wc2 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc2 +A B:/wc2/test +A B:/wc2/test/file1.txt +A B:/wc2/test/file2.txt +U B:/wc2 +update_started B:/wc2 +Checked out revision 3 +Info: Test - status of unlocked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + 3 3 barry B:\wc1\test\file1.txt + 3 3 barry B:\wc1\test\file2.txt +Info: Test - info2 of unlocked files + +Info: PYSVN CMD info2 b:\wc1\test\file1.txt + +Path: B:/wc1/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 2d4893c6-4d49-c943-8e23-ac327a7055bc +Last changed author: barry +Last Changed Date: 02-Apr-2018 19:35:21 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 02-Apr-2018 19:35:20 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - list of unlocked files + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test\file1.txt + 3 barry 17 02-Apr-2018 19:35:21 B:/wc1/test/file1.txt + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test + 3 barry - 02-Apr-2018 19:35:21 B:/wc1/test + 3 barry 17 02-Apr-2018 19:35:21 B:/wc1/test/file1.txt + 3 barry 17 02-Apr-2018 19:35:21 B:/wc1/test/file2.txt +Info: Test - lock unlocked file + +Info: PYSVN CMD lock b:\wc1\test\file1.txt +locked B:/wc1/test/file1.txt +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + K 3 3 barry B:\wc1\test\file1.txt + 3 3 barry B:\wc1\test\file2.txt +Info: Test - info2 of locked files + +Info: PYSVN CMD info2 b:\wc1\test\file1.txt + +Path: B:/wc1/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 2d4893c6-4d49-c943-8e23-ac327a7055bc +Last changed author: barry +Last Changed Date: 02-Apr-2018 19:35:21 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 02-Apr-2018 19:35:22 +Lock Token: opaquelocktoken:0c72c478-7cfc-354c-be2e-5e5d827f56fc +Lock Comment: +Schedule: normal +Text Last Updated: 02-Apr-2018 19:35:20 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test\file1.txt + 3 barry 17 02-Apr-2018 19:35:21 B:/wc1/test/file1.txt + Lock owner: barry + Lock comment: + Lock created: 2018-04-02 19:35:22 + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test + 3 barry - 02-Apr-2018 19:35:21 B:/wc1/test + 3 barry 17 02-Apr-2018 19:35:21 B:/wc1/test/file1.txt + Lock owner: barry + Lock comment: + Lock created: 2018-04-02 19:35:22 + 3 barry 17 02-Apr-2018 19:35:21 B:/wc1/test/file2.txt +Info: Test - attempt to checkin over a locked file + +Info: CMD cd b:\wc2\test +Info: Append File file1.txt - Change to file 1 +Info: Append File file2.txt - Change to file 2 + +Info: PYSVN CMD commit -m "change when file locked in other wc" . +M B:/wc2/test/file1.txt +M B:/wc2/test/file2.txt +failed_locked B:/wc2/test/file1.txt +Commit failed (details follow): +File 'B:\wc2\test\file1.txt' is locked in another working copy +While preparing 'B:\wc2\test\file1.txt' for commit +Cannot verify lock on path '/trunk/test/file1.txt'; no matching lock-token available +Info: Test - lock locked file + +Info: PYSVN CMD lock b:\wc2\test\file1.txt +failed_lock B:/wc2/test/file1.txt +Info: Test - lock --force locked file + +Info: PYSVN CMD lock --force b:\wc2\test\file1.txt -m "Stealing lock" +locked B:/wc2/test/file1.txt +Info: Test - info2 of locked files + +Info: PYSVN CMD info2 b:\wc2\test\file1.txt + +Path: B:/wc2/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 2d4893c6-4d49-c943-8e23-ac327a7055bc +Last changed author: barry +Last Changed Date: 02-Apr-2018 19:35:21 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 02-Apr-2018 19:35:23 +Lock Token: opaquelocktoken:96ae1179-7853-d04c-ba9e-1ca097d043e5 +Lock Comment: +Stealing lock +Schedule: normal +Text Last Updated: 02-Apr-2018 19:35:21 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc2 + 3 3 barry B:\wc2 + 3 3 barry B:\wc2\test +M K 3 3 barry B:\wc2\test\file1.txt +M 3 3 barry B:\wc2\test\file2.txt +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc2 + 3 barry - 02-Apr-2018 19:35:21 B:/wc2 + 3 barry - 02-Apr-2018 19:35:21 B:/wc2/test + 3 barry 17 02-Apr-2018 19:35:21 B:/wc2/test/file1.txt + Lock owner: barry + Lock comment: Stealing lock + Lock created: 2018-04-02 19:35:23 + 3 barry 17 02-Apr-2018 19:35:21 B:/wc2/test/file2.txt +Info: Test - commit with lock + +Info: PYSVN CMD commit -m "change when file locked in this wc" . +M B:/wc2/test/file1.txt +M B:/wc2/test/file2.txt +commit_finalizing . +Revision 4 +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc2 + 3 3 barry B:\wc2 + 3 3 barry B:\wc2\test + K 4 4 barry B:\wc2\test\file1.txt + 4 4 barry B:\wc2\test\file2.txt +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc2 + 4 barry - 02-Apr-2018 19:35:24 B:/wc2 + 4 barry - 02-Apr-2018 19:35:24 B:/wc2/test + 4 barry 35 02-Apr-2018 19:35:24 B:/wc2/test/file1.txt + Lock owner: barry + Lock comment: Stealing lock + Lock created: 2018-04-02 19:35:23 + 4 barry 35 02-Apr-2018 19:35:24 B:/wc2/test/file2.txt +Info: Test - unlock locked file + +Info: PYSVN CMD unlock b:\wc2\test\file1.txt +unlocked B:/wc2/test/file1.txt +Info: Test - status of unlocked files + +Info: PYSVN CMD status --verbose b:\wc2 + 3 3 barry B:\wc2 + 3 3 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 4 4 barry B:\wc2\test\file2.txt +Info: Test - list of unlocked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc2 + 4 barry - 02-Apr-2018 19:35:24 B:/wc2 + 4 barry - 02-Apr-2018 19:35:24 B:/wc2/test + 4 barry 35 02-Apr-2018 19:35:24 B:/wc2/test/file1.txt + 4 barry 35 02-Apr-2018 19:35:24 B:/wc2/test/file2.txt +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + K 3 3 barry B:\wc1\test\file1.txt + 3 3 barry B:\wc1\test\file2.txt +Info: Test - list of unlocked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc1 + 4 barry - 02-Apr-2018 19:35:24 B:/wc1 + 4 barry - 02-Apr-2018 19:35:24 B:/wc1/test + 4 barry 35 02-Apr-2018 19:35:24 B:/wc1/test/file1.txt + 4 barry 35 02-Apr-2018 19:35:24 B:/wc1/test/file2.txt +Info: Test - update with stolen lock + +Info: PYSVN CMD update b:\wc1\test +U B:/wc1 +U B:/wc1/test +U B:/wc1/test/file1.txt +U B:/wc1/test/file2.txt +update_started B:/wc1/test +Updated to revision 4 +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 4 4 barry B:\wc1\test + 4 4 barry B:\wc1\test\file1.txt + 4 4 barry B:\wc1\test\file2.txt +Info: Test - info2 of URL + +Info: PYSVN CMD info2 --revision HEAD file:///b:/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 4 +Repository root_URL: file:///B:/repos +Repository UUID: 2d4893c6-4d49-c943-8e23-ac327a7055bc +Last changed author: barry +Last Changed Date: 02-Apr-2018 19:35:24 +Last changed revision: 4 +Node kind: file +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc1 + 4 barry - 02-Apr-2018 19:35:24 B:/wc1 + 4 barry - 02-Apr-2018 19:35:24 B:/wc1/test + 4 barry 35 02-Apr-2018 19:35:24 B:/wc1/test/file1.txt + 4 barry 35 02-Apr-2018 19:35:24 B:/wc1/test/file2.txt diff --git a/Tests/test-05.win32.known_good-py3-svn1.11.log b/Tests/test-05.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..74ab9a6f27dd5ec38e521f51445231a0868a0c20 --- /dev/null +++ b/Tests/test-05.win32.known_good-py3-svn1.11.log @@ -0,0 +1,282 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.03.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-05 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-05 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-05 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-05 add test" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD cd b:\wc1\test +Info: Setup - add files +Info: Create File file1.txt - test add file 1 +Info: Create File file2.txt - test add file 2 + +Info: PYSVN CMD add file1.txt +A B:/wc1/test/file1.txt + +Info: PYSVN CMD add file2.txt +A B:/wc1/test/file2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file1.txt +A B:/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Setup - checkout wc2 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc2 +A B:/wc2/test +A B:/wc2/test/file1.txt +A B:/wc2/test/file2.txt +U B:/wc2 +update_started B:/wc2 +Checked out revision 3 +Info: Test - status of unlocked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + 3 3 barry B:\wc1\test\file1.txt + 3 3 barry B:\wc1\test\file2.txt +Info: Test - info2 of unlocked files + +Info: PYSVN CMD info2 b:\wc1\test\file1.txt + +Path: B:/wc1/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 54017555-937f-e04f-98a9-7a3817f31a91 +Last changed author: barry +Last Changed Date: 02-Apr-2018 11:36:49 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 02-Apr-2018 11:36:48 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - list of unlocked files + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test\file1.txt + 3 barry 17 02-Apr-2018 11:36:49 B:/wc1/test/file1.txt + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test + 3 barry - 02-Apr-2018 11:36:49 B:/wc1/test + 3 barry 17 02-Apr-2018 11:36:49 B:/wc1/test/file1.txt + 3 barry 17 02-Apr-2018 11:36:49 B:/wc1/test/file2.txt +Info: Test - lock unlocked file + +Info: PYSVN CMD lock b:\wc1\test\file1.txt +locked B:/wc1/test/file1.txt +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + K 3 3 barry B:\wc1\test\file1.txt + 3 3 barry B:\wc1\test\file2.txt +Info: Test - info2 of locked files + +Info: PYSVN CMD info2 b:\wc1\test\file1.txt + +Path: B:/wc1/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 54017555-937f-e04f-98a9-7a3817f31a91 +Last changed author: barry +Last Changed Date: 02-Apr-2018 11:36:49 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 02-Apr-2018 11:36:50 +Lock Token: opaquelocktoken:853bde7e-8aaf-874b-bc69-1005953af9ac +Lock Comment: +Schedule: normal +Text Last Updated: 02-Apr-2018 11:36:48 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test\file1.txt + 3 barry 17 02-Apr-2018 11:36:49 B:/wc1/test/file1.txt + Lock owner: barry + Lock comment: + Lock created: 2018-04-02 11:36:50 + +Info: PYSVN CMD list --verbose --fetch-locks b:\wc1\test + 3 barry - 02-Apr-2018 11:36:49 B:/wc1/test + 3 barry 17 02-Apr-2018 11:36:49 B:/wc1/test/file1.txt + Lock owner: barry + Lock comment: + Lock created: 2018-04-02 11:36:50 + 3 barry 17 02-Apr-2018 11:36:49 B:/wc1/test/file2.txt +Info: Test - attempt to checkin over a locked file + +Info: CMD cd b:\wc2\test +Info: Append File file1.txt - Change to file 1 +Info: Append File file2.txt - Change to file 2 + +Info: PYSVN CMD commit -m "change when file locked in other wc" . +M B:/wc2/test/file1.txt +M B:/wc2/test/file2.txt +failed_locked B:/wc2/test/file1.txt +Commit failed (details follow): +File 'B:\wc2\test\file1.txt' is locked in another working copy +While preparing 'B:\wc2\test\file1.txt' for commit +Cannot verify lock on path '/trunk/test/file1.txt'; no matching lock-token available +Info: Test - lock locked file + +Info: PYSVN CMD lock b:\wc2\test\file1.txt +failed_lock B:/wc2/test/file1.txt +Info: Test - lock --force locked file + +Info: PYSVN CMD lock --force b:\wc2\test\file1.txt -m "Stealing lock" +locked B:/wc2/test/file1.txt +Info: Test - info2 of locked files + +Info: PYSVN CMD info2 b:\wc2\test\file1.txt + +Path: B:/wc2/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 54017555-937f-e04f-98a9-7a3817f31a91 +Last changed author: barry +Last Changed Date: 02-Apr-2018 11:36:49 +Last changed revision: 3 +Node kind: file +Lock Owner: barry +Lock Creation Date: 02-Apr-2018 11:36:57 +Lock Token: opaquelocktoken:7b8e9287-f31a-bc46-9b90-17ec8f17908e +Lock Comment: +Stealing lock +Schedule: normal +Text Last Updated: 02-Apr-2018 11:36:49 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc2 + 3 3 barry B:\wc2 + 3 3 barry B:\wc2\test +M K 3 3 barry B:\wc2\test\file1.txt +M 3 3 barry B:\wc2\test\file2.txt +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc2 + 3 barry - 02-Apr-2018 11:36:49 B:/wc2 + 3 barry - 02-Apr-2018 11:36:49 B:/wc2/test + 3 barry 17 02-Apr-2018 11:36:49 B:/wc2/test/file1.txt + Lock owner: barry + Lock comment: Stealing lock + Lock created: 2018-04-02 11:36:57 + 3 barry 17 02-Apr-2018 11:36:49 B:/wc2/test/file2.txt +Info: Test - commit with lock + +Info: PYSVN CMD commit -m "change when file locked in this wc" . +M B:/wc2/test/file1.txt +M B:/wc2/test/file2.txt +commit_finalizing . +Revision 4 +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc2 + 3 3 barry B:\wc2 + 3 3 barry B:\wc2\test + K 4 4 barry B:\wc2\test\file1.txt + 4 4 barry B:\wc2\test\file2.txt +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc2 + 4 barry - 02-Apr-2018 11:36:57 B:/wc2 + 4 barry - 02-Apr-2018 11:36:57 B:/wc2/test + 4 barry 35 02-Apr-2018 11:36:57 B:/wc2/test/file1.txt + Lock owner: barry + Lock comment: Stealing lock + Lock created: 2018-04-02 11:36:57 + 4 barry 35 02-Apr-2018 11:36:57 B:/wc2/test/file2.txt +Info: Test - unlock locked file + +Info: PYSVN CMD unlock b:\wc2\test\file1.txt +unlocked B:/wc2/test/file1.txt +Info: Test - status of unlocked files + +Info: PYSVN CMD status --verbose b:\wc2 + 3 3 barry B:\wc2 + 3 3 barry B:\wc2\test + 4 4 barry B:\wc2\test\file1.txt + 4 4 barry B:\wc2\test\file2.txt +Info: Test - list of unlocked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc2 + 4 barry - 02-Apr-2018 11:36:57 B:/wc2 + 4 barry - 02-Apr-2018 11:36:57 B:/wc2/test + 4 barry 35 02-Apr-2018 11:36:57 B:/wc2/test/file1.txt + 4 barry 35 02-Apr-2018 11:36:57 B:/wc2/test/file2.txt +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + K 3 3 barry B:\wc1\test\file1.txt + 3 3 barry B:\wc1\test\file2.txt +Info: Test - list of unlocked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc1 + 4 barry - 02-Apr-2018 11:36:57 B:/wc1 + 4 barry - 02-Apr-2018 11:36:57 B:/wc1/test + 4 barry 35 02-Apr-2018 11:36:57 B:/wc1/test/file1.txt + 4 barry 35 02-Apr-2018 11:36:57 B:/wc1/test/file2.txt +Info: Test - update with stolen lock + +Info: PYSVN CMD update b:\wc1\test +U B:/wc1 +U B:/wc1/test +U B:/wc1/test/file1.txt +U B:/wc1/test/file2.txt +update_started B:/wc1/test +Updated to revision 4 +Info: Test - status of locked files + +Info: PYSVN CMD status --verbose b:\wc1 + 2 2 barry B:\wc1 + 4 4 barry B:\wc1\test + 4 4 barry B:\wc1\test\file1.txt + 4 4 barry B:\wc1\test\file2.txt +Info: Test - info2 of URL + +Info: PYSVN CMD info2 --revision HEAD file:///b:/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 4 +Repository root_URL: file:///B:/repos +Repository UUID: 54017555-937f-e04f-98a9-7a3817f31a91 +Last changed author: barry +Last Changed Date: 02-Apr-2018 11:36:57 +Last changed revision: 4 +Node kind: file +Info: Test - list of locked files + +Info: PYSVN CMD list --verbose --fetch-locks --recursive b:\wc1 + 4 barry - 02-Apr-2018 11:36:57 B:/wc1 + 4 barry - 02-Apr-2018 11:36:57 B:/wc1/test + 4 barry 35 02-Apr-2018 11:36:57 B:/wc1/test/file1.txt + 4 barry 35 02-Apr-2018 11:36:57 B:/wc1/test/file2.txt diff --git a/Tests/test-06.unix.known_good-py2-svn1.11.log b/Tests/test-06.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..105108e8b020470bb6e2abef3b8ac5938cfb3d33 --- /dev/null +++ b/Tests/test-06.unix.known_good-py2-svn1.11.log @@ -0,0 +1,90 @@ +WorkDir: /home/barry/wc/svn/pysvn-trunk/Extension +PYTHON: /usr/bin/python2.7 +Username: barry +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: mkdir testroot-06 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: cd testroot-06 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06 +Info: Command: mkdir tmp +Info: PYSVN command /usr/bin/python2.7 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.03.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/configdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06 +Info: Command: svnadmin create /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos +Info: Setup - mkdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk -m test-06 add trunk +commit_finalizing . +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk/test -m test-06 add test +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +U /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1 +Checked out revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: Setup - add files +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: add file1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test/file1.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: add file2.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test/file2.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test/file1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Test - info of path +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info file1.txt +Path: file1.txt +Name: file1.txt +Url: file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +Repository: file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos +Repository UUID: 17bd8196-cb14-4d3b-bf42-c7321fabef47 +Revision: 3 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 3 +Last Changed Date: 19-Apr-2016 19:50:51 +Text Last Updated: 19-Apr-2016 19:50:50 +Checksum: e99afc2363b20ca1e52cd9ce4e8577eb +Info: Test - info2 of path +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info2 file1.txt + +Path: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test/file1.txt +Url: file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos +Repository UUID: 17bd8196-cb14-4d3b-bf42-c7321fabef47 +Last changed author: barry +Last Changed Date: 19-Apr-2016 19:50:51 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 19-Apr-2016 19:50:50 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - info2 of URL +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info --revision HEAD file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +unused option --revision +Info: Test - info2 of URL +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info2 --revision HEAD file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-06/repos +Repository UUID: 17bd8196-cb14-4d3b-bf42-c7321fabef47 +Last changed author: barry +Last Changed Date: 19-Apr-2016 19:50:51 +Last changed revision: 3 +Node kind: file diff --git a/Tests/test-06.unix.known_good-py3-svn1.11.log b/Tests/test-06.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..8da2ad4eedefa2b07ee0ab83fa2cc61bd47ce047 --- /dev/null +++ b/Tests/test-06.unix.known_good-py3-svn1.11.log @@ -0,0 +1,90 @@ +WorkDir: /Users/barry/wc/svn/pysvn-next/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests +Info: Command: mkdir testroot-06 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests +Info: Command: cd testroot-06 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06 +Info: Command: mkdir tmp +Info: PYSVN command /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.03.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/configdir +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk -m test-06 add trunk +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk/test -m test-06 add test +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1 +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +U /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1 +update_started /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1 +Checked out revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06 +Info: Command: cd /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: Setup - add files +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: add file1.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test/file1.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: add file2.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test/file2.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test/file1.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Test - info of path +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info file1.txt +Path: file1.txt +Name: file1.txt +Url: file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +Repository: file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos +Repository UUID: 0c0404ce-2d17-4f0f-b288-a4d12de11694 +Revision: 3 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 3 +Last Changed Date: 19-Apr-2016 16:18:20 +Text Last Updated: 19-Apr-2016 16:18:19 +Checksum: e99afc2363b20ca1e52cd9ce4e8577eb +Info: Test - info2 of path +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info2 file1.txt + +Path: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test/file1.txt +Url: file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos +Repository UUID: 0c0404ce-2d17-4f0f-b288-a4d12de11694 +Last changed author: barry +Last Changed Date: 19-Apr-2016 16:18:20 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 19-Apr-2016 16:18:19 +Checksum: ae0e5a70bbd1dcadbb4ac8ffe321bdb7b7682b72 +Info: Test - info2 of URL +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info --revision HEAD file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +unused option --revision +Info: Test - info2 of URL +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/wc1/test +Info: pysvn command: info2 --revision HEAD file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-06/repos +Repository UUID: 0c0404ce-2d17-4f0f-b288-a4d12de11694 +Last changed author: barry +Last Changed Date: 19-Apr-2016 16:18:20 +Last changed revision: 3 +Node kind: file diff --git a/Tests/test-06.win32.known_good-py2-svn1.11.log b/Tests/test-06.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..d0082d834175ce56c727324168c164f474cdbbd8 --- /dev/null +++ b/Tests/test-06.win32.known_good-py2-svn1.11.log @@ -0,0 +1,88 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.03.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-06 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-06 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:/repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-06 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-06 add test" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD cd b:\wc1\test +Info: Setup - add files +Info: Create File file1.txt - test add file 1 +Info: Create File file2.txt - test add file 2 + +Info: PYSVN CMD add file1.txt +A B:/wc1/test/file1.txt + +Info: PYSVN CMD add file2.txt +A B:/wc1/test/file2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file1.txt +A B:/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Test - info of path + +Info: PYSVN CMD info file1.txt +Path: file1.txt +Name: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Repository: file:///B:/repos +Repository UUID: 83a16b97-297d-754c-9004-293b55a6ce50 +Revision: 3 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 3 +Last Changed Date: 27-Apr-2016 20:36:28 +Text Last Updated: 27-Apr-2016 20:36:28 +Checksum: 1e41522fd7b6b6325667c8554893a6db +Info: Test - info2 of path + +Info: PYSVN CMD info2 file1.txt + +Path: B:/wc1/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 83a16b97-297d-754c-9004-293b55a6ce50 +Last changed author: barry +Last Changed Date: 27-Apr-2016 20:36:28 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 27-Apr-2016 20:36:28 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - info2 of URL + +Info: PYSVN CMD info2 --revision HEAD file:///b:/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: 83a16b97-297d-754c-9004-293b55a6ce50 +Last changed author: barry +Last Changed Date: 27-Apr-2016 20:36:28 +Last changed revision: 3 +Node kind: file diff --git a/Tests/test-06.win32.known_good-py3-svn1.11.log b/Tests/test-06.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..74115b61340159feefe2e24a94e16825e5d0b64b --- /dev/null +++ b/Tests/test-06.win32.known_good-py3-svn1.11.log @@ -0,0 +1,88 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.03.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-06 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-06 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:/repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-06 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-06 add test" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD cd b:\wc1\test +Info: Setup - add files +Info: Create File file1.txt - test add file 1 +Info: Create File file2.txt - test add file 2 + +Info: PYSVN CMD add file1.txt +A B:/wc1/test/file1.txt + +Info: PYSVN CMD add file2.txt +A B:/wc1/test/file2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file1.txt +A B:/wc1/test/file2.txt +commit_finalizing . +Revision 3 +Info: Test - info of path + +Info: PYSVN CMD info file1.txt +Path: file1.txt +Name: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Repository: file:///B:/repos +Repository UUID: bb61a85c-026b-c047-a48e-48865e54b172 +Revision: 3 +Node kind: file +Schedule: normal +Last Changed Author: barry +Last Changed Rev: 3 +Last Changed Date: 27-Apr-2016 20:43:05 +Text Last Updated: 27-Apr-2016 20:43:05 +Checksum: 1e41522fd7b6b6325667c8554893a6db +Info: Test - info2 of path + +Info: PYSVN CMD info2 file1.txt + +Path: B:/wc1/test/file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: bb61a85c-026b-c047-a48e-48865e54b172 +Last changed author: barry +Last Changed Date: 27-Apr-2016 20:43:05 +Last changed revision: 3 +Node kind: file +Schedule: normal +Text Last Updated: 27-Apr-2016 20:43:05 +Checksum: d88eba14019658765c3dc2a2b46c4d0f1ee50e5f +Info: Test - info2 of URL + +Info: PYSVN CMD info2 --revision HEAD file:///b:/repos/trunk/test/file1.txt + +Path: file1.txt +Url: file:///B:/repos/trunk/test/file1.txt +Revision: 3 +Repository root_URL: file:///B:/repos +Repository UUID: bb61a85c-026b-c047-a48e-48865e54b172 +Last changed author: barry +Last Changed Date: 27-Apr-2016 20:43:05 +Last changed revision: 3 +Node kind: file diff --git a/Tests/test-07.unix.known_good-py2-svn1.11.log b/Tests/test-07.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..22093b3c573eb8e4a1a74e4c9e72c8c7acd6d394 --- /dev/null +++ b/Tests/test-07.unix.known_good-py2-svn1.11.log @@ -0,0 +1,95 @@ +WorkDir: /home/barry/wc/svn/pysvn-trunk/Extension +PYTHON: /bin/python +Username: barry +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: mkdir testroot-07 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: cd testroot-07 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: Command: mkdir tmp +Info: PYSVN command /bin/python /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.05.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/configdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: Command: svnadmin create /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos +Info: Setup - mkdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos/trunk -m test-07 add trunk +commit_finalizing . +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos/trunk/test -m test-07 add test +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +U /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 +Checked out revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: Setup - add files +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_a1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt +commit_finalizing . +Revision 3 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_a2.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt +commit_finalizing . +Revision 4 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_b1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt +commit_finalizing . +Revision 5 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_b2.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +commit_finalizing . +Revision 6 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: status --verbose /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 + 2 2 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 + 2 2 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test + 3 3 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt + 4 4 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt + 5 5 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt + 6 6 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +Info: running test_07_copy2 +Info: Copy2 with no revision and no peg_revision +Info: Copy2 with no peg_revision +Info: Copy2 +Info: Copy2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_move2 +Info: Move2 will succeed +Info: Move2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_changelist +After add_to_changelist show all + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +After add_to_changelist show changelist-two + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +After remove_from_changelists all changelist-two show all + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt +After remove_from_changelists all show all + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt diff --git a/Tests/test-07.unix.known_good-py3-svn1.11.log b/Tests/test-07.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..79d1ba11a51a60c5b7d3610456af4bb0a69c6561 --- /dev/null +++ b/Tests/test-07.unix.known_good-py3-svn1.11.log @@ -0,0 +1,95 @@ +WorkDir: /home/barry/wc/svn/pysvn-trunk/Extension +PYTHON: /bin/python3 +Username: barry +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: mkdir testroot-07 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: cd testroot-07 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: Command: mkdir tmp +Info: PYSVN command /bin/python3 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.05.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/configdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: Command: svnadmin create /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos +Info: Setup - mkdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos/trunk -m test-07 add trunk +commit_finalizing . +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos/trunk/test -m test-07 add test +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +U /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 +Checked out revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: Setup - add files +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_a1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt +commit_finalizing . +Revision 3 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_a2.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt +commit_finalizing . +Revision 4 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_b1.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt +commit_finalizing . +Revision 5 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: add file_b2.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +commit_finalizing . +Revision 6 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test +Info: pysvn command: status --verbose /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 + 2 2 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1 + 2 2 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test + 3 3 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt + 4 4 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt + 5 5 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt + 6 6 barry /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +Info: running test_07_copy2 +Info: Copy2 with no revision and no peg_revision +Info: Copy2 with no peg_revision +Info: Copy2 +Info: Copy2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_move2 +Info: Move2 will succeed +Info: Move2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_changelist +After add_to_changelist show all + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +After add_to_changelist show changelist-two + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a2.txt + changelist-two /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b2.txt +After remove_from_changelists all changelist-two show all + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_a1.txt + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt +After remove_from_changelists all show all + changelist-one /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-07/wc1/test/file_b1.txt diff --git a/Tests/test-07.win32.known_good-py2-svn1.11.log b/Tests/test-07.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..d7bece723984269af9d0e4e3daa8d120feecbcb1 --- /dev/null +++ b/Tests/test-07.win32.known_good-py2-svn1.11.log @@ -0,0 +1,99 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win32\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.03.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-07 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-07 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:/repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-07 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-07 add test" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:/wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD cd /d b:/wc1/test +Info: Setup - add files +Info: Create File file_a1.txt - test add file 1 + +Info: PYSVN CMD add file_a1.txt +A B:/wc1/test/file_a1.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_a1.txt +commit_finalizing . +Revision 3 +Info: Create File file_a2.txt - test add file 2 + +Info: PYSVN CMD add file_a2.txt +A B:/wc1/test/file_a2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_a2.txt +commit_finalizing . +Revision 4 +Info: Create File file_b1.txt - test add file 1 + +Info: PYSVN CMD add file_b1.txt +A B:/wc1/test/file_b1.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_b1.txt +commit_finalizing . +Revision 5 +Info: Create File file_b2.txt - test add file 2 + +Info: PYSVN CMD add file_b2.txt +A B:/wc1/test/file_b2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_b2.txt +commit_finalizing . +Revision 6 + +Info: PYSVN CMD status --verbose b:/wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + 3 3 barry B:\wc1\test\file_a1.txt + 4 4 barry B:\wc1\test\file_a2.txt + 5 5 barry B:\wc1\test\file_b1.txt + 6 6 barry B:\wc1\test\file_b2.txt +Info: running test_07_copy2 +Info: Copy2 with no revision and no peg_revision +Info: Copy2 with no peg_revision +Info: Copy2 +Info: Copy2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_move2 +Info: Move2 will succeed +Info: Move2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_changelist +After add_to_changelist show all + changelist-one B:/wc1/test/file_a1.txt + changelist-two B:/wc1/test/file_a2.txt + changelist-one B:/wc1/test/file_b1.txt + changelist-two B:/wc1/test/file_b2.txt +After add_to_changelist show changelist-two + changelist-two B:/wc1/test/file_a2.txt + changelist-two B:/wc1/test/file_b2.txt +After remove_from_changelists all changelist-two show all + changelist-one B:/wc1/test/file_a1.txt + changelist-one B:/wc1/test/file_b1.txt +After remove_from_changelists all show all + changelist-one B:/wc1/test/file_b1.txt diff --git a/Tests/test-07.win32.known_good-py3-svn1.11.log b/Tests/test-07.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..05377dec1f4aff09696d5cd9375f767f50a3a212 --- /dev/null +++ b/Tests/test-07.win32.known_good-py3-svn1.11.log @@ -0,0 +1,99 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win32\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.03.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-07 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-07 + +Info: CMD cd /d b:\ + +Info: CMD svnadmin create b:/repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-07 add trunk" +commit_finalizing . + +Info: PYSVN CMD mkdir file:///b:/repos/trunk/test -m "test-07 add test" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:/wc1 +A B:/wc1/test +U B:/wc1 +update_started B:/wc1 +Checked out revision 2 + +Info: CMD cd /d b:/wc1/test +Info: Setup - add files +Info: Create File file_a1.txt - test add file 1 + +Info: PYSVN CMD add file_a1.txt +A B:/wc1/test/file_a1.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_a1.txt +commit_finalizing . +Revision 3 +Info: Create File file_a2.txt - test add file 2 + +Info: PYSVN CMD add file_a2.txt +A B:/wc1/test/file_a2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_a2.txt +commit_finalizing . +Revision 4 +Info: Create File file_b1.txt - test add file 1 + +Info: PYSVN CMD add file_b1.txt +A B:/wc1/test/file_b1.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_b1.txt +commit_finalizing . +Revision 5 +Info: Create File file_b2.txt - test add file 2 + +Info: PYSVN CMD add file_b2.txt +A B:/wc1/test/file_b2.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/test/file_b2.txt +commit_finalizing . +Revision 6 + +Info: PYSVN CMD status --verbose b:/wc1 + 2 2 barry B:\wc1 + 2 2 barry B:\wc1\test + 3 3 barry B:\wc1\test\file_a1.txt + 4 4 barry B:\wc1\test\file_a2.txt + 5 5 barry B:\wc1\test\file_b1.txt + 6 6 barry B:\wc1\test\file_b2.txt +Info: running test_07_copy2 +Info: Copy2 with no revision and no peg_revision +Info: Copy2 with no peg_revision +Info: Copy2 +Info: Copy2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_move2 +Info: Move2 will succeed +Info: Move2 will raise error +Info: Error: 'Operation does not support multiple sources' +Info: Code: 195014, Message: 'Operation does not support multiple sources' +Info: running test_07_changelist +After add_to_changelist show all + changelist-one B:/wc1/test/file_a1.txt + changelist-two B:/wc1/test/file_a2.txt + changelist-one B:/wc1/test/file_b1.txt + changelist-two B:/wc1/test/file_b2.txt +After add_to_changelist show changelist-two + changelist-two B:/wc1/test/file_a2.txt + changelist-two B:/wc1/test/file_b2.txt +After remove_from_changelists all changelist-two show all + changelist-one B:/wc1/test/file_a1.txt + changelist-one B:/wc1/test/file_b1.txt +After remove_from_changelists all show all + changelist-one B:/wc1/test/file_b1.txt diff --git a/Tests/test-08.unix.known_good-py2-svn1.11.log b/Tests/test-08.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..f8166a9fadcf89fed2ad086be073561e48bb99a8 --- /dev/null +++ b/Tests/test-08.unix.known_good-py2-svn1.11.log @@ -0,0 +1,94 @@ +WorkDir: /home/barry/wc/svn/pysvn-trunk/Extension +PYTHON: /bin/python +Username: barry +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: mkdir testroot-08 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: cd testroot-08 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: Command: mkdir tmp +Info: PYSVN command /bin/python /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.05.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/configdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: Command: svnadmin create /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos +Info: Setup - mkdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos/trunk -m test-08 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Checked out revision 1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Setup - add files and folders +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: mkdir folder1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: mkdir folder2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: mkdir folder2/sub2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: add folder1/file-a.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1/file-a.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: add folder2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/file-b.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: add folder2/sub2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2/file-b.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1/file-a.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2/file-b.txt +commit_finalizing . +Revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Command: cat /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/diff-1.patch +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: diff folder1/file-a.txt +Index: folder1/file-a.txt +=================================================================== +--- folder1/file-a.txt (revision 2) ++++ folder1/file-a.txt (working copy) +@@ -1 +1,2 @@ + test add file 1 ++test add line 2 + +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Command: cat folder1/file-a.txt +test add file 1 +test add line 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2/sub2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2/sub2/file-b.txt +U /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Checked out revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: Command: cat folder1/file-a.txt +test add file 1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: pysvn command: patch /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/diff-1.patch /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 --no-remove-tempfiles +patch /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt +patch_applied_hunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: Command: cat folder1/file-a.txt +test add file 1 +test add line 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: Command: diff -u /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1/file-a.txt /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt diff --git a/Tests/test-08.unix.known_good-py3-svn1.11.log b/Tests/test-08.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..47658dfc267a4ef63f5dec9e20ea4b0dc6911557 --- /dev/null +++ b/Tests/test-08.unix.known_good-py3-svn1.11.log @@ -0,0 +1,94 @@ +WorkDir: /home/barry/wc/svn/pysvn-trunk/Extension +PYTHON: /bin/python3 +Username: barry +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: mkdir testroot-08 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests +Info: Command: cd testroot-08 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: Command: mkdir tmp +Info: PYSVN command /bin/python3 /home/barry/wc/svn/pysvn-trunk/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.05.00 --config-dir /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/configdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: Command: svnadmin create /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos +Info: Setup - mkdir +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: pysvn command: mkdir file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos/trunk -m test-08 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Checked out revision 1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Setup - add files and folders +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: mkdir folder1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: mkdir folder2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: mkdir folder2/sub2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: add folder1/file-a.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1/file-a.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: add folder2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/file-b.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: add folder2/sub2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2/file-b.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: checkin -m commit added files +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1/file-a.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder2/sub2/file-b.txt +commit_finalizing . +Revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Command: cat /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/diff-1.patch +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: diff folder1/file-a.txt +Index: folder1/file-a.txt +=================================================================== +--- folder1/file-a.txt (revision 2) ++++ folder1/file-a.txt (working copy) +@@ -1 +1,2 @@ + test add file 1 ++test add line 2 + +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Command: cat folder1/file-a.txt +test add file 1 +test add line 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: pysvn command: checkout file:///home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/repos/trunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2/file-b.txt +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2/sub2 +A /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder2/sub2/file-b.txt +U /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +update_started /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Checked out revision 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1 +Info: Command: cd /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: Command: cat folder1/file-a.txt +test add file 1 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: pysvn command: patch /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/diff-1.patch /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 --no-remove-tempfiles +patch /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt +patch_applied_hunk /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: Command: cat folder1/file-a.txt +test add file 1 +test add line 2 +Info: CWD: /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2 +Info: Command: diff -u /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc1/folder1/file-a.txt /home/barry/wc/svn/pysvn-trunk/Extension/Tests/testroot-08/wc2/folder1/file-a.txt diff --git a/Tests/test-08.win32.known_good-py2-svn1.11.log b/Tests/test-08.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..a73064f787118268f6302050e5321376ad82081e --- /dev/null +++ b/Tests/test-08.win32.known_good-py2-svn1.11.log @@ -0,0 +1,135 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-08 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-08 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-08 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 + +Info: PYSVN CMD mkdir folder2 +A B:/wc1/folder2 + +Info: PYSVN CMD mkdir folder2\sub2 +A B:/wc1/folder2/sub2 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt +Info: Create File folder2\file-b.txt - test add file 2 + +Info: PYSVN CMD add folder2\file-b.txt +A B:/wc1/folder2/file-b.txt +Info: Create File folder2\sub2\file-b.txt - test add file 2 + +Info: PYSVN CMD add folder2\sub2\file-b.txt +A B:/wc1/folder2/sub2/file-b.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/folder1 +A B:/wc1/folder1/file-a.txt +A B:/wc1/folder2 +A B:/wc1/folder2/file-b.txt +A B:/wc1/folder2/sub2 +A B:/wc1/folder2/sub2/file-b.txt +commit_finalizing . +Revision 2 +Info: Append File folder1\file-a.txt - test add line 2 + +Info: PYSVN CMD diff folder1\file-a.txt + +Info: CMD type b:\diff-1.patch +Index: folder1/file-a.txt +=================================================================== +--- folder1/file-a.txt (revision 2) ++++ folder1/file-a.txt (working copy) +@@ -1 +1,2 @@ + test add file 1 ++test add line 2 + + +Info: CMD type folder1\file-a.txt +test add file 1 +test add line 2 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc2 +A B:/wc2/folder1 +A B:/wc2/folder1/file-a.txt +A B:/wc2/folder2 +A B:/wc2/folder2/file-b.txt +A B:/wc2/folder2/sub2 +A B:/wc2/folder2/sub2/file-b.txt +U B:/wc2 +update_started B:/wc2 +Checked out revision 2 + +Info: CMD cd /d b:\wc2 + +Info: CMD type folder1\file-a.txt +test add file 1 + +b:\wc2 >call :cmd_pysvn patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles + +b:\wc2 >echo. 1>&2 + + +b:\wc2 >echo Info: PYSVN CMD patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles 1>&2 +Info: PYSVN CMD patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles + +b:\wc2 >c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles +patch B:/wc2/folder1/file-a.txt +patch_applied_hunk B:/wc2/folder1/file-a.txt + +b:\wc2 >goto :eof + +b:\wc2 >call :cmd_shell type folder1\file-a.txt + +b:\wc2 >echo. + + +b:\wc2 >echo Info: CMD type folder1\file-a.txt +Info: CMD type folder1\file-a.txt + +b:\wc2 >type folder1\file-a.txt +test add file 1 +test add line 2 + +b:\wc2 >goto :eof + +b:\wc2 >call :cmd_shell fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt + +b:\wc2 >echo. + + +b:\wc2 >echo Info: CMD fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt +Info: CMD fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt + +b:\wc2 >fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt +Comparing files B:\WC1\FOLDER1\file-a.txt and B:\WC2\FOLDER1\FILE-A.TXT +FC: no differences encountered + + +b:\wc2 >goto :eof + +b:\wc2 >goto :eof diff --git a/Tests/test-08.win32.known_good-py3-svn1.11.log b/Tests/test-08.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..479c7cc014db698c85db05adc931740a67aeb538 --- /dev/null +++ b/Tests/test-08.win32.known_good-py3-svn1.11.log @@ -0,0 +1,135 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-08 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-08 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-08 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 + +Info: PYSVN CMD mkdir folder2 +A B:/wc1/folder2 + +Info: PYSVN CMD mkdir folder2\sub2 +A B:/wc1/folder2/sub2 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt +Info: Create File folder2\file-b.txt - test add file 2 + +Info: PYSVN CMD add folder2\file-b.txt +A B:/wc1/folder2/file-b.txt +Info: Create File folder2\sub2\file-b.txt - test add file 2 + +Info: PYSVN CMD add folder2\sub2\file-b.txt +A B:/wc1/folder2/sub2/file-b.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/folder1 +A B:/wc1/folder1/file-a.txt +A B:/wc1/folder2 +A B:/wc1/folder2/file-b.txt +A B:/wc1/folder2/sub2 +A B:/wc1/folder2/sub2/file-b.txt +commit_finalizing . +Revision 2 +Info: Append File folder1\file-a.txt - test add line 2 + +Info: PYSVN CMD diff folder1\file-a.txt + +Info: CMD type b:\diff-1.patch +Index: folder1/file-a.txt +=================================================================== +--- folder1/file-a.txt (revision 2) ++++ folder1/file-a.txt (working copy) +@@ -1 +1,2 @@ + test add file 1 ++test add line 2 + + +Info: CMD type folder1\file-a.txt +test add file 1 +test add line 2 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc2 +A B:/wc2/folder1 +A B:/wc2/folder1/file-a.txt +A B:/wc2/folder2 +A B:/wc2/folder2/file-b.txt +A B:/wc2/folder2/sub2 +A B:/wc2/folder2/sub2/file-b.txt +U B:/wc2 +update_started B:/wc2 +Checked out revision 2 + +Info: CMD cd /d b:\wc2 + +Info: CMD type folder1\file-a.txt +test add file 1 + +b:\wc2 >call :cmd_pysvn patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles + +b:\wc2 >echo. 1>&2 + + +b:\wc2 >echo Info: PYSVN CMD patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles 1>&2 +Info: PYSVN CMD patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles + +b:\wc2 >c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir patch b:\diff-1.patch b:\wc2 --no-remove-tempfiles +patch B:/wc2/folder1/file-a.txt +patch_applied_hunk B:/wc2/folder1/file-a.txt + +b:\wc2 >goto :eof + +b:\wc2 >call :cmd_shell type folder1\file-a.txt + +b:\wc2 >echo. + + +b:\wc2 >echo Info: CMD type folder1\file-a.txt +Info: CMD type folder1\file-a.txt + +b:\wc2 >type folder1\file-a.txt +test add file 1 +test add line 2 + +b:\wc2 >goto :eof + +b:\wc2 >call :cmd_shell fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt + +b:\wc2 >echo. + + +b:\wc2 >echo Info: CMD fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt +Info: CMD fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt + +b:\wc2 >fc b:\wc1\folder1\file-a.txt b:\wc2\folder1\file-a.txt +Comparing files B:\WC1\FOLDER1\file-a.txt and B:\WC2\FOLDER1\FILE-A.TXT +FC: no differences encountered + + +b:\wc2 >goto :eof + +b:\wc2 >goto :eof diff --git a/Tests/test-09.unix.known_good-py2-svn1.11.log b/Tests/test-09.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..d15c5802357938cf1ca1a26e1ae341f248d61511 --- /dev/null +++ b/Tests/test-09.unix.known_good-py2-svn1.11.log @@ -0,0 +1,124 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-09 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-09 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: Command: mkdir tmp +Info: PYSVN command /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.07.00 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk -m test-09 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Checked out revision 1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: Setup - add files and folders +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: mkdir folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: add folder1/file-a.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m add line 2 +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: annotate folder1/file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | barry | 2018-04-01T11:40:39.286366Z | test add file 1 +2| r3 | barry | 2018-04-01T11:40:40.138169Z | test add line 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: annotate2 folder1/file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | test add file 1 +2| r3 | test add line 2 +Info: propset_local +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propset_local svn:eol native folder1/file-a.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose folder1/file-a.txt +Properties on 'folder1/file-a.txt': + svn:eol: native +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m eol is native +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 4 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propdel_local svn:eol folder1/file-a.txt +property_deleted /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m remove eol +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 5 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propset_remote test-case 09 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt --revision 5 -m set custom prop +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt +Properties on 'file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt': + test-case: 09 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propdel_remote test-case file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt --revision 6 -m set custom prop +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: update +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Updated to revision 7 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: Command: cd folder1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: Command: touch unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose + 7 7 barry . + 7 7 barry file-a.txt +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose --quiet + 7 7 barry . + 7 7 barry file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: lock file-a.txt +locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 + K file-a.txt +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose + 7 7 barry . + K 7 7 barry file-a.txt +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose --quiet + 7 7 barry . + K 7 7 barry file-a.txt diff --git a/Tests/test-09.unix.known_good-py3-svn1.11.log b/Tests/test-09.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..4a1c12728f669cc1df43b75a335b4a70e087c567 --- /dev/null +++ b/Tests/test-09.unix.known_good-py3-svn1.11.log @@ -0,0 +1,124 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-09 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-09 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: Command: mkdir tmp +Info: PYSVN command /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.07.00 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk -m test-09 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Checked out revision 1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: Setup - add files and folders +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: mkdir folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: add folder1/file-a.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m add line 2 +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 3 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: annotate folder1/file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | barry | 2018-04-01T08:58:28.572071Z | test add file 1 +2| r3 | barry | 2018-04-01T08:58:29.254129Z | test add line 2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: annotate2 folder1/file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | test add file 1 +2| r3 | test add line 2 +Info: propset_local +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propset_local svn:eol native folder1/file-a.txt +property_added /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose folder1/file-a.txt +Properties on 'folder1/file-a.txt': + svn:eol: native +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m eol is native +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 4 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propdel_local svn:eol folder1/file-a.txt +property_deleted /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: checkin -m remove eol +M /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +commit_finalizing . +Revision 5 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propset_remote test-case 09 file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt --revision 5 -m set custom prop +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt +Properties on 'file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt': + test-case: 09 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: propdel_remote test-case file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt --revision 6 -m set custom prop +commit_finalizing . +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: proplist --verbose file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/repos/trunk/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: pysvn command: update +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Updated to revision 7 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1 +Info: Command: cd folder1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: Command: touch unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose + 7 7 barry . + 7 7 barry file-a.txt +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose --quiet + 7 7 barry . + 7 7 barry file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: lock file-a.txt +locked /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 + K file-a.txt +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose + 7 7 barry . + K 7 7 barry file-a.txt +? unversioned.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-09/wc1/folder1 +Info: pysvn command: status2 --verbose --quiet + 7 7 barry . + K 7 7 barry file-a.txt diff --git a/Tests/test-09.win32.known_good-py2-svn1.11.log b/Tests/test-09.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..24a1627b4e349fcbf52f7ae2dce8471d4faf44c5 --- /dev/null +++ b/Tests/test-09.win32.known_good-py2-svn1.11.log @@ -0,0 +1,129 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win32\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win32\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-09 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-09 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-09 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/folder1 +A B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 2 +Info: Append File folder1\file-a.txt - test add line 2 + +Info: PYSVN CMD checkin -m "add line 2" +M B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 3 + +Info: PYSVN CMD diff folder1\file-a.txt + +Info: PYSVN CMD annotate folder1\file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | barry | 2018-04-02T18:36:24.970171Z | test add file 1 +2| r3 | barry | 2018-04-02T18:36:25.586206Z | test add line 2 + +Info: PYSVN CMD annotate2 folder1\file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | test add file 1 +2| r3 | test add line 2 +Info: propset_local + +Info: PYSVN CMD propset_local svn:eol native folder1/file-a.txt +property_added B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD proplist --verbose folder1/file-a.txt +Properties on 'folder1/file-a.txt': + svn:eol: native + +Info: PYSVN CMD checkin -m "eol is native" +M B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 4 + +Info: PYSVN CMD propdel_local svn:eol folder1/file-a.txt +property_deleted B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD proplist --verbose folder1/file-a.txt + +Info: PYSVN CMD checkin -m "remove eol" +M B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 5 + +Info: PYSVN CMD "propset_remote" test-case 09 file:///b:/repos/trunk/folder1/file-a.txt --revision 5 -m "set custom prop" +commit_finalizing . + +Info: PYSVN CMD proplist --verbose file:///b:/repos/trunk/folder1/file-a.txt +Properties on 'file:///B:/repos/trunk/folder1/file-a.txt': + test-case: 09 + +Info: PYSVN CMD "propdel_remote" test-case file:///b:/repos/trunk/folder1/file-a.txt --revision 6 -m "set custom prop" +commit_finalizing . + +Info: PYSVN CMD proplist --verbose file:///b:/repos/trunk/folder1/file-a.txt + +Info: PYSVN CMD update +update_started B:/wc1 +Updated to revision 7 + +Info: CMD cd /d folder1 +Info: Create File unversioned.txt - empty + +Info: PYSVN CMD status2 +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose + 7 7 barry B:\wc1\folder1 + 7 7 barry B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose --quiet + 7 7 barry B:\wc1\folder1 + 7 7 barry B:\wc1\folder1\file-a.txt + +Info: PYSVN CMD lock file-a.txt +locked B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD status2 + K B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose + 7 7 barry B:\wc1\folder1 + K 7 7 barry B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose --quiet + 7 7 barry B:\wc1\folder1 + K 7 7 barry B:\wc1\folder1\file-a.txt diff --git a/Tests/test-09.win32.known_good-py3-svn1.11.log b/Tests/test-09.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..17bb364b6d9813238658a6868cf16fc039a1d4a2 --- /dev/null +++ b/Tests/test-09.win32.known_good-py3-svn1.11.log @@ -0,0 +1,129 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.01.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-09 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-09 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-09 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/folder1 +A B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 2 +Info: Append File folder1\file-a.txt - test add line 2 + +Info: PYSVN CMD checkin -m "add line 2" +M B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 3 + +Info: PYSVN CMD diff folder1\file-a.txt + +Info: PYSVN CMD annotate folder1\file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | barry | 2018-04-02T10:51:53.374564Z | test add file 1 +2| r3 | barry | 2018-04-02T10:51:53.906843Z | test add line 2 + +Info: PYSVN CMD annotate2 folder1\file-a.txt +A /trunk/folder1/file-a.txt +A /trunk/folder1/file-a.txt +1| r2 | test add file 1 +2| r3 | test add line 2 +Info: propset_local + +Info: PYSVN CMD propset_local svn:eol native folder1/file-a.txt +property_added B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD proplist --verbose folder1/file-a.txt +Properties on 'folder1/file-a.txt': + svn:eol: native + +Info: PYSVN CMD checkin -m "eol is native" +M B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 4 + +Info: PYSVN CMD propdel_local svn:eol folder1/file-a.txt +property_deleted B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD proplist --verbose folder1/file-a.txt + +Info: PYSVN CMD checkin -m "remove eol" +M B:/wc1/folder1/file-a.txt +commit_finalizing . +Revision 5 + +Info: PYSVN CMD "propset_remote" test-case 09 file:///b:/repos/trunk/folder1/file-a.txt --revision 5 -m "set custom prop" +commit_finalizing . + +Info: PYSVN CMD proplist --verbose file:///b:/repos/trunk/folder1/file-a.txt +Properties on 'file:///B:/repos/trunk/folder1/file-a.txt': + test-case: 09 + +Info: PYSVN CMD "propdel_remote" test-case file:///b:/repos/trunk/folder1/file-a.txt --revision 6 -m "set custom prop" +commit_finalizing . + +Info: PYSVN CMD proplist --verbose file:///b:/repos/trunk/folder1/file-a.txt + +Info: PYSVN CMD update +update_started B:/wc1 +Updated to revision 7 + +Info: CMD cd /d folder1 +Info: Create File unversioned.txt - empty + +Info: PYSVN CMD status2 +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose + 7 7 barry B:\wc1\folder1 + 7 7 barry B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose --quiet + 7 7 barry B:\wc1\folder1 + 7 7 barry B:\wc1\folder1\file-a.txt + +Info: PYSVN CMD lock file-a.txt +locked B:/wc1/folder1/file-a.txt + +Info: PYSVN CMD status2 + K B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose + 7 7 barry B:\wc1\folder1 + K 7 7 barry B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\unversioned.txt + +Info: PYSVN CMD status2 --verbose --quiet + 7 7 barry B:\wc1\folder1 + K 7 7 barry B:\wc1\folder1\file-a.txt diff --git a/Tests/test-10.unix.known_good-py2-svn1.11.log b/Tests/test-10.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..71d3c08084464682751e1e95b4284c9470745a45 --- /dev/null +++ b/Tests/test-10.unix.known_good-py2-svn1.11.log @@ -0,0 +1,76 @@ +WorkDir: /Users/barry/wc/svn/pysvn-next/Extension +PYTHON: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests +Info: Command: mkdir testroot-10 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests +Info: Command: cd testroot-10 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: Command: mkdir tmp +Info: PYSVN command /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.09.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/configdir +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/repos/trunk -m test-10 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/repos/trunk /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +update_started /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Checked out revision 1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: Command: cd /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: Setup - add files and folders +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: mkdir folder1 +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: propset svn:ignore *~ folder1 +property_added /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: add folder1/file-a.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1 +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-a.txt +commit_finalizing . +Revision 2 +Info: vacuum no removes +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt +? folder1/file-a.txt~ +? folder1/file-b.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: vacuum +Info: vacuum remove ignored +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt +? folder1/file-a.txt~ +? folder1/file-b.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: vacuum --remove-ignored-items +D /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-a.txt~ +Info: vacuum remove versioned +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt +? folder1/file-b.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: vacuum --remove-unversioned-items +D /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-b.txt +Info: check final state +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt diff --git a/Tests/test-10.unix.known_good-py3-svn1.11.log b/Tests/test-10.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..f4337d178f5d67df012cf7994989b30a66b68eeb --- /dev/null +++ b/Tests/test-10.unix.known_good-py3-svn1.11.log @@ -0,0 +1,76 @@ +WorkDir: /Users/barry/wc/svn/pysvn-next/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests +Info: Command: mkdir testroot-10 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests +Info: Command: cd testroot-10 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: Command: mkdir tmp +Info: PYSVN command /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn-next/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.09.00 --config-dir /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/configdir +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/repos/trunk -m test-10 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/repos/trunk /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +update_started /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Checked out revision 1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10 +Info: Command: cd /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: Setup - add files and folders +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: mkdir folder1 +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: propset svn:ignore *~ folder1 +property_added /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: add folder1/file-a.txt +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1 +A /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-a.txt +commit_finalizing . +Revision 2 +Info: vacuum no removes +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt +? folder1/file-a.txt~ +? folder1/file-b.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: vacuum +Info: vacuum remove ignored +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt +? folder1/file-a.txt~ +? folder1/file-b.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: vacuum --remove-ignored-items +D /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-a.txt~ +Info: vacuum remove versioned +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt +? folder1/file-b.txt +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: vacuum --remove-unversioned-items +D /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1/folder1/file-b.txt +Info: check final state +Info: CWD: /Users/barry/wc/svn/pysvn-next/Extension/Tests/testroot-10/wc1 +Info: pysvn command: status2 --verbose --no-ignore . + 1 1 barry . + 2 2 barry folder1 + 2 2 barry folder1/file-a.txt diff --git a/Tests/test-10.win32.known_good-py2-svn1.11.log b/Tests/test-10.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..8c96da8c10022035d63b75e529220543ece6a0d9 --- /dev/null +++ b/Tests/test-10.win32.known_good-py2-svn1.11.log @@ -0,0 +1,75 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.09.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-10 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-10 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-10 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 + +Info: PYSVN CMD propset svn:ignore "*~" folder1 +property_added B:/wc1/folder1 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt +Info: Create File folder1/file-a.txt~ - test add file 1 +Info: Create File folder1/file-b.txt - test add file 1 +Info: vacuum no removes + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\file-a.txt~ +? B:\wc1\folder1\file-b.txt + +Info: PYSVN CMD vacuum +Info: vacuum remove ignored + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\file-a.txt~ +? B:\wc1\folder1\file-b.txt + +Info: PYSVN CMD vacuum --remove-ignored-items +D B:/wc1/folder1/file-a.txt~ +Info: vacuum remove versioned + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\file-b.txt + +Info: PYSVN CMD vacuum --remove-unversioned-items +D B:/wc1/folder1/file-b.txt +Info: check final state + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt diff --git a/Tests/test-10.win32.known_good-py3-svn1.11.log b/Tests/test-10.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..3dfb55908fbbabe70b7e5077c545206e676bda4b --- /dev/null +++ b/Tests/test-10.win32.known_good-py3-svn1.11.log @@ -0,0 +1,75 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.09.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-10 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-10 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-10 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 + +Info: PYSVN CMD propset svn:ignore "*~" folder1 +property_added B:/wc1/folder1 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt +Info: Create File folder1/file-a.txt~ - test add file 1 +Info: Create File folder1/file-b.txt - test add file 1 +Info: vacuum no removes + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\file-a.txt~ +? B:\wc1\folder1\file-b.txt + +Info: PYSVN CMD vacuum +Info: vacuum remove ignored + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\file-a.txt~ +? B:\wc1\folder1\file-b.txt + +Info: PYSVN CMD vacuum --remove-ignored-items +D B:/wc1/folder1/file-a.txt~ +Info: vacuum remove versioned + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt +? B:\wc1\folder1\file-b.txt + +Info: PYSVN CMD vacuum --remove-unversioned-items +D B:/wc1/folder1/file-b.txt +Info: check final state + +Info: PYSVN CMD status2 --verbose --no-ignore . + 1 1 barry B:\wc1 + M -1 -1 None B:\wc1\folder1 +M -1 -1 None B:\wc1\folder1\file-a.txt diff --git a/Tests/test-11.unix.known_good-py2-svn1.11.log b/Tests/test-11.unix.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..56850fd573210e0c0be8e0dc42263e4e5cec55a2 --- /dev/null +++ b/Tests/test-11.unix.known_good-py2-svn1.11.log @@ -0,0 +1,66 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-11 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-11 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: Command: mkdir tmp +Info: PYSVN command /Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.10.00 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/repos/trunk -m test-11 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Checked out revision 1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: Setup - add files and folders +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: mkdir folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: mkdir folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: add folder1/file-a.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: add folder2/file-a.sh +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.sh +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: add folder2/file-a.cmd +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.cmd +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1/file-a.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.cmd +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.sh +commit_finalizing . +Revision 2 +test list no patterns +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: list --recursive + +/folder1 +/folder1/file-a.txt +/folder2 +/folder2/file-a.cmd +/folder2/file-a.sh +test list 1 pattern +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: list --recursive --search *.txt +/folder1/file-a.txt +test list 2 patterns +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: list --recursive --search *.sh --search *.txt +/folder1/file-a.txt +/folder2/file-a.sh diff --git a/Tests/test-11.unix.known_good-py3-svn1.11.log b/Tests/test-11.unix.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..837088333189df21d7c211fdf80d6f594ed28f3f --- /dev/null +++ b/Tests/test-11.unix.known_good-py3-svn1.11.log @@ -0,0 +1,66 @@ +WorkDir: /Users/barry/wc/svn/pysvn/Extension +PYTHON: /usr/local/bin/python3.5 +Username: barry +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: mkdir testroot-11 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests +Info: Command: cd testroot-11 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: Command: mkdir tmp +Info: PYSVN command /usr/local/bin/python3.5 /Users/barry/wc/svn/pysvn/Extension/Examples/Client/svn_cmd.py --pysvn-testing 01.10.00 --config-dir /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/configdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: Command: svnadmin create /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/repos +Info: Setup - mkdir +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: pysvn command: mkdir file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/repos/trunk -m test-11 add trunk +commit_finalizing . +Info: Setup - checkout wc1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: pysvn command: checkout file:///Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/repos/trunk /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +update_started /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Checked out revision 1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11 +Info: Command: cd /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: Setup - add files and folders +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: mkdir folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: mkdir folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2 +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: add folder1/file-a.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1/file-a.txt +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: add folder2/file-a.sh +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.sh +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: add folder2/file-a.cmd +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.cmd +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: checkin -m commit added files +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder1/file-a.txt +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2 +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.cmd +A /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1/folder2/file-a.sh +commit_finalizing . +Revision 2 +test list no patterns +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: list --recursive + +/folder1 +/folder1/file-a.txt +/folder2 +/folder2/file-a.cmd +/folder2/file-a.sh +test list 1 pattern +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: list --recursive --search *.txt +/folder1/file-a.txt +test list 2 patterns +Info: CWD: /Users/barry/wc/svn/pysvn/Extension/Tests/testroot-11/wc1 +Info: pysvn command: list --recursive --search *.sh --search *.txt +/folder1/file-a.txt +/folder2/file-a.sh diff --git a/Tests/test-11.win32.known_good-py2-svn1.11.log b/Tests/test-11.win32.known_good-py2-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..d0db7c6641b6d803a439c38f4e418b2817c42d2c --- /dev/null +++ b/Tests/test-11.win32.known_good-py2-svn1.11.log @@ -0,0 +1,71 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python27.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python27.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.10.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-11 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-11 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-11 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 + +Info: PYSVN CMD mkdir folder2 +A B:/wc1/folder2 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt +Info: Create File folder2\file-a.sh - test add file 2 + +Info: PYSVN CMD add folder2\file-a.sh +A B:/wc1/folder2/file-a.sh +Info: Create File folder2\file-a.cmd - test add file 3 + +Info: PYSVN CMD add folder2\file-a.cmd +A B:/wc1/folder2/file-a.cmd + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/folder1 +A B:/wc1/folder1/file-a.txt +A B:/wc1/folder2 +A B:/wc1/folder2/file-a.cmd +A B:/wc1/folder2/file-a.sh +commit_finalizing . +Revision 2 +Info: test list no patterns + +Info: PYSVN CMD list --recursive + +/folder1 +/folder1/file-a.txt +/folder2 +/folder2/file-a.cmd +/folder2/file-a.sh +Info: test list 1 pattern + +Info: PYSVN CMD list --recursive --search "*.txt" +/folder1/file-a.txt +Info: test list 2 patterns + +Info: PYSVN CMD list --recursive --search "*.sh" --search "*.txt" +/folder1/file-a.txt +/folder2/file-a.sh diff --git a/Tests/test-11.win32.known_good-py3-svn1.11.log b/Tests/test-11.win32.known_good-py3-svn1.11.log new file mode 100644 index 0000000000000000000000000000000000000000..ff05c392ffcb1ef677fe1f2c39acb3c64027bcc6 --- /dev/null +++ b/Tests/test-11.win32.known_good-py3-svn1.11.log @@ -0,0 +1,71 @@ +WorkDir: C:\Users\barry\wc\svn\PySVN\Extension +PYTHON: c:\python35.Win64\python.exe +Username: barry +Info: PYSVN CMD c:\python35.Win64\python.exe C:\Users\barry\wc\svn\PySVN\Extension\Examples\Client\svn_cmd.py --pysvn-testing 01.10.00 --config-dir b:\configdir + +Info: CMD mkdir testroot-11 + +Info: CMD subst b: C:\Users\barry\wc\svn\PySVN\Extension\Tests\testroot-11 + +Info: CMD cd /d b:\ + +Info: CMD mkdir tmp + +Info: CMD svnadmin create b:\repos +Info: Setup - mkdir + +Info: PYSVN CMD mkdir file:///b:/repos/trunk -m "test-11 add trunk" +commit_finalizing . +Info: Setup - checkout wc1 + +Info: PYSVN CMD checkout file:///b:/repos/trunk b:\wc1 +update_started B:/wc1 +Checked out revision 1 + +Info: CMD cd /d b:\wc1 +Info: Setup - add files and folders + +Info: PYSVN CMD mkdir folder1 +A B:/wc1/folder1 + +Info: PYSVN CMD mkdir folder2 +A B:/wc1/folder2 +Info: Create File folder1\file-a.txt - test add file 1 + +Info: PYSVN CMD add folder1\file-a.txt +A B:/wc1/folder1/file-a.txt +Info: Create File folder2\file-a.sh - test add file 2 + +Info: PYSVN CMD add folder2\file-a.sh +A B:/wc1/folder2/file-a.sh +Info: Create File folder2\file-a.cmd - test add file 3 + +Info: PYSVN CMD add folder2\file-a.cmd +A B:/wc1/folder2/file-a.cmd + +Info: PYSVN CMD checkin -m "commit added files" +A B:/wc1/folder1 +A B:/wc1/folder1/file-a.txt +A B:/wc1/folder2 +A B:/wc1/folder2/file-a.cmd +A B:/wc1/folder2/file-a.sh +commit_finalizing . +Revision 2 +Info: test list no patterns + +Info: PYSVN CMD list --recursive + +/folder1 +/folder1/file-a.txt +/folder2 +/folder2/file-a.cmd +/folder2/file-a.sh +Info: test list 1 pattern + +Info: PYSVN CMD list --recursive --search "*.txt" +/folder1/file-a.txt +Info: test list 2 patterns + +Info: PYSVN CMD list --recursive --search "*.sh" --search "*.txt" +/folder1/file-a.txt +/folder2/file-a.sh