subversion

Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1374029 is being indexed.

On the 'master-passphrase' branch:

* subversion/libsvn_subr/cmdline.c

(get_master_passphrase_auth_baton): Retry the master passphrase

prompt twice now (for a total of three attempts).

When committing unversioned files or directories, add them after asking the

user. Doing so helps in the common situation when the user has forgotten to

add files before marking files for a commit and does not want to start all

over.

* contrib/client-side/emacs/dsvn.el

(svn-add-unversioned-files-p): New function.

(svn-commit): Gather unversioned files and, if any, add them after asking.

(svn-actions): Rewrite, to allow actual use of the predicate.

Fix thinko in uname-based canonical host generation.

* subversion/libsvn-subr/sysinfo.c (canonical_host_from_uname):

Use strspn, not strcspn.

Be a bit more careful about which additional libraries we link with when

building with amalgamated SQLite.

* build/ac-macros/sqlite.m4 (_SVN_SQLITE_DSO_LIBS): New. Check which additionsl

libraries we have to link in order to support DSO loading.

(SVN_SQLITE_FILE_CONFIG): Use the result of _SVN_SQLITE_DSO_LIBS instead

of always linking with -ldl, which fails (at least) on FreeBSD.

* site/publish/roadmap.html

(Upcoming Release): Update feature release plan.

* site/publish/roadmap.html

Trade specific list of ra_serf issues for a query link to all

outstanding ra_serf and ra_neon issues. We use milestones to govern

what is and isn't a release blocker.

* subversion/libsvn_subr/sysinfo.c: Add docstrings.

Make the canonical host triplet look more like config.guess' output.

Construct release name from uname(3) info if no other mechanism is available.

* subversion/libsvn_subr/sysinfo.c (release_name_from_uname): New.

(svn_sysinfo__release_name) [HAVE_UNAME]: Call it.

(svn_sysinfo__canonical_host): Reorder #ifdefs.

(canonical_host_from_uname): On Linux, append "-gnu" instead of the

kernel version. Elsewhere, strip anything that doesn't look like a

version number from the kernel release name.

Sync compresed-pristines branch with trunk at r1373279.
    • ?
    /branches/compressed-pristines/aclocal.m4
  1. … 485 more files in changeset.
Make a pass at updating roadmap.html.

* site/publish/roadmap.html

(Upcoming Releases): Remove 1.7-related stuff, and throw out a

strawman 1.8 proposal.

(Our "Most Wanted" Features): Minor tweaks as regards scheduling.

(Next Release Status): Take a stab at updating this table.

Link to 1.7.6 release email.

* publish/news.html: Link.

* publish/index.html: Link.

Update website in preparation for 1.7.6.

* publish/download/download.html: Update version and checksums.

* publish/news.html: Add new item.

* publish/index.html: Add new item, remove old item.

* publish/docs/release-notes/release-history.html: Add new item.

On the inheritable-props branch: Sync with ^/subversion/trunk through

r1373083.

On the inheritable-props branch: Don't continue to cache iprops for switched

nodes when they are unswitched.

* subversion/libsvn_client/switch.c

(switch_internal): If a switch is "unswitching" a previously switched node,

then don't keep caching inherited properties as if the node is a WC root.

* subversion/libsvn_wc/wc_db.c

(db_op_set_rev_repos_relpath_iprops): Support clearing as well as setting

the iprops cache.

On the inheritable-props branch: Fix serf implementation of

svn_ra_get_inherited_props which broke after a recent sync with trunk.

* subversion/libsvn_ra_serf/inherited_props.c

(svn_ra_serf__get_inherited_props): Correct comment which referred to the

wrong report. Follow the lead of r1334446 or r1336471.

* subversion/tests/cmdline/merge_tests.py

(merge_old_and_new_revs_from_renamed_dir): Expand a comment.

* subversion/libsvn_client/merge.c

(do_file_merge): Update an outdated comment.

* subversion/libsvn_client/merge.c

Update some comments for clarity, to reflect the fact that the

'merge_source_t' structure has 'loc1' and 'loc2' sub-structures.

When temporarily reparenting an RA session in libsvn_client, make sure we

restore the session URL even if the intervening code throws an error.

This patch doesn't fix every instance of the bug: notably, it doesn't fix

the reparenting of the two RA sessions in drive_merge_report_editor().

However, at present there is no code that recovers from an error thrown by

that function, so that does not matter.

I was not aware of any symptoms caused by this bug, until I tried an

experimental code rearrangement in merge.c (moving the call of

remove_noop_subtree_ranges() after fix_deleted_subtree_ranges()) which

triggered one of the session-URL assertions that I added recently.

* subversion/libsvn_client/merge.c

(single_file_merge_get_file, do_file_merge, find_unsynced_ranges): As above.

* subversion/libsvn_client/ra.c

(svn_client__repos_location_segments, svn_client__repos_location): As above.

Add --ssl-cert option to win-tests.py, to enable testing over https.

* win-tests.py

(): Add --ssl-cert option and pass its result to run_tests.TestHarness.

* subversion/libsvn_auth_kwallet/kwallet.cpp

(kwallet_master_passphrase_first_creds,

kwallet_master_passphrase_save_creds): Use C++ style cast.

Fix C++ compile errors.

* subversion/libsvn_auth_kwallet/kwallet.cpp

(): Include svn_base64.h.

(kwallet_master_passphrase_first_creds,

kwallet_master_passphrase_save_creds): Cast from void *.

On the 'master-passphrase' branch: also add KDE wallet master

passphrase provider when platform-specific providers are requested.

* subversion/libsvn_subr/masterpass_providers.c

(svn_auth_get_platform_specific_master_passphrase_providers): Enable

kwallet master passphrase provider addition logic.

On the 'master-passphrase' branch: implement the KDE Wallet master

passphrase provider.

Disclaimer: I'm not setup to compile against KDE, so ... this may be

completely broken.

* subversion/include/svn_auth.h

(svn_auth_get_kwallet_master_passphrase_provider): New function.

* subversion/libsvn_auth_kwallet/kwallet.cpp

(kwallet_master_passphrase_first_creds,

kwallet_master_passphrase_save_creds,

svn_auth_get_kwallet_master_passphrase_provider): New functions.

(kwallet_master_passphrase_provider): New static structure instance.

Update branch for r1242759 group.
On the '1.7.x-r1242759' branch: merge from trunk r1242759, r1242770, and

r1242794, resolving the conflict caused by gpg_agent.c not existing in

the 1.7.x history.

Create backport branch for r1242759 and friends.
Propose r1242759 and friends for backport to 1.7.x.
Avoid warnings about testing an undefined macro 'SVN_HAVE_MACOS_PLIST'.

A follow-up to r1371942.

* subversion/libsvn_subr/sysinfo.c

Everywhere, use '#ifdef' or 'defined()' with 'SVN_HAVE_MACOS_PLIST'.

The embedded, self-signed, SSL certificate in davautocheck.sh had

expired causing the SSL tests to fail.

* subversion/tests/cmdline/davautocheck.sh: Replace the SSL certificate.