Compare commits
8 Commits
| Author | SHA1 | Date |
|---|---|---|
Joe Orton
|
b6c7f3af7d | |
|
Joe Orton
|
4aa480d07c | |
|
Joe Orton
|
6290022554 | |
|
Joe Orton
|
b216094629 | |
|
Joe Orton
|
1230952c6a | |
|
Joe Orton
|
c9c954ec29 | |
|
Joe Orton
|
04cca1e12e | |
|
Joe Orton
|
6f3e81155c |
|
|
@ -5,7 +5,22 @@ subversion-1.6.12.tar.bz2
|
|||
/subversion-1.6.15.tar.bz2
|
||||
/subversion-1.6.16.tar.bz2
|
||||
/subversion-1.6.17.tar.bz2
|
||||
/subversion-1.6.18.tar.bz2
|
||||
subversion-1.6.12.tar.bz2
|
||||
*.rpm
|
||||
/subversion-1.6.13.tar.bz2.asc
|
||||
/subversion-1.6.13.tar.bz2
|
||||
/subversion-1.6.15.tar.bz2
|
||||
/subversion-1.6.16.tar.bz2
|
||||
/subversion-1.6.17.tar.bz2
|
||||
/subversion-1.7.0.tar.bz2
|
||||
/subversion-1.7.0
|
||||
/clog
|
||||
/subversion-1.7.1.tar.bz2
|
||||
/subversion-1.7.2.tar.bz2
|
||||
/subversion-1.7.3.tar.bz2
|
||||
/subversion
|
||||
/subversion-1.?.?
|
||||
/*.asc
|
||||
/subversion-1.?.??
|
||||
/subversion-1.7.4.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2
|
||||
c5c662a5d19d047256fa333bd890a925 subversion-1.6.18.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
--- subversion-1.6.0/build/ac-macros/apr.m4.deplibs
|
||||
+++ subversion-1.6.0/build/ac-macros/apr.m4
|
||||
@@ -76,9 +76,9 @@ AC_DEFUN(SVN_LIB_APR,
|
||||
|
||||
dnl When APR stores the dependent libs in the .la file, we don't need
|
||||
dnl --libs.
|
||||
- SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
|
||||
+ SVN_APR_LIBS="`$apr_config --link-libtool`"
|
||||
if test $? -ne 0; then
|
||||
- AC_MSG_ERROR([apr-config --link-libtool --libs failed])
|
||||
+ AC_MSG_ERROR([apr-config --link-libtool failed])
|
||||
fi
|
||||
|
||||
SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
|
||||
--- subversion-1.6.0/build/ac-macros/aprutil.m4.deplibs
|
||||
+++ subversion-1.6.0/build/ac-macros/aprutil.m4
|
||||
@@ -77,11 +77,9 @@ AC_DEFUN(SVN_LIB_APRUTIL,
|
||||
AC_MSG_ERROR([apu-config --prefix failed])
|
||||
fi
|
||||
|
||||
- dnl When APR stores the dependent libs in the .la file, we don't need
|
||||
- dnl --libs.
|
||||
- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
|
||||
+ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
|
||||
if test $? -ne 0; then
|
||||
- AC_MSG_ERROR([apu-config --link-libtool --libs failed])
|
||||
+ AC_MSG_ERROR([apu-config --link-libtool failed])
|
||||
fi
|
||||
|
||||
SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
|
||||
|
|
@ -1,16 +1,24 @@
|
|||
diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf
|
||||
--- subversion-1.7.0/build.conf.rpath 2011-08-04 21:18:50.000000000 +0100
|
||||
+++ subversion-1.7.0/build.conf 2011-10-12 09:23:43.844525530 +0100
|
||||
@@ -478,7 +478,7 @@ type = swig_lib
|
||||
|
||||
Libraries should be linked with -rpath $libdir but programs should not.
|
||||
Doing so for the latter means that a redundant RPATH entry of $libdir
|
||||
will end up in the binaries.
|
||||
|
||||
The redundant RPATH can also cause obscure build failures by causing
|
||||
in-build binaries to pick up libraries from the system environment,
|
||||
which libtool will otherwise avoid.
|
||||
|
||||
--- subversion-1.6.1/build.conf.rpath
|
||||
+++ subversion-1.6.1/build.conf
|
||||
@@ -472,7 +472,7 @@ type = swig_lib
|
||||
lang = python
|
||||
path = subversion/bindings/swig/python/libsvn_swig_py
|
||||
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
|
||||
-link-cmd = $(LINK)
|
||||
+link-cmd = $(LINK_LIB)
|
||||
-link-cmd = $(LINK) $(SWIG_PY_LIBS)
|
||||
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
|
||||
install = swig-py-lib
|
||||
# need special build rule to include -DSWIGPYTHON
|
||||
compile-cmd = $(COMPILE_SWIG_PY)
|
||||
@@ -501,7 +501,7 @@ type = swig_lib
|
||||
@@ -495,7 +495,7 @@ type = swig_lib
|
||||
lang = ruby
|
||||
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
|
||||
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
|
||||
|
|
@ -19,10 +27,9 @@ diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf
|
|||
install = swig-rb-lib
|
||||
# need special build rule to include
|
||||
compile-cmd = $(COMPILE_SWIG_RB)
|
||||
diff -uap subversion-1.7.0/build/generator/gen_base.py.rpath subversion-1.7.0/build/generator/gen_base.py
|
||||
--- subversion-1.7.0/build/generator/gen_base.py.rpath 2011-06-22 17:44:54.000000000 +0100
|
||||
+++ subversion-1.7.0/build/generator/gen_base.py 2011-10-12 09:23:15.368649375 +0100
|
||||
@@ -506,6 +506,10 @@ class TargetLib(TargetLinked):
|
||||
--- subversion-1.6.1/build/generator/gen_base.py.rpath
|
||||
+++ subversion-1.6.1/build/generator/gen_base.py
|
||||
@@ -455,6 +455,10 @@ class TargetLib(TargetLinked):
|
||||
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
|
||||
self.msvc_export = options.get('msvc-export', '').split()
|
||||
|
||||
|
|
@ -33,17 +40,15 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.rpath subversion-1.7.0/bu
|
|||
class TargetApacheMod(TargetLib):
|
||||
|
||||
def __init__(self, name, options, gen_obj):
|
||||
diff -uap subversion-1.7.0/Makefile.in.rpath subversion-1.7.0/Makefile.in
|
||||
--- subversion-1.7.0/Makefile.in.rpath 2011-07-16 12:50:53.000000000 +0100
|
||||
+++ subversion-1.7.0/Makefile.in 2011-10-12 09:24:36.165524732 +0100
|
||||
@@ -203,8 +203,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
|
||||
--- subversion-1.6.1/Makefile.in.rpath
|
||||
+++ subversion-1.6.1/Makefile.in
|
||||
@@ -184,7 +184,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
|
||||
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
|
||||
COMPILE_JAVAHL_JAVAH = $(JAVAH)
|
||||
|
||||
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||||
-LINK_LIB = $(LINK) $(LT_SO_VERSION)
|
||||
+LINK_LIB = $(LINK) -rpath $(libdir)
|
||||
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
|
||||
LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||||
LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
|
||||
|
||||
# special link rule for mod_dav_svn
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/build/generator/gen_base.py
|
||||
--- subversion-1.7.0/build/generator/gen_base.py.pie 2011-10-12 09:25:30.510524103 +0100
|
||||
+++ subversion-1.7.0/build/generator/gen_base.py 2011-10-12 09:25:30.515650110 +0100
|
||||
@@ -406,7 +406,7 @@ class TargetLinked(Target):
|
||||
diff -up subversion-1.6.12/build/generator/gen_base.py.pie subversion-1.6.12/build/generator/gen_base.py
|
||||
--- subversion-1.6.12/build/generator/gen_base.py.pie 2010-09-07 14:05:29.307274005 +0100
|
||||
+++ subversion-1.6.12/build/generator/gen_base.py 2010-09-07 14:05:29.313274265 +0100
|
||||
@@ -357,7 +357,7 @@ class TargetLinked(Target):
|
||||
self.install = options.get('install')
|
||||
self.compile_cmd = options.get('compile-cmd')
|
||||
self.sources = options.get('sources', '*.c *.cpp')
|
||||
|
|
@ -10,7 +10,7 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/buil
|
|||
|
||||
self.external_lib = options.get('external-lib')
|
||||
self.external_project = options.get('external-project')
|
||||
@@ -462,6 +462,11 @@ class TargetExe(TargetLinked):
|
||||
@@ -413,6 +413,11 @@ class TargetExe(TargetLinked):
|
||||
self.manpages = options.get('manpages', '')
|
||||
self.testing = options.get('testing')
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/buil
|
|||
def add_dependencies(self):
|
||||
TargetLinked.add_dependencies(self)
|
||||
|
||||
@@ -507,8 +512,8 @@ class TargetLib(TargetLinked):
|
||||
@@ -456,8 +461,8 @@ class TargetLib(TargetLinked):
|
||||
self.msvc_export = options.get('msvc-export', '').split()
|
||||
|
||||
### hmm. this is Makefile-specific
|
||||
|
|
@ -33,21 +33,24 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/buil
|
|||
|
||||
class TargetApacheMod(TargetLib):
|
||||
|
||||
diff -uap subversion-1.7.0/Makefile.in.pie subversion-1.7.0/Makefile.in
|
||||
--- subversion-1.7.0/Makefile.in.pie 2011-10-12 09:25:30.511600030 +0100
|
||||
+++ subversion-1.7.0/Makefile.in 2011-10-12 09:26:16.757524426 +0100
|
||||
@@ -205,6 +205,9 @@ COMPILE_JAVAHL_JAVAH = $(JAVAH)
|
||||
diff -up subversion-1.6.12/Makefile.in.pie subversion-1.6.12/Makefile.in
|
||||
--- subversion-1.6.12/Makefile.in.pie 2010-09-07 14:05:29.308274305 +0100
|
||||
+++ subversion-1.6.12/Makefile.in 2010-09-07 14:14:28.795274233 +0100
|
||||
@@ -184,8 +184,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
|
||||
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
|
||||
COMPILE_JAVAHL_JAVAH = $(JAVAH)
|
||||
|
||||
-LINK_LIB = $(LINK) -rpath $(libdir)
|
||||
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
|
||||
+LINK_LIB = $(LINK) -rpath $(libdir)
|
||||
+LINK_TEST = $(LINK) -no-install
|
||||
+LINK_TEST_LIB = $(LINK) -avoid-version
|
||||
+LINK_EXE = $(LINK) -pie
|
||||
LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||||
LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
|
||||
|
||||
@@ -657,7 +660,7 @@ schema-clean:
|
||||
$(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@
|
||||
# special link rule for mod_dav_svn
|
||||
@@ -600,7 +603,7 @@ schema-clean:
|
||||
$(top_srcdir)/build/transform_sql.sh $< < $< > $(top_srcdir)/$@
|
||||
|
||||
.c.o:
|
||||
- $(COMPILE) -o $@ -c $<
|
||||
|
|
@ -0,0 +1,729 @@
|
|||
|
||||
Add APR hashorder fixes from upstream.
|
||||
|
||||
--- subversion-1.6.18/subversion/bindings/swig/python/tests/repository.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/bindings/swig/python/tests/repository.py
|
||||
@@ -133,9 +133,11 @@ class SubversionRepositoryTestCase(unitt
|
||||
repos.dir_delta(prev_root, '', '', this_root, '', e_ptr, e_baton,
|
||||
_authz_callback, 1, 1, 0, 0)
|
||||
|
||||
- # Check results
|
||||
- self.assertEqual(editor.textdeltas[0].new_data, "This is a test.\n")
|
||||
- self.assertEqual(editor.textdeltas[1].new_data, "A test.\n")
|
||||
+ # Check results.
|
||||
+ # Ignore the order in which the editor delivers the two sibling files.
|
||||
+ self.assertEqual(set([editor.textdeltas[0].new_data,
|
||||
+ editor.textdeltas[1].new_data]),
|
||||
+ set(["This is a test.\n", "A test.\n"]))
|
||||
self.assertEqual(len(editor.textdeltas),2)
|
||||
|
||||
def test_retrieve_and_change_rev_prop(self):
|
||||
--- subversion-1.6.18/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
|
||||
@@ -224,30 +224,50 @@ class SubversionRepositoryTestCase(unitt
|
||||
|
||||
def test_diff_dir_different_revs(self):
|
||||
diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8)
|
||||
- self._cmp_diff((None, ('trunk/dir1/dir2', 8),
|
||||
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((None, ('trunk/dir1/dir3', 8),
|
||||
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((None, ('trunk/README2.txt', 6),
|
||||
- (Node.FILE, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((('trunk/dir2', 4), None,
|
||||
- (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
|
||||
- self._cmp_diff((('trunk/dir3', 4), None,
|
||||
- (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
|
||||
+ expected = [
|
||||
+ (None, ('trunk/README2.txt', 6),
|
||||
+ (Node.FILE, Changeset.ADD)),
|
||||
+ (None, ('trunk/dir1/dir2', 8),
|
||||
+ (Node.DIRECTORY, Changeset.ADD)),
|
||||
+ (None, ('trunk/dir1/dir3', 8),
|
||||
+ (Node.DIRECTORY, Changeset.ADD)),
|
||||
+ (('trunk/dir2', 4), None,
|
||||
+ (Node.DIRECTORY, Changeset.DELETE)),
|
||||
+ (('trunk/dir3', 4), None,
|
||||
+ (Node.DIRECTORY, Changeset.DELETE)),
|
||||
+ ]
|
||||
+ actual = [diffs.next() for i in range(5)]
|
||||
+ actual = sorted(actual,
|
||||
+ key=lambda diff: ((diff[0] or diff[1]).path,
|
||||
+ (diff[0] or diff[1]).rev))
|
||||
+ self.assertEqual(len(expected), len(actual))
|
||||
+ for e,a in zip(expected, actual):
|
||||
+ self._cmp_diff(e,a)
|
||||
self.assertRaises(StopIteration, diffs.next)
|
||||
|
||||
def test_diff_dir_different_dirs(self):
|
||||
diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12)
|
||||
- self._cmp_diff((None, ('branches/v1x/dir1', 12),
|
||||
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((None, ('branches/v1x/dir1/dir2', 12),
|
||||
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((None, ('branches/v1x/dir1/dir3', 12),
|
||||
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((None, ('branches/v1x/README.txt', 12),
|
||||
- (Node.FILE, Changeset.ADD)), diffs.next())
|
||||
- self._cmp_diff((None, ('branches/v1x/README2.txt', 12),
|
||||
- (Node.FILE, Changeset.ADD)), diffs.next())
|
||||
+ expected = [
|
||||
+ (None, ('branches/v1x/README.txt', 12),
|
||||
+ (Node.FILE, Changeset.ADD)),
|
||||
+ (None, ('branches/v1x/README2.txt', 12),
|
||||
+ (Node.FILE, Changeset.ADD)),
|
||||
+ (None, ('branches/v1x/dir1', 12),
|
||||
+ (Node.DIRECTORY, Changeset.ADD)),
|
||||
+ (None, ('branches/v1x/dir1/dir2', 12),
|
||||
+ (Node.DIRECTORY, Changeset.ADD)),
|
||||
+ (None, ('branches/v1x/dir1/dir3', 12),
|
||||
+ (Node.DIRECTORY, Changeset.ADD)),
|
||||
+ ]
|
||||
+ actual = [diffs.next() for i in range(5)]
|
||||
+ actual = sorted(actual, key=lambda diff: (diff[1].path, diff[1].rev))
|
||||
+ # for e,a in zip(expected, actual):
|
||||
+ # t.write("%r\n" % (e,))
|
||||
+ # t.write("%r\n" % ((None, (a[1].path, a[1].rev), (a[2], a[3])),) )
|
||||
+ # t.write('\n')
|
||||
+ self.assertEqual(len(expected), len(actual))
|
||||
+ for e,a in zip(expected, actual):
|
||||
+ self._cmp_diff(e,a)
|
||||
self.assertRaises(StopIteration, diffs.next)
|
||||
|
||||
def test_diff_dir_no_change(self):
|
||||
--- subversion-1.6.18/subversion/bindings/swig/python/tests/wc.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/bindings/swig/python/tests/wc.py
|
||||
@@ -193,8 +193,9 @@ class SubversionWorkingCopyTestCase(unit
|
||||
|
||||
def test_entries_read(self):
|
||||
entries = wc.entries_read(self.wc, True)
|
||||
-
|
||||
- self.assertEqual(['', 'tags', 'branches', 'trunk'], list(entries.keys()))
|
||||
+ keys = list(entries.keys())
|
||||
+ keys.sort()
|
||||
+ self.assertEqual(['', 'branches', 'tags', 'trunk'], keys)
|
||||
|
||||
def test_get_ignores(self):
|
||||
self.assert_(isinstance(wc.get_ignores(None, self.wc), list))
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/diff_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/diff_tests.py
|
||||
@@ -1024,8 +1024,10 @@ def diff_base_to_repos(sbox):
|
||||
if not re_infoline.match(line):
|
||||
list2.append(line)
|
||||
|
||||
- if list1 != list2:
|
||||
- raise svntest.Failure
|
||||
+ # Two files in diff may be in any order.
|
||||
+ list1 = svntest.verify.UnorderedOutput(list1)
|
||||
+
|
||||
+ svntest.verify.compare_and_display_lines('', '', list1, list2)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/lock_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/lock_tests.py
|
||||
@@ -1164,6 +1164,8 @@ def repos_lock_with_info(sbox):
|
||||
raise svntest.Failure
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
+@Issue(4126)
|
||||
+@Skip(svntest.main.is_ra_type_dav_serf) # Issue 4126 unpredictable result
|
||||
def unlock_already_unlocked_files(sbox):
|
||||
"(un)lock set of files, one already (un)locked"
|
||||
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/stat_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/stat_tests.py
|
||||
@@ -781,38 +781,13 @@ def status_in_xml(sbox):
|
||||
else:
|
||||
raise svntest.Failure
|
||||
|
||||
- template = ["<?xml version=\"1.0\"?>\n",
|
||||
- "<status>\n",
|
||||
- "<target\n",
|
||||
- " path=\"%s\">\n" % (file_path),
|
||||
- "<entry\n",
|
||||
- " path=\"%s\">\n" % (file_path),
|
||||
- "<wc-status\n",
|
||||
- " props=\"none\"\n",
|
||||
- " item=\"modified\"\n",
|
||||
- " revision=\"1\">\n",
|
||||
- "<commit\n",
|
||||
- " revision=\"1\">\n",
|
||||
- "<author>%s</author>\n" % svntest.main.wc_author,
|
||||
- time_str,
|
||||
- "</commit>\n",
|
||||
- "</wc-status>\n",
|
||||
- "</entry>\n",
|
||||
- "<against\n",
|
||||
- " revision=\"1\"/>\n",
|
||||
- "</target>\n",
|
||||
- "</status>\n",
|
||||
- ]
|
||||
+ expected_entries = {file_path : {'wcprops' : 'none',
|
||||
+ 'wcitem' : 'modified',
|
||||
+ 'wcrev' : '1',
|
||||
+ 'crev' : '1',
|
||||
+ 'author' : svntest.main.wc_author}}
|
||||
|
||||
- exit_code, output, error = svntest.actions.run_and_verify_svn(None, None, [],
|
||||
- 'status',
|
||||
- file_path,
|
||||
- '--xml', '-u')
|
||||
-
|
||||
- for i in range(0, len(output)):
|
||||
- if output[i] != template[i]:
|
||||
- print("ERROR: expected: %s actual: %s" % (template[i], output[i]))
|
||||
- raise svntest.Failure
|
||||
+ svntest.actions.run_and_verify_status_xml(expected_entries, file_path, '-u')
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
@@ -1049,53 +1024,23 @@ def status_update_with_incoming_props(sb
|
||||
else:
|
||||
raise svntest.Failure
|
||||
|
||||
- xout = ["<?xml version=\"1.0\"?>\n",
|
||||
- "<status>\n",
|
||||
- "<target\n",
|
||||
- " path=\"%s\">\n" % (wc_dir),
|
||||
- "<entry\n",
|
||||
- " path=\"%s\">\n" % (A_path),
|
||||
- "<wc-status\n",
|
||||
- " props=\"none\"\n",
|
||||
- " item=\"normal\"\n",
|
||||
- " revision=\"1\">\n",
|
||||
- "<commit\n",
|
||||
- " revision=\"1\">\n",
|
||||
- "<author>%s</author>\n" % svntest.main.wc_author,
|
||||
- time_str,
|
||||
- "</commit>\n",
|
||||
- "</wc-status>\n",
|
||||
- "<repos-status\n",
|
||||
- " props=\"modified\"\n",
|
||||
- " item=\"none\">\n",
|
||||
- "</repos-status>\n",
|
||||
- "</entry>\n",
|
||||
- "<entry\n",
|
||||
- " path=\"%s\">\n" % (wc_dir),
|
||||
- "<wc-status\n",
|
||||
- " props=\"none\"\n",
|
||||
- " item=\"normal\"\n",
|
||||
- " revision=\"1\">\n",
|
||||
- "<commit\n",
|
||||
- " revision=\"1\">\n",
|
||||
- "<author>%s</author>\n" % svntest.main.wc_author,
|
||||
- time_str,
|
||||
- "</commit>\n",
|
||||
- "</wc-status>\n",
|
||||
- "<repos-status\n",
|
||||
- " props=\"modified\"\n",
|
||||
- " item=\"none\">\n",
|
||||
- "</repos-status>\n",
|
||||
- "</entry>\n",
|
||||
- "<against\n",
|
||||
- " revision=\"2\"/>\n",
|
||||
- "</target>\n",
|
||||
- "</status>\n",]
|
||||
-
|
||||
- exit_code, output, error = svntest.actions.run_and_verify_svn(None, xout, [],
|
||||
- 'status',
|
||||
- wc_dir,
|
||||
- '--xml', '-uN')
|
||||
+ expected_entries ={wc_dir : {'wcprops' : 'none',
|
||||
+ 'wcitem' : 'normal',
|
||||
+ 'wcrev' : '1',
|
||||
+ 'crev' : '1',
|
||||
+ 'author' : svntest.main.wc_author,
|
||||
+ 'rprops' : 'modified',
|
||||
+ 'ritem' : 'none'},
|
||||
+ A_path : {'wcprops' : 'none',
|
||||
+ 'wcitem' : 'normal',
|
||||
+ 'wcrev' : '1',
|
||||
+ 'crev' : '1',
|
||||
+ 'author' : svntest.main.wc_author,
|
||||
+ 'rprops' : 'modified',
|
||||
+ 'ritem' : 'none'},
|
||||
+ }
|
||||
+
|
||||
+ svntest.actions.run_and_verify_status_xml(expected_entries, wc_dir, '-uN')
|
||||
|
||||
# more incoming prop updates.
|
||||
def status_update_verbose_with_incoming_props(sbox):
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/svnlook_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/svnlook_tests.py
|
||||
@@ -105,35 +105,39 @@ def test_misc(sbox):
|
||||
# the 'svnlook tree --full-paths' output if demanding the whole repository
|
||||
treelist = run_svnlook('tree', repo_dir)
|
||||
treelistfull = run_svnlook('tree', '--full-paths', repo_dir)
|
||||
+
|
||||
path = ''
|
||||
- n = 0
|
||||
+ treelistexpand = []
|
||||
for entry in treelist:
|
||||
len1 = len(entry)
|
||||
len2 = len(entry.lstrip())
|
||||
- path = path[0:2*(len1-len2)-1] + entry.strip()
|
||||
- test = treelistfull[n].rstrip()
|
||||
- if n != 0:
|
||||
- test = "/" + test
|
||||
- if not path == test:
|
||||
- print("Unexpected result from tree with --full-paths:")
|
||||
- print(" entry : %s" % entry.rstrip())
|
||||
- print(" with --full-paths: %s" % treelistfull[n].rstrip())
|
||||
- raise svntest.Failure
|
||||
- n = n + 1
|
||||
+ path = path[0:2*(len1-len2)-1] + entry.strip() + '\n'
|
||||
+ if path == '/\n':
|
||||
+ treelistexpand.append(path)
|
||||
+ else:
|
||||
+ treelistexpand.append(path[1:])
|
||||
+
|
||||
+ treelistexpand = svntest.verify.UnorderedOutput(treelistexpand)
|
||||
+ svntest.verify.compare_and_display_lines('Unexpected result from tree', '',
|
||||
+ treelistexpand, treelistfull)
|
||||
|
||||
# check if the 'svnlook tree' output is the ending of
|
||||
# the 'svnlook tree --full-paths' output if demanding
|
||||
# any part of the repository
|
||||
- n = 0
|
||||
treelist = run_svnlook('tree', repo_dir, '/A/B')
|
||||
treelistfull = run_svnlook('tree', '--full-paths', repo_dir, '/A/B')
|
||||
+
|
||||
+ path = ''
|
||||
+ treelistexpand = []
|
||||
for entry in treelist:
|
||||
- if not treelistfull[n].endswith(entry.lstrip()):
|
||||
- print("Unexpected result from tree with --full-paths:")
|
||||
- print(" entry : %s" % entry.rstrip())
|
||||
- print(" with --full-paths: %s" % treelistfull[n].rstrip())
|
||||
- raise svntest.Failure
|
||||
- n = n + 1
|
||||
+ len1 = len(entry)
|
||||
+ len2 = len(entry.lstrip())
|
||||
+ path = path[0:2*(len1-len2)] + entry.strip() + '\n'
|
||||
+ treelistexpand.append('/A/' + path)
|
||||
+
|
||||
+ treelistexpand = svntest.verify.UnorderedOutput(treelistexpand)
|
||||
+ svntest.verify.compare_and_display_lines('Unexpected result from tree', '',
|
||||
+ treelistexpand, treelistfull)
|
||||
|
||||
treelist = run_svnlook('tree', repo_dir, '/')
|
||||
if treelist[0] != '/\n':
|
||||
@@ -621,7 +625,7 @@ fp.close()"""
|
||||
# internal property, not really expected
|
||||
' svn:check-locks\n',
|
||||
' bogus_rev_prop\n', ' svn:date\n']
|
||||
- verify_logfile(logfilepath, expected_data)
|
||||
+ verify_logfile(logfilepath, svntest.verify.UnorderedOutput(expected_data))
|
||||
|
||||
########################################################################
|
||||
# Run the tests
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/svnsync_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/svnsync_tests.py
|
||||
@@ -179,7 +179,7 @@ or another dump file."""
|
||||
else:
|
||||
exp_master_dumpfile_contents = master_dumpfile_contents
|
||||
|
||||
- svntest.verify.compare_and_display_lines(
|
||||
+ svntest.verify.compare_dump_files(
|
||||
"Dump files", "DUMP", exp_master_dumpfile_contents, dest_dump)
|
||||
|
||||
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/svntest/actions.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/svntest/actions.py
|
||||
@@ -448,7 +448,8 @@ class LogEntry:
|
||||
self.revprops = revprops
|
||||
|
||||
def assert_changed_paths(self, changed_paths):
|
||||
- """Not implemented, so just raises svntest.Failure.
|
||||
+ """Assert that changed_paths is the same as this entry's changed_paths
|
||||
+ Raises svntest.Failure if not.
|
||||
"""
|
||||
raise Failure('NOT IMPLEMENTED')
|
||||
|
||||
@@ -902,13 +903,21 @@ def run_and_verify_merge2(dir, rev1, rev
|
||||
if dry_run and out != out_dry:
|
||||
# Due to the way ra_serf works, it's possible that the dry-run and
|
||||
# real merge operations did the same thing, but the output came in
|
||||
- # a different order. Let's see if maybe that's the case.
|
||||
+ # a different order. Let's see if maybe that's the case by comparing
|
||||
+ # the outputs as unordered sets rather than as lists.
|
||||
+ #
|
||||
+ # This now happens for other RA layers with modern APR because the
|
||||
+ # hash order now varies.
|
||||
#
|
||||
- # NOTE: Would be nice to limit this dance to serf tests only, but...
|
||||
- out_copy = out[:]
|
||||
- out_dry_copy = out_dry[:]
|
||||
- out_copy.sort()
|
||||
- out_dry_copy.sort()
|
||||
+ # The different orders of the real and dry-run merges may cause
|
||||
+ # the "Merging rX through rY into" lines to be duplicated a
|
||||
+ # different number of times in the two outputs. The list-set
|
||||
+ # conversion removes duplicates so these differences are ignored.
|
||||
+ # It also removes "U some/path" duplicate lines. Perhaps we
|
||||
+ # should avoid that?
|
||||
+ out_copy = set(merge_diff_out[:])
|
||||
+ out_dry_copy = set(out_dry[:])
|
||||
+
|
||||
if out_copy != out_dry_copy:
|
||||
print("=============================================================")
|
||||
print("Merge outputs differ")
|
||||
@@ -1193,6 +1202,56 @@ def run_and_verify_unquiet_status(wc_dir
|
||||
tree.dump_tree_script(actual, wc_dir_name + os.sep)
|
||||
raise
|
||||
|
||||
+def run_and_verify_status_xml(expected_entries = [],
|
||||
+ *args):
|
||||
+ """ Run 'status --xml' with arguments *ARGS. If successful the output
|
||||
+ is parsed into an XML document and will be verified by comparing against
|
||||
+ EXPECTED_ENTRIES.
|
||||
+ """
|
||||
+
|
||||
+ exit_code, output, errput = run_and_verify_svn(None, None, [],
|
||||
+ 'status', '--xml', *args)
|
||||
+
|
||||
+ if len(errput) > 0:
|
||||
+ raise Failure
|
||||
+
|
||||
+ doc = parseString(''.join(output))
|
||||
+ entries = doc.getElementsByTagName('entry')
|
||||
+
|
||||
+ def getText(nodelist):
|
||||
+ rc = []
|
||||
+ for node in nodelist:
|
||||
+ if node.nodeType == node.TEXT_NODE:
|
||||
+ rc.append(node.data)
|
||||
+ return ''.join(rc)
|
||||
+
|
||||
+ actual_entries = {}
|
||||
+ for entry in entries:
|
||||
+ wcstatus = entry.getElementsByTagName('wc-status')[0]
|
||||
+ commit = entry.getElementsByTagName('commit')
|
||||
+ author = entry.getElementsByTagName('author')
|
||||
+ rstatus = entry.getElementsByTagName('repos-status')
|
||||
+
|
||||
+ actual_entry = {'wcprops' : wcstatus.getAttribute('props'),
|
||||
+ 'wcitem' : wcstatus.getAttribute('item'),
|
||||
+ }
|
||||
+ if wcstatus.hasAttribute('revision'):
|
||||
+ actual_entry['wcrev'] = wcstatus.getAttribute('revision')
|
||||
+ if (commit):
|
||||
+ actual_entry['crev'] = commit[0].getAttribute('revision')
|
||||
+ if (author):
|
||||
+ actual_entry['author'] = getText(author[0].childNodes)
|
||||
+ if (rstatus):
|
||||
+ actual_entry['rprops'] = rstatus[0].getAttribute('props')
|
||||
+ actual_entry['ritem'] = rstatus[0].getAttribute('item')
|
||||
+
|
||||
+ actual_entries[entry.getAttribute('path')] = actual_entry
|
||||
+
|
||||
+ if expected_entries != actual_entries:
|
||||
+ raise Failure('\n' + '\n'.join(difflib.ndiff(
|
||||
+ pprint.pformat(expected_entries).splitlines(),
|
||||
+ pprint.pformat(actual_entries).splitlines())))
|
||||
+
|
||||
def run_and_verify_diff_summarize_xml(error_re_string = [],
|
||||
expected_prefix = None,
|
||||
expected_paths = [],
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/svntest/verify.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/svntest/verify.py
|
||||
@@ -17,6 +17,8 @@
|
||||
######################################################################
|
||||
|
||||
import re, sys
|
||||
+from difflib import ndiff
|
||||
+import pprint
|
||||
|
||||
import main, tree, wc # general svntest routines in this module.
|
||||
from svntest import Failure
|
||||
@@ -59,6 +61,10 @@ class SVNIncorrectDatatype(SVNUnexpected
|
||||
run_and_verify_* API"""
|
||||
pass
|
||||
|
||||
+class SVNDumpParseError(Failure):
|
||||
+ """Exception raised if parsing a dump file fails"""
|
||||
+ pass
|
||||
+
|
||||
|
||||
######################################################################
|
||||
# Comparison of expected vs. actual output
|
||||
@@ -359,3 +365,193 @@ def verify_exit_code(message, actual, ex
|
||||
display_lines(message, "Exit Code",
|
||||
str(expected) + '\n', str(actual) + '\n')
|
||||
raise raisable
|
||||
+
|
||||
+# A simple dump file parser. While sufficient for the current
|
||||
+# testsuite it doesn't cope with all valid dump files.
|
||||
+class DumpParser:
|
||||
+ def __init__(self, lines):
|
||||
+ self.current = 0
|
||||
+ self.lines = lines
|
||||
+ self.parsed = {}
|
||||
+
|
||||
+ def parse_line(self, regex, required=True):
|
||||
+ m = re.match(regex, self.lines[self.current])
|
||||
+ if not m:
|
||||
+ if required:
|
||||
+ raise SVNDumpParseError("expected '%s' at line %d\n%s"
|
||||
+ % (regex, self.current,
|
||||
+ self.lines[self.current]))
|
||||
+ else:
|
||||
+ return None
|
||||
+ self.current += 1
|
||||
+ return m.group(1)
|
||||
+
|
||||
+ def parse_blank(self, required=True):
|
||||
+ if self.lines[self.current] != '\n': # Works on Windows
|
||||
+ if required:
|
||||
+ raise SVNDumpParseError("expected blank at line %d\n%s"
|
||||
+ % (self.current, self.lines[self.current]))
|
||||
+ else:
|
||||
+ return False
|
||||
+ self.current += 1
|
||||
+ return True
|
||||
+
|
||||
+ def parse_format(self):
|
||||
+ return self.parse_line('SVN-fs-dump-format-version: ([0-9]+)$')
|
||||
+
|
||||
+ def parse_uuid(self):
|
||||
+ return self.parse_line('UUID: ([0-9a-z-]+)$')
|
||||
+
|
||||
+ def parse_revision(self):
|
||||
+ return self.parse_line('Revision-number: ([0-9]+)$')
|
||||
+
|
||||
+ def parse_prop_length(self, required=True):
|
||||
+ return self.parse_line('Prop-content-length: ([0-9]+)$', required)
|
||||
+
|
||||
+ def parse_content_length(self, required=True):
|
||||
+ return self.parse_line('Content-length: ([0-9]+)$', required)
|
||||
+
|
||||
+ def parse_path(self):
|
||||
+ path = self.parse_line('Node-path: (.+)$', required=False)
|
||||
+ if not path and self.lines[self.current] == 'Node-path: \n':
|
||||
+ self.current += 1
|
||||
+ path = ''
|
||||
+ return path
|
||||
+
|
||||
+ def parse_kind(self):
|
||||
+ return self.parse_line('Node-kind: (.+)$', required=False)
|
||||
+
|
||||
+ def parse_action(self):
|
||||
+ return self.parse_line('Node-action: ([0-9a-z-]+)$')
|
||||
+
|
||||
+ def parse_copyfrom_rev(self):
|
||||
+ return self.parse_line('Node-copyfrom-rev: ([0-9]+)$', required=False)
|
||||
+
|
||||
+ def parse_copyfrom_path(self):
|
||||
+ path = self.parse_line('Node-copyfrom-path: (.+)$', required=False)
|
||||
+ if not path and self.lines[self.current] == 'Node-copyfrom-path: \n':
|
||||
+ self.current += 1
|
||||
+ path = ''
|
||||
+ return path
|
||||
+
|
||||
+ def parse_copy_md5(self):
|
||||
+ return self.parse_line('Text-copy-source-md5: ([0-9a-z]+)$', required=False)
|
||||
+
|
||||
+ def parse_copy_sha1(self):
|
||||
+ return self.parse_line('Text-copy-source-sha1: ([0-9a-z]+)$', required=False)
|
||||
+
|
||||
+ def parse_text_md5(self):
|
||||
+ return self.parse_line('Text-content-md5: ([0-9a-z]+)$', required=False)
|
||||
+
|
||||
+ def parse_text_sha1(self):
|
||||
+ return self.parse_line('Text-content-sha1: ([0-9a-z]+)$', required=False)
|
||||
+
|
||||
+ def parse_text_length(self):
|
||||
+ return self.parse_line('Text-content-length: ([0-9]+)$', required=False)
|
||||
+
|
||||
+ # One day we may need to parse individual property name/values into a map
|
||||
+ def get_props(self):
|
||||
+ props = []
|
||||
+ while not re.match('PROPS-END$', self.lines[self.current]):
|
||||
+ props.append(self.lines[self.current])
|
||||
+ self.current += 1
|
||||
+ self.current += 1
|
||||
+ return props
|
||||
+
|
||||
+ def get_content(self, length):
|
||||
+ content = ''
|
||||
+ while len(content) < length:
|
||||
+ content += self.lines[self.current]
|
||||
+ self.current += 1
|
||||
+ if len(content) == length + 1:
|
||||
+ content = content[:-1]
|
||||
+ elif len(content) != length:
|
||||
+ raise SVNDumpParseError("content length expected %d actual %d at line %d"
|
||||
+ % (length, len(content), self.current))
|
||||
+ return content
|
||||
+
|
||||
+ def parse_one_node(self):
|
||||
+ node = {}
|
||||
+ node['kind'] = self.parse_kind()
|
||||
+ action = self.parse_action()
|
||||
+ node['copyfrom_rev'] = self.parse_copyfrom_rev()
|
||||
+ node['copyfrom_path'] = self.parse_copyfrom_path()
|
||||
+ node['copy_md5'] = self.parse_copy_md5()
|
||||
+ node['copy_sha1'] = self.parse_copy_sha1()
|
||||
+ node['prop_length'] = self.parse_prop_length(required=False)
|
||||
+ node['text_length'] = self.parse_text_length()
|
||||
+ node['text_md5'] = self.parse_text_md5()
|
||||
+ node['text_sha1'] = self.parse_text_sha1()
|
||||
+ node['content_length'] = self.parse_content_length(required=False)
|
||||
+ self.parse_blank()
|
||||
+ if node['prop_length']:
|
||||
+ node['props'] = self.get_props()
|
||||
+ if node['text_length']:
|
||||
+ node['content'] = self.get_content(int(node['text_length']))
|
||||
+ # Hard to determine how may blanks is 'correct' (a delete that is
|
||||
+ # followed by an add that is a replace and a copy has one fewer
|
||||
+ # than expected but that can't be predicted until seeing the add)
|
||||
+ # so allow arbitrary number
|
||||
+ blanks = 0
|
||||
+ while self.current < len(self.lines) and self.parse_blank(required=False):
|
||||
+ blanks += 1
|
||||
+ node['blanks'] = blanks
|
||||
+ return action, node
|
||||
+
|
||||
+ def parse_all_nodes(self):
|
||||
+ nodes = {}
|
||||
+ while True:
|
||||
+ if self.current >= len(self.lines):
|
||||
+ break
|
||||
+ path = self.parse_path()
|
||||
+ if not path and not path is '':
|
||||
+ break
|
||||
+ if not nodes.get(path):
|
||||
+ nodes[path] = {}
|
||||
+ action, node = self.parse_one_node()
|
||||
+ if nodes[path].get(action):
|
||||
+ raise SVNDumpParseError("duplicate action '%s' for node '%s' at line %d"
|
||||
+ % (action, path, self.current))
|
||||
+ nodes[path][action] = node
|
||||
+ return nodes
|
||||
+
|
||||
+ def parse_one_revision(self):
|
||||
+ revision = {}
|
||||
+ number = self.parse_revision()
|
||||
+ revision['prop_length'] = self.parse_prop_length()
|
||||
+ revision['content_length'] = self.parse_content_length()
|
||||
+ self.parse_blank()
|
||||
+ revision['props'] = self.get_props()
|
||||
+ self.parse_blank()
|
||||
+ revision['nodes'] = self.parse_all_nodes()
|
||||
+ return number, revision
|
||||
+
|
||||
+ def parse_all_revisions(self):
|
||||
+ while self.current < len(self.lines):
|
||||
+ number, revision = self.parse_one_revision()
|
||||
+ if self.parsed.get(number):
|
||||
+ raise SVNDumpParseError("duplicate revision %d at line %d"
|
||||
+ % (number, self.current))
|
||||
+ self.parsed[number] = revision
|
||||
+
|
||||
+ def parse(self):
|
||||
+ self.parsed['format'] = self.parse_format()
|
||||
+ self.parse_blank()
|
||||
+ self.parsed['uuid'] = self.parse_uuid()
|
||||
+ self.parse_blank()
|
||||
+ self.parse_all_revisions()
|
||||
+ return self.parsed
|
||||
+
|
||||
+def compare_dump_files(message, label, expected, actual):
|
||||
+ """Parse two dump files EXPECTED and ACTUAL, both of which are lists
|
||||
+ of lines as returned by run_and_verify_dump, and check that the same
|
||||
+ revisions, nodes, properties, etc. are present in both dumps.
|
||||
+ """
|
||||
+
|
||||
+ parsed_expected = DumpParser(expected).parse()
|
||||
+ parsed_actual = DumpParser(actual).parse()
|
||||
+
|
||||
+ if parsed_expected != parsed_actual:
|
||||
+ raise svntest.Failure('\n' + '\n'.join(ndiff(
|
||||
+ pprint.pformat(parsed_expected).splitlines(),
|
||||
+ pprint.pformat(parsed_actual).splitlines())))
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/switch_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/switch_tests.py
|
||||
@@ -1541,33 +1541,29 @@ def mergeinfo_switch_elision(sbox):
|
||||
beta_path = os.path.join(wc_dir, "A", "B", "E", "beta")
|
||||
|
||||
# Make branches A/B_COPY_1 and A/B_COPY_2
|
||||
- svntest.actions.run_and_verify_svn(
|
||||
- None,
|
||||
- ["A " + os.path.join(wc_dir, "A", "B_COPY_1", "lambda") + "\n",
|
||||
+ expected_stdout = verify.UnorderedOutput([
|
||||
+ "A " + os.path.join(wc_dir, "A", "B_COPY_1", "lambda") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "E") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "E", "alpha") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "E", "beta") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_1", "F") + "\n",
|
||||
"Checked out revision 1.\n",
|
||||
- "A " + B_COPY_1_path + "\n"],
|
||||
- [],
|
||||
- 'copy',
|
||||
- sbox.repo_url + "/A/B",
|
||||
- B_COPY_1_path)
|
||||
-
|
||||
- svntest.actions.run_and_verify_svn(
|
||||
- None,
|
||||
- ["A " + os.path.join(wc_dir, "A", "B_COPY_2", "lambda") + "\n",
|
||||
+ "A " + B_COPY_1_path + "\n",
|
||||
+ ])
|
||||
+ svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
|
||||
+ sbox.repo_url + "/A/B", B_COPY_1_path)
|
||||
+
|
||||
+ expected_stdout = verify.UnorderedOutput([
|
||||
+ "A " + os.path.join(wc_dir, "A", "B_COPY_2", "lambda") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "E") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "E", "alpha") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "E", "beta") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY_2", "F") + "\n",
|
||||
"Checked out revision 1.\n",
|
||||
- "A " + B_COPY_2_path + "\n"],
|
||||
- [],
|
||||
- 'copy',
|
||||
- sbox.repo_url + "/A/B",
|
||||
- B_COPY_2_path)
|
||||
+ "A " + B_COPY_2_path + "\n",
|
||||
+ ])
|
||||
+ svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
|
||||
+ sbox.repo_url + "/A/B", B_COPY_2_path)
|
||||
|
||||
expected_output = svntest.wc.State(wc_dir, {
|
||||
'A/B_COPY_1' : Item(verb='Adding'),
|
||||
--- subversion-1.6.18/subversion/tests/cmdline/update_tests.py.hashorder
|
||||
+++ subversion-1.6.18/subversion/tests/cmdline/update_tests.py
|
||||
@@ -1101,6 +1101,7 @@ def another_hudson_problem(sbox):
|
||||
|
||||
# Sigh, I can't get run_and_verify_update to work (but not because
|
||||
# of issue 919 as far as I can tell)
|
||||
+ expected_output = svntest.verify.UnorderedOutput(expected_output)
|
||||
svntest.actions.run_and_verify_svn(None,
|
||||
['D '+G_path+'\n',
|
||||
'Updated to revision 3.\n',
|
||||
@@ -2849,19 +2850,17 @@ def mergeinfo_update_elision(sbox):
|
||||
lambda_path = os.path.join(wc_dir, "A", "B", "lambda")
|
||||
|
||||
# Make a branch A/B_COPY
|
||||
- svntest.actions.run_and_verify_svn(
|
||||
- None,
|
||||
- ["A " + os.path.join(wc_dir, "A", "B_COPY", "lambda") + "\n",
|
||||
+ expected_stdout = verify.UnorderedOutput([
|
||||
+ "A " + os.path.join(wc_dir, "A", "B_COPY", "lambda") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY", "E") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY", "E", "alpha") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY", "E", "beta") + "\n",
|
||||
"A " + os.path.join(wc_dir, "A", "B_COPY", "F") + "\n",
|
||||
"Checked out revision 1.\n",
|
||||
- "A " + B_COPY_path + "\n"],
|
||||
- [],
|
||||
- 'copy',
|
||||
- sbox.repo_url + "/A/B",
|
||||
- B_COPY_path)
|
||||
+ "A " + B_COPY_path + "\n",
|
||||
+ ])
|
||||
+ svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
|
||||
+ sbox.repo_url + "/A/B", B_COPY_path)
|
||||
|
||||
expected_output = wc.State(wc_dir, {'A/B_COPY' : Item(verb='Adding')})
|
||||
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
|
||||
|
|
@ -3,24 +3,23 @@ The first half of this is certainly upstream-worthy, but the second half is pres
|
|||
some Fedora-specific KDE packaging thing. It's not obvious how to get
|
||||
kde4-config to report the directory which contains the .so files.
|
||||
|
||||
--- subversion-1.7.0/build/ac-macros/kwallet.m4.kwallet 2010-11-01 19:29:16.000000000 +0000
|
||||
+++ subversion-1.7.0/build/ac-macros/kwallet.m4 2011-10-12 09:32:55.129561537 +0100
|
||||
@@ -64,15 +64,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
|
||||
--- subversion-1.6.6/build/ac-macros/kwallet.m4.kwallet
|
||||
+++ subversion-1.6.6/build/ac-macros/kwallet.m4
|
||||
@@ -47,14 +47,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
|
||||
fi
|
||||
done
|
||||
qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
|
||||
- kde_dir="`$KDE4_CONFIG --prefix`"
|
||||
- kde_dir="`$kde4_config --prefix`"
|
||||
- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
|
||||
+ kde_include_dirs="-I`$KDE4_CONFIG --path include`"
|
||||
+ kde_include_dirs="-I`$kde4_config --path include`"
|
||||
+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs"
|
||||
qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
|
||||
SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
|
||||
CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
|
||||
LIBS="$LIBS $SVN_KWALLET_LIBS"
|
||||
qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
|
||||
- kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
|
||||
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
|
||||
+ LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs)` -L$libdir/kde4/devel"
|
||||
- LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
|
||||
+ LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$libdir/kde4/devel"
|
||||
AC_LANG(C++)
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||
AC_LINK_IFELSE([
|
||||
#include <kwallet.h>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
|
||||
Possible fix/workaround for dubious pointer derefs in #810861.
|
||||
|
||||
--- subversion-1.7.4/subversion/libsvn_auth_kwallet/kwallet.cpp.kwallet
|
||||
+++ subversion-1.7.4/subversion/libsvn_auth_kwallet/kwallet.cpp
|
||||
@@ -175,6 +175,10 @@ kwallet_terminate(void *data)
|
||||
"kwallet-initialized",
|
||||
APR_HASH_KEY_STRING,
|
||||
NULL);
|
||||
+ apr_hash_set(parameters,
|
||||
+ "kwallet-wallet",
|
||||
+ APR_HASH_KEY_STRING,
|
||||
+ NULL);
|
||||
}
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ LoadModule authz_svn_module modules/mod_authz_svn.so
|
|||
#
|
||||
# # cd /var/www/svn
|
||||
# # svnadmin create stuff
|
||||
# # chown -R apache:apache stuff
|
||||
# # chown -R apache.apache stuff
|
||||
# # chcon -R -t httpd_sys_content_t stuff
|
||||
#
|
||||
|
||||
|
|
|
|||
139
subversion.spec
139
subversion.spec
|
|
@ -2,7 +2,6 @@
|
|||
%define make_check 1
|
||||
|
||||
%define with_java 1
|
||||
%define with_kwallet 0
|
||||
|
||||
# set JDK path to build javahl; default for JPackage
|
||||
%define jdk_path /usr/lib/jvm/java
|
||||
|
|
@ -13,11 +12,13 @@
|
|||
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
%global svn2cl_version 0.11
|
||||
|
||||
Summary: A Modern Concurrent Version Control System
|
||||
Name: subversion
|
||||
Version: 1.7.1
|
||||
Version: 1.6.18
|
||||
Release: 1%{?dist}
|
||||
License: ASL 2.0
|
||||
License: ASL 1.1
|
||||
Group: Development/Tools
|
||||
URL: http://subversion.apache.org/
|
||||
Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
|
||||
|
|
@ -26,14 +27,22 @@ Source3: filter-requires.sh
|
|||
Source4: http://www.xsteve.at/prg/emacs/psvn.el
|
||||
Source5: psvn-init.el
|
||||
Source6: svnserve.init
|
||||
Patch1: subversion-1.7.0-rpath.patch
|
||||
Patch2: subversion-1.7.0-pie.patch
|
||||
Patch3: subversion-1.7.0-kwallet.patch
|
||||
# http://bugs.debian.org/546990
|
||||
Patch0: subversion-1.6.5-newlines.patch
|
||||
Patch2: subversion-1.6.0-deplibs.patch
|
||||
Patch3: subversion-1.6.1-rpath.patch
|
||||
Patch6: subversion-1.6.11-pie.patch
|
||||
Patch8: subversion-1.6.6-kwallet.patch
|
||||
Patch9: subversion-1.6.12-disable-client-test.patch
|
||||
Patch10: subversion-MakeMaker.patch
|
||||
Patch11: subversion-1.7.4-kwallet2.patch
|
||||
Patch12: subversion-1.6.18-hashorder.patch
|
||||
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
||||
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
|
||||
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
||||
BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
|
||||
BuildRequires: sqlite-devel >= 3.4.0, file-devel
|
||||
BuildRequires: sqlite-devel >= 3.4.0
|
||||
BuildRequires: gnome-keyring-devel, dbus-devel, kdelibs-devel >= 4.0.0
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Provides: svn = %{version}-%{release}
|
||||
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -57,7 +66,7 @@ compelling replacement for CVS.
|
|||
Group: Development/Tools
|
||||
Summary: Libraries for Subversion Version Control system
|
||||
# APR 1.3.x interfaces are required
|
||||
Conflicts: apr%{?_isa} < 1.3.0
|
||||
Conflicts: apr%{?_isa}< 1.3.0
|
||||
|
||||
%description libs
|
||||
The subversion-libs package includes the essential shared libraries
|
||||
|
|
@ -85,23 +94,19 @@ for developers interacting with the subversion package.
|
|||
Group: Development/Tools
|
||||
Summary: GNOME Keyring support for Subversion
|
||||
Requires: subversion%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: gnome-keyring-devel, dbus-devel
|
||||
|
||||
%description gnome
|
||||
The subversion-gnome package adds support for storing Subversion
|
||||
passwords in the GNOME Keyring.
|
||||
|
||||
%if %{with_kwallet}
|
||||
%package kde
|
||||
Group: Development/Tools
|
||||
Summary: KDE Wallet support for Subversion
|
||||
Requires: subversion%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: kdelibs-devel >= 4.0.0
|
||||
|
||||
%description kde
|
||||
The subversion-kde package adds support for storing Subversion
|
||||
passwords in the KDE Wallet.
|
||||
%endif
|
||||
|
||||
%package -n mod_dav_svn
|
||||
Group: System Environment/Daemons
|
||||
|
|
@ -151,11 +156,46 @@ Requires: ruby(abi) = 1.8
|
|||
%description ruby
|
||||
This package includes the Ruby bindings to the Subversion libraries.
|
||||
|
||||
%package svn2cl
|
||||
Group: Development/Tools
|
||||
Summary: Create a ChangeLog from a Subversion log
|
||||
License: BSD
|
||||
# -5: fake release for the Obsoletes to work
|
||||
Provides: svn2cl = %{svn2cl_version}-5
|
||||
Obsoletes: svn2cl < 0.11-4
|
||||
BuildArch: noarch
|
||||
Requires: libxslt
|
||||
Requires: subversion = %{version}
|
||||
|
||||
%description svn2cl
|
||||
svn2cl is a simple XSL transformation and shell script wrapper for
|
||||
generating a classic GNU-style ChangeLog from a subversion repository
|
||||
log. It is made from several changelog-like scripts using common XSLT
|
||||
constructs found in different places.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .rpath
|
||||
%patch2 -p1 -b .pie
|
||||
%patch3 -p1 -b .kwallet
|
||||
cd contrib/client-side/svn2cl
|
||||
%patch0 -p1 -b .newlines
|
||||
cd ../../..
|
||||
%patch2 -p1 -b .deplibs
|
||||
%patch3 -p1 -b .rpath
|
||||
%patch6 -p1 -b .pie
|
||||
%patch8 -p1 -b .kwallet
|
||||
%patch9 -p1 -b .disable-client-test
|
||||
%patch10 -p1 -b .eemm
|
||||
%patch11 -p1 -b .kwallet2
|
||||
%patch12 -p1 -b .hashorder
|
||||
|
||||
sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
|
||||
contrib/client-side/svn2cl/svn2cl.sh
|
||||
# Sanity check svn2cl_version
|
||||
v=$(contrib/client-side/svn2cl/svn2cl.sh -V | sed -n '1{s/.* //;p;}')
|
||||
if [ "$v" != "%{svn2cl_version}" ]; then
|
||||
echo -n "ERROR: svn2cl_version not up to date in specfile: "
|
||||
echo "'$v' <> '%{svn2cl_version}'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mv tools/client-side/bash_completion .
|
||||
|
||||
|
|
@ -191,17 +231,15 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
|
|||
--enable-javahl \
|
||||
--with-junit=%{_prefix}/share/java/junit.jar \
|
||||
%endif
|
||||
%if %{with_kwallet}
|
||||
--with-kwallet \
|
||||
%endif
|
||||
--with-berkeley-db || (cat config.log; exit 1)
|
||||
make %{?_smp_mflags} all
|
||||
make swig-py swig-py-lib %{swigdirs}
|
||||
make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
||||
%if %{with_java}
|
||||
# javahl-javah does not parallel-make with javahl
|
||||
#make javahl-java javahl-javah
|
||||
make javahl
|
||||
make javahl-java javahl-javah
|
||||
make %{?_smp_mflags} javahl
|
||||
%endif
|
||||
|
||||
%install
|
||||
|
|
@ -223,7 +261,7 @@ install -m 644 $RPM_SOURCE_DIR/subversion.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/h
|
|||
# Install SysV init script
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
||||
install -p -m 755 $RPM_SOURCE_DIR/svnserve.init \
|
||||
$RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
|
||||
$RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
|
||||
|
||||
# Remove unpackaged files
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
|
||||
|
|
@ -273,6 +311,14 @@ sed -i "/^dependency_libs/{
|
|||
s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
|
||||
}" $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
|
||||
# Install svn2cl
|
||||
pushd contrib/client-side/svn2cl
|
||||
install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/svn2cl
|
||||
install -pm 644 *.xsl $RPM_BUILD_ROOT%{_datadir}/svn2cl
|
||||
install -Dpm 644 svn2cl.1 $RPM_BUILD_ROOT%{_mandir}/man1/svn2cl.1
|
||||
popd
|
||||
|
||||
# Install bash completion
|
||||
install -Dpm 644 bash_completion \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
|
||||
|
|
@ -285,11 +331,8 @@ export LANG=C LC_ALL=C
|
|||
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
|
||||
export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
|
||||
export LIBC_FATAL_STDERR_=1
|
||||
if ! make check check-swig-pl check-swig-py CLEANUP=yes; then
|
||||
: Test suite failure.
|
||||
cat fails.log
|
||||
exit 1
|
||||
fi
|
||||
# Failures due to APR hash order fixes.
|
||||
make check check-swig-pl check-swig-py CLEANUP=yes || true
|
||||
# check-swig-rb omitted: it runs svnserve
|
||||
%if %{with_java}
|
||||
make check-javahl
|
||||
|
|
@ -305,8 +348,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/service svnserve stop > /dev/null 2>&1
|
||||
/sbin/chkconfig --del svnserve
|
||||
/sbin/service svnserve stop > /dev/null 2>&1
|
||||
/sbin/chkconfig --del svnserve
|
||||
fi
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
|
@ -329,10 +372,15 @@ fi
|
|||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%doc BUGS COMMITTERS LICENSE NOTICE INSTALL README CHANGES
|
||||
%doc tools mod_authz_svn-INSTALL
|
||||
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
||||
%doc tools subversion/LICENSE mod_authz_svn-INSTALL
|
||||
%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README}
|
||||
%doc contrib/client-side/svnmerge/*.{README,py}
|
||||
%doc contrib/client-side/wcgrep
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/svn2cl
|
||||
%{_mandir}/man*/*
|
||||
%exclude %{_mandir}/man1/svn2cl.1*
|
||||
%{_sysconfdir}/rc.d/init.d/svnserve
|
||||
%{_datadir}/emacs/site-lisp/*.el
|
||||
%{_datadir}/xemacs/site-packages/lisp/*.el
|
||||
|
|
@ -342,13 +390,11 @@ fi
|
|||
|
||||
%files libs
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE NOTICE
|
||||
%doc subversion/LICENSE
|
||||
%{_libdir}/libsvn_*.so.*
|
||||
%exclude %{_libdir}/libsvn_swig_perl*
|
||||
%exclude %{_libdir}/libsvn_swig_ruby*
|
||||
%if %{with_kwallet}
|
||||
%exclude %{_libdir}/libsvn_auth_kwallet*
|
||||
%endif
|
||||
%exclude %{_libdir}/libsvn_auth_gnome*
|
||||
|
||||
%files python
|
||||
|
|
@ -360,11 +406,9 @@ fi
|
|||
%defattr(-,root,root)
|
||||
%{_libdir}/libsvn_auth_gnome_keyring-*.so.*
|
||||
|
||||
%if %{with_kwallet}
|
||||
%files kde
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libsvn_auth_kwallet-*.so.*
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
|
@ -401,22 +445,19 @@ fi
|
|||
%{_javadir}/svn-javahl.jar
|
||||
%endif
|
||||
|
||||
%files svn2cl
|
||||
%defattr(-,root,root,-)
|
||||
%doc contrib/client-side/svn2cl/NEWS contrib/client-side/svn2cl/README
|
||||
%doc contrib/client-side/svn2cl/TODO contrib/client-side/svn2cl/authors.xml
|
||||
%doc contrib/client-side/svn2cl/svn2html.css
|
||||
%{_bindir}/svn2cl
|
||||
%{_datadir}/svn2cl/
|
||||
%{_mandir}/man1/svn2cl.1*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 28 2011 Joe Orton <jorton@redhat.com> - 1.7.1-1
|
||||
- update to 1.7.1
|
||||
- (temporarily) disable failing kwallet support
|
||||
|
||||
* Sun Nov 27 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-3
|
||||
- Build with libmagic support.
|
||||
|
||||
* Sat Oct 15 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-2
|
||||
- Fix apr Conflicts syntax in -libs.
|
||||
- Fix obsolete chown syntax in subversion.conf.
|
||||
- Fix use of spaces vs tabs in specfile.
|
||||
|
||||
* Wed Oct 12 2011 Joe Orton <jorton@redhat.com> - 1.7.0-1
|
||||
- update to 1.7.0
|
||||
- drop svn2cl (no longer shipped in upstream tarball)
|
||||
* Mon Apr 30 2012 Joe Orton <jorton@redhat.com> - 1.6.18-1
|
||||
- update to 1.6.18
|
||||
- possible fix/workaround for #810861
|
||||
|
||||
* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.6.17-5
|
||||
- Perl mass rebuild
|
||||
|
|
|
|||
Loading…
Reference in New Issue