subversion

Checkout Tools
  • last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Sync from the multi-wc-format up to r1845487.
  1. … 26 more files in changeset.
On the better-pristines branch: Add format-32 schema upgrade.

* subversion/libsvn_wc/wc-metadata.sql:

Add the PRISTINE.contents column for format 32.

On the better-pristines branch: Sync with multi-wc-format branch up to r1843080.
* branches/better-pristines/BRANCH-README: Update branch documentation.

[On the better-pristines branch]

* subversion/libsvn_wc/wc_db_wcroot.c: Do not include private/svn_fspath.h.

(svn_wc__format_from_context): Find the format in context more carefully,

considering that there may be an exact match in the wcroot hash.

On the better-pristines branch: Guess the format of dependent working copies

(e.g., for externals) from the current working copy context.

* subversion/include/private/svn_wc_private.h

(svn_wc__format_from_context): New.

* subversion/libsvn_wc/wc_db_wcroot.c

(svn_wc__format_from_context): Implement.

* subversion/libsvn_wc/upgrade.c

(svn_wc__format_from_version): Do not allow a NULL version parameter.

* subversion/libsvn_client/client.h

(svn_client__checkout_internal): Update docstring.

* subversion/libsvn_client/upgrade.c

(svn_client_upgrade2): Use the current libsvn_client version if the

working copy format version is not supplied.

* subversion/libsvn_client/checkout.c (svn_client_checkout4): Likewise.

(svn_client__checkout_internal) Use svn_wc__format_from_context to

determine the default working copy format.

* subversion/libsvn_client/copy.c (repos_to_wc_copy_single),

* subversion/libsvn_client/conflicts.c (merge_incoming_added_dir_replace),

* subversion/libsvn_client/externals.c (switch_dir_external):

Pass NULL for the default WC format to svn_client__checkout_internal.

On the better-pristines branch: Make the --compatible-veersion option actually

do something during 'svn checkout' and 'svn upgrade'.

* subversion/include/svn_wc.h (svn_wc_ensure_adm4): Deprecate.

* subversion/include/private/svn_wc_private.h

(svn_wc__ensure_adm): New, replaces svn_wc_ensure_adm4.

* subversion/libsvn_client/client.h

(svn_client__checkout_internal): Add parameter wc_format_version.

* subversion/libsvn_client/checkout.c

(initialize_area): Add parameter target_format.

(svn_client__checkout_internal): Add parameter wc_format_version,

created the new working copy with the desired format.

* subversion/libsvn_client/conflicts.c (merge_incoming_added_dir_replace),

* subversion/libsvn_client/copy.c (repos_to_wc_copy_single),

* subversion/libsvn_client/externals.c (switch_dir_external):

Add a note that the correct WC format has not been determined.

* subversion/libsvn_wc/wc.h

(svn_wc__internal_ensure_adm): Add parameter target_format.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_init): Add parameter target_format.

* subversion/libsvn_wc/adm_files.c: Include svn_version.h for SVN_VER_NUM.

(init_adm): Add parameter target_format and use it for svn_wc__db_init.

(svn_wc__internal_ensure_adm): Add parameter target_format.

Rename local variable 'format' to 'present_format'.

(svn_wc__ensure_adm): Renamed from svn_wc_ensure_adm4.

Add parameter target_format.

* subversion/libsvn_wc/upgrade.c

(svn_wc__upgrade): Use the target_format for upgrades.

* subversion/libsvn_wc/wc_db.c

(init_db): Add parameter target_format. Use it for the schema update.

(create_db): Add parameter target_format.

(svn_wc__db_init): Add parameter target_format.

(svn_wc__db_upgrade_begin): Add parameter target_format.

* subversion/libsvn_wc/deprecated.c

(svn_wc_ensure_adm4): Moved from adm_files.c and changed to wrapper

for svn_wc__ensure_adm, using SVN_WC__VERSION as the target_format.

On the better-pristines branch: Sync with trunk up to r1843002.
On the better-pristines branch: Update API version annotations. No functional change.
On the better-pristines branch: Sync with trunk up to r1842402.
  1. /branches/better-pristines/notes/shelving
  2. … 124 more files in changeset.
On the better-pristines branch: Sync with trunk up to r1829346.
    • ?
    /branches/better-pristines/subversion/po/de.po
  1. … 114 more files in changeset.
On the better-pristines branch: Sync with trunk up to r1826405.
  1. … 36 more files in changeset.
On the better-pristines branch: Sync with trunk up to r1825302.
  1. … 42 more files in changeset.
On the better-pristines branch: Sync with trunk up to r1823024.
    • ?
    /branches/better-pristines/tools/dev/unix-build/README
  1. … 53 more files in changeset.
On the better-pristines branch: Fix formatting.

* subversion/svn/help-cmd.c (svn_cl__help):

Keep code within 80 columns. No functional change.

On the better-pristines branch: Show supported WC versions in help output.

* subversion/svn/help-cmd.c (svn_cl__help):

Add a line to the 'svn --version' output that shows supported WC versions.

* subversion/tests/cmdline/getopt_tests.py

(warn_line_re): Anchor the regular expression at the beginning of the line.

(rep_lines_res): Canonicalize the supported WC versions line.

* subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout,

subversion/tests/cmdline/getopt_tests_data/svn--version_stdout:

Update expected output.

On the better-pristines branch: Update documentation.

* subversion/include/svn_client.h

(svn_client_supported_wc_version): Update docstring; no functional change.

On the better-pristines branch: Retreive WC format from version.

* subversion/libsvn_wc/upgrade.c (svn_wc__format_from_version): Implement.

On the better-pristines branch: Sync with trunk up to r1819915.
On the better-pristines branch: Update API version annotations.

With trunk becoming 1.11.0-dev, the annotations on changed APIs must

reflect that version bump.

* subversion/include/private/svn_wc_private.h

(svn_wc__format_from_version, svn_wc__upgrade): Update docstrings.

* subversion/include/svn_client.h

(svn_client_checkout4, svn_client_checkout3,

svn_client_upgrade2, svn_client_upgrade): Update docstrings.

* subversion/libsvn_wc/upgrade.c

(svn_wc__version_string_from_format): Format 32 belongs to 1.11, not 1.10.

On the better-pristines branch: Sync with trunk up to r1819868.
    • ?
    /branches/better-pristines/configure.ac
    • ?
    /branches/better-pristines/tools/dist/edit-N-log-messages
    • ?
    /branches/better-pristines/subversion/libsvn_fs_x/pack.c
  1. … 123 more files in changeset.
On the better-pristines branch: sync with trunk up to r1812890.
    • ?
    /branches/better-pristines/subversion/libsvn_repos/dump.c
  1. … 8 more files in changeset.
On the better-pristines branch: Sync with trunk up to r1809765.
On the better-pristines branch: Sync with trunk up to r1809146.
On the better-pristines branch: Pass the requested working copy

version from the client to the client library.

* subversion/svn/checkout-cmd.c

(svn_cl__checkout): Here.

* subversion/svn/upgrade-cmd.c

(svn_cl__upgrade): And here.

On the better-pristines branch: Add WC format parameter to svn_client_checkout.

Also tweak some docstrings and update all callers of the deprecated version.

* subversion/include/svn_client.h

(svn_client_checkout4): New; add option to set the format of the created WC.

(svn_client_checkout3): Deprecate.

(svn_client_upgrade2): Tweak docstring.

* subversion/libsvn_client/checkout.c

(svn_client_checkout4): Implement, based on svn_client_checkout3.

* subversion/libsvn_client/deprecated.c

(svn_client_checkout3): Move implementation here from checkout.c.

* (svn_client_upgrade): Add missing svn_error_trace() call.

* subversion/svn/checkout-cmd.c

(svn_cl__checkout): Call svn_client_checkout4().

* subversion/tests/libsvn_wc/utils.c

(create_repos_and_wc): Call svn_client_checkout4().

    • ?
    /branches/better-pristines/subversion/svn/checkout-cmd.c
On the better-pristines branch: Inject some sanity into the new

svn_client_upgrade2() funcction. To whit, use our existing svn_version_t

struct as the target WC version parameter instead of a string.

* subversion/include/svn_client.h

(svn_client_upgrade2): Change type of wc_format_version to svn_version_t*.

(svn_client_supported_wc_version): Return svn_version_t* instead of a string.

* subversion/libsvn_client/upgrade.c: Include svn_version.h.

(svn_client_upgrade2): Update implementation.

(svn_client_supported_wc_version): Likewise.

* subversion/include/private/svn_wc_private.h

(svn_wc__format_from_version): Renamed from svn_wc__format_from_version_string

and takes a svn_version_t* parameter instead of a string.

* subversion/libsvn_wc/upgrade.c

(svn_wc__format_from_version): Update implementation.

* subversion/svn/svn.c

(parse_compatible_version): Update implementation.

On the better-pristines branch: Add the --compatible-version option to

the checkout and upgrade commands. The parsed result is not used yet.

* subversion/svn/cl.h

(svn_cl__opt_state_t): Add member compatible_version.

* subversion/svn/svn.c

(svn_cl__longopt_t): Add enumeration opt_compatible_version.

(svn_cl__options): Define and describe --compatible-version.

(svn_cl__cmd_table): Add opt_compatible_version to checkout and upgrade.

(parse_compatible_version): New. Helper that parses --compatible-version.

(sub_main): Handle the --compatible-version option.

    • ?
    /branches/better-pristines/subversion/svn/cl.h
On the better-pristines branch: Sync with trunk up to r1807966.
On the better-pristines branch: Sync with trunk up to r1807956.

    • ?
    /branches/better-pristines/subversion/svnadmin/svnadmin.c
    • ?
    /branches/better-pristines/subversion/include/svn_repos.h
  1. … 16 more files in changeset.