subversion

Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1824080 is being indexed.

Give correct error message on failure to import Subversion Python bindings.

* tools/hook-scripts/mailer/mailer.py: If the Subversion Python bindings

could not be found for import at all, have the error message state

that clearly, instead of duplicating the error message used for

importing too old a version of the bindings.

Reviewed by: cmpilato

Kenneth Porter

Thread: https://mail-archives.apache.org/mod_mbox/subversion-dev/201802.mbox/%3C874lmlly1l.fsf%40red-bean.com%3E

From: Karl Fogel

To: dev@

Subject: [PATCH] Better error message for svn bindings import in mailer.py.

Date: Mon, 12 Feb 2018 15:04:38 -0600

Message-ID: <874lmlly1l.fsf@red-bean.com>

Allow testsuite setting such as FSFS_SHARDING=3 to apply to FSX repositories.

* subversion/tests/cmdline/svntest/main.py

(_post_create_repos): Allow FSFS settings to apply to FSX.

* subversion/tests/cmdline/svnadmin_tests.py

(fsfs_file): Handle FSX repositories.

(verify_denormalized_names): Don't special case FSX repositories.

* STATUS: Vote +1 on the r1822587 group.
* STATUS: Nominate r1823211.

* STATUS: Nominate r1822587, r1822591.

* STATUS: Nominate r1823791.

* STATUS: Nominate r1824033.
On 1.10.x branch: Update copyright year by merging from trunk.

* NOTICE,

subversion/libsvn_subr/version.c: catch up with trunk@1824012.

Update our copies of APR utility files to those in our recommended APR version.
* CHANGES: catch up with trunk@1824012.
backport.py: Fix a bug in parsing logsummaries that start with a word followed

by a colon, which looks like a header. See r1824001 for an example.

backport.pl already DTRTs in that case (it passes the new test).

* tools/dist/backport/status.py

(StatusEntry._parse): Consider the first line a logsummary regardless of

what it looks like.

* tools/dist/backport_tests.py

(backport_logsummary_colon): New test.

* tools/dist/backport_tests_data/backport_logsummary_colon.dump:

New expected test output.

Bump SWIG version from 3.0.10 to 3.0.12 for our 1.10 and trunk.

This commit updates the checksum to match.

Update the 1.10.0 expected release year.
Merge r1823966 from trunk, with --accept=working:

* r1823966

Shelving: fix unsafe 'system' calls.

Justification:

Avoids potential command-line-quoting-safety issues.

Notes:

--accept=working

Votes:

+1: julianfoad, danielsh, stsp

Merge r1823989 from trunk:

* r1823989

Correct the generated fsfs.conf file's statement of the default value of

verify-before-commit. It is keyed not on --enable-debug but on

--enable-maintainer-mode (on Windows there is no distinction between the

two).

Justification:

Don't mislead users into wrongly believing verification is enabled.

Votes:

+1: danielsh, stsp

Bump SWIG version from 3.0.10 to 3.0.12 for our 1.10 and trunk.
* tools/dist/backport/status.py

(StatusFile._parse): Print the caught exception.

STATUS: Vote for r1823966 (approving) and 1823989 (just piling on top).

* STATUS: Approve r1823989 (docs change) and move r1823966 to the correct

section (thanks, Julian).

* STATUS: Nominate r1823989.
* subversion/libsvn_fs_fs/fs_fs.c

(write_config): Correct the generated fsfs.conf file's statement of the

default value of verify-before-commit. It is keyed not on --enable-debug

but on --enable-maintainer-mode (on Windows there is no distinction between

the two).

* STATUS: Unapprove r1823966, as it doesn't yet have the (currently) required

number of votes.

* STATUS: Vote +1 on r1823966, approving.
* tools/dist/README.backport: Add a TODO to document a feature that both

.pl and .py have.

* STATUS: Make the conflict resolution instructions for r1823966 machine-readable.
* STATUS: Add conflict resolution instructions for r1823966.
* STATUS: Nominate r1823966.
Shelving: fix unsafe 'system' calls.

Found by: danielsh

* subversion/svn/shelf-cmd.c,

subversion/svn/shelve-cmd.c

(run_cmd): New, using svn_io_run_cmd() .

(show_diffstat, shelves_list): Use that instead of system("...").

Revert r1823787. For an unknown reason it caused segfaults and

bus errors in httpd worker processes on the svn-bb-openbsd bot.

* tools/dev/buildbot/bb-openbsd/svnbuild.sh: The buildbot framework checks out

a working copy for us to build and test. Prevent Makefile.svn from updating

the working copy again to ensure we're testing what we were asked to test.