subversion

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

Changeset 1151260 is being indexed.

Rename the new_revert_* functions to just revert_*. It is confusing

to have functions called new_something when the old implementation

is already obsolete (as of r1088811).

* subversion/libsvn_wc/adm_ops.c

(new_revert_internal, new_revert_changelist,

new_revert_partial): Rename to ...

(revert_internal, revert_changelist, revert_partial): ... these, respectively.

(svn_wc_revert4): Update caller.

release.py: Move the signature checking capability into release.py. This

will be revamped shortly.

* tools/dist/release.py

(grab_sig_ids, generate_output, check_sigs): New.

(main): Add a parser for the check-sigs target.

* tools/dist/getsigs.py:

Remove.

* sigh *

Revert r1151244.

(One of the defaults used the value of another param, which causes problems.)

release.py: Add a couple of defaults in the parser, rather than a

subcommand handler.

* tools/dist/release.py

(post_candidates): Use the provided args directly.

(main): Provide default values for a couple of arguments here.

[ reverted in r1151247 ]

* tools/dist/collect_sigs.py

(save_valid_sig): Due to security concerns on the target box, don't

attempt to autocopy the signatures as they are collected.

* STATUS: Cast vote.

* STATUS: Nominate r1151177.

Fix two bugs in ra_serf when connecting to HTTPS repository hosted on

non-standard port.

1. ra_serf complains that server certificate doesn't match hostname.

2. XML parsing failed: (400 Bad Request) error when working with SNI

enabled server.

http://svn.haxx.se/users/archive-2011-07/0404.shtml

* subversion/libsvn_ra_serf/ra_serf.h

(svn_ra_serf__connection_t): Rename HOSTINFO to HOSTNAME.

* subversion/libsvn_ra_serf/serf.c

(svn_ra_serf__open): Store hostname in connection object, not hostinfo.

* subversion/libsvn_ra_serf/update.c

(open_connection_if_needed): Update to reflect rename.

* subversion/libsvn_ra_serf/util.c

(ssl_server_cert): Use hostname for validating SSL certificate.

(conn_setup): Pass hostname to serf_ssl_set_hostname().

* STATUS: Add a note to the r1150302 group.

Record moved-to information at the delete-half of a move.

* subversion/include/private/svn_wc_private.h

(svn_wc__delete_internal): Declare.

* subversion/libsvn_wc/adm_ops.c

(svn_wc__delete_internal): New. This is like svn_wc_delete4() but has

one additional parameter MOVED_TO_ABSPATH. If not NULL, this indicates

that the delete is the delete-half of a move.

(svn_wc_delete4): Reimplement as a wrapper around svn_wc__delete_internal().

* subversion/libsvn_wc/wc-queries.sql

(STMT_INSERT_DELETE_FROM_NODE_RECURSIVE): Adjust to only insert children

of the node being deleted.

(STMT_INSERT_DELETE_NODE): New. This statement deletes a single node,

and allows populating the moved_to column in NODES.

* subversion/libsvn_wc/copy.c

(svn_wc_move): Call svn_wc__delete_internal() with a MOVED_TO_ABSPATH

instead of calling svn_wc_delete4().

* subversion/libsvn_wc/wc_db.c

(op_delete_baton_t): Add new field MOVED_TO_RELPATH.

(op_delete_txn): Use STMT_INSERT_DELETE_NODE to delete LOCAL_ABSPATH

itself, and possibly mark LOCAL_ABSPATH has having been moved elsewhere.

Use STMT_INSERT_DELETE_FROM_NODE_RECURSIVE to delete children of

LOCAL_ABSPATH (before, this statement was also used to delete LOCAL_ABSPATH

itself).

(svn_wc__db_op_delete): New parameter MOVED_TO_ABSPATH. Convert this to

a relpath and put that into the op_delete baton.

(scan_deletion_txn): Update a comment that referred to the BASE_NODE table.

This is now called NODES_BASE in the query this code is evaluating.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_op_delete): Add MOVED_TO_ABSPATH parameter and update docstring.

* subversion/tests/libsvn_wc/op-depth-test.c,

subversion/libsvn_wc/update_editor.c

(do_delete, add_directory): Adjust calls to svn_wc__db_op_delete().

Merge r1147882, r1149343, r1149371, r1149372, r1149377, r1149398, r1149701,

r1149713 from trunk:

* r1147882, r1149343, r1149371, r1149372, r1149377, r1149398, r1149701, r1149713

Validate consumer-supplied tokens in libsvn_fs. (This specifically applies

to the output of pre-lock hook scripts.)

Justification:

Input validations are good; arbitrary lock tokens are bad, and can result

in user-visible errors.

Notes:

r1147882 is reverted by r1149343.

r1149343 reverts r1147882 and adds new code, which r1149371 rewrites.

r1149371 is the change.

r1149372 improves an error message.

r1149377 is a typo fix.

r1149398 fixes the bindings.

r1149701 marks the test XFail for serf

r1149713 correctly reports lock warnings and removes the XFail

Votes:

+1: danielsh, cmpilato, rhuijben

    • ?
    /branches/1.7.x/subversion/include/svn_error.h
Shorten a long line. Yawn.
Vote for the r1150302, approving.
Vote for the r1147882 group, and clarify Bert's vote (per IRC).
* site/publish/packages.html

Add a reverse link to the Download Source Code page.

* subversion/libsvn_subr/gpg_agent.c

(password_set_gpg_agent): Fix typo in comment.

(simple_gpg_agent_first_creds): Add docstring.

simple_gpg_agent_save_creds): Change docstring. The old docstring

was wrong because this provider does not encrypt anything.

* subversion/libsvn_subr/gpg_agent.c: Add a comment that explains how this

auth cache provider operates, including security considerations.

* subversion/libsvn_subr/cmdline.c

(svn_cmdline_create_auth_baton): Convert 'space-before-paren' formatting

to 'no-space-before-paren' as per our coding style guidelines.

* build/generator/gen_win.py

(get_win_libs, write_serf_project_file): Following up on r1148043 (and a fix

in serf) dynamically generate serf library names based on the serf version.

* subversion/libsvn_subr/auth.c,

subversion/libsvn_subr/gpg_agent.c: As per our coding style guidelines,

change "space-before-paren" formatting to "no-space-before-paren".

No functional change.

* subversion/libsvn_wc/info.c

(build_info_for_entry): Remove obsolete comment line. The code

pertaining to this was removed in r1132455.

Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

* STATUS: Vote for r1150812.

* STATUS: Propose issue 3972.
On the 1.6.x branch, merge r1151036 from trunk (obvious fix).

On the 1.7.x branch, merge r1151036 from trunk (obvious fix).

    • ?
    /branches/1.7.x/subversion/po/de.po
* subversion/po/de.po: Fix an error in the German translation of the help

text of 'svn export'. The text was implying that unversioned files

were exported under some condititions, which isn't a proper translation

of the original meaning (such files are never exported).

Found by: Ulrich Eckhardt

http://svn.haxx.se/users/archive-2011-07/0403.shtml

* docs/release-notes/1.7.html

(revprop-packing): Update a link.

New test for 'svnadmin lslocks' and 'svnadmin rmlocks'.

* subversion/tests/cmdline/svnadmin_tests.py

(test_lslocks_and_rmlocks): New test.

(test_list): Add new test.

Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

* subversion/tests/cmdline/info_tests.py

(info_show_exclude): Fix indentation and put the expected error string

into a variable instead of spelling it out twice. No functional change.

Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

* subversion/libsvn_subr/gpg_agent.c

(password_get_gpg_agent): While having the CLI prompt and GPG-Agent prompt

match up is kind of neat, we should try to minimise the risk of someone

entering a PGP passphrase into the GPG-Agent dialog.

So say "Enter your Subversion password for <realm>", instead of

"Authentication realm: <realm>". Hopefully that is clear enough to

prevent bad mistakes. Also, remove a comment that is now obsolete.

Suggested by: danielsh