Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fsfs, fsx: Make an error message clearer to developers.

* subversion/libsvn_fs_fs/low_level.c

(svn_fs_fs__parse_footer),

* subversion/libsvn_fs_x/low_level.c

(svn_fs_x__parse_footer):

Make the output radix explicit, so the values aren't mistaken for decimal.

(Actually, I wonder why the values aren't printed in decimal to begin with.)

  1. … 1 more file in changeset.
Don't ignore error returns.

c: [skip]

Found by: danielsh

using tools/dev/warn-unused-result.sh

  1. … 7 more files in changeset.
In FSX, begin adding chunked read support for changed paths list when reading

them from disk.

This patch simply allows us to limit the number of list entries read at once.

The callers, however, will not impose an actual limit ATM.

* subversion/libsvn_fs_x/low_level.h

(svn_fs_x__read_changes): Add the MAX_COUNT parameter.

* subversion/libsvn_fs_x/low_level.c

(svn_fs_x__read_changes): Never read more than MAX_COUNT elements from the

current stream locastion.

* subversion/libsvn_fs_x/cached_data.c

(block_read_changes): Update caller, still reading unlimited amounts of data.

* subversion/libsvn_fs_x/pack.c

(write_changes_containers): Same.

  1. … 3 more files in changeset.
In FSX, remove all code that reads and writes noderev IDs in changed

path lists.

* subversion/libsvn_fs_x/changes.c

(CHANGE_TXN_NODE): No longer needed.

(binary_change_t): Remove noderev ID element.

(append_change,

svn_fs_x__changes_get_list,

svn_fs_x__write_changes_container,

svn_fs_x__read_changes_container,

svn_fs_x__changes_get_list_func): Remove all noderev ID access for

containered changed paths lists.

* subversion/libsvn_fs_x/low_level.c

(read_change,

write_change_entry): No longer read and write noderev IDs when

reading / writing non-packed changes lists.

* subversion/libsvn_fs_x/transaction.c

(fold_change): The noderev ID is now meaningless here.

(svn_fs_x__add_change): Don't store the noderev ID anymore.

(write_final_rev): No longer update the noderev in changed paths lists.

(sanitize_changed_path_info): No longer neccessary.

(commit_body): Update caller.

  1. … 2 more files in changeset.
Minor internal API adjustment.

* subversion/libsvn_fs_x/low_level.h

(svn_fs_x__parse_properties): A 'const' string will do just fine.

* subversion/libsvn_fs_x/low_level.c

(svn_fs_x__parse_properties): Sync signature with declaration.

  1. … 1 more file in changeset.
In FSX, introduce a denser and easier to parse on-disk representation

for property lists. In a first step, use it for node properties.

* subversion/include/svn_error_codes.h

(SVN_ERR_FS_CORRUPT_PROPLIST): Define a new parser error code.

* subversion/libsvn_fs_x/low_level.h

(svn_fs_x__parse_properties,

svn_fs_x__write_properties): Declare new internal (de-)serialization APIs.

* subversion/libsvn_fs_x/low_level.c

(svn_fs_x__parse_properties,

svn_fs_x__write_properties): Implement them.

* subversion/libsvn_fs_x/cached_data.c

(svn_fs_x__get_proplist): Call the new APIs to parse the prop lists.

Use the SVN_ERR_W macro instead of local code

for decorating error objects.

* subversion/libsvn_fs_x/transaction.c

(svn_fs_x__set_proplist,

write_hash_to_stream): Write node properties in the new format.

  1. … 4 more files in changeset.
Merge the revision / pack file footer parser changes from FSFS to FSX and

resolve text conflicts.

This merges revisions r1680460, 1680464 and 1680476 from FSFS to FSX.

  1. … 3 more files in changeset.
Merge the fsx-1.10 development branch to trunk and remove the

BRANCH-README file. There were no conflicts.

Changes brings the latest FSX changes to /trunk.

  1. … 55 more files in changeset.
Apply the standard pre-branch whitespace cleanup via

tools/dev/remove-trailing-whitespace.zsh

There should be no functional changes.

* .ycm_extra_conf.py

* build/generator/gen_win.py

* build/generator/gen_win_dependencies.py

* subversion/bindings/javahl/native/EditorProxy.h

* subversion/bindings/javahl/native/StateReporter.cpp

* subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

* subversion/bindings/swig/ruby/test/test_fs.rb

* subversion/bindings/swig/ruby/test/util.rb

* subversion/bindings/swig/ruby/test/windows_util.rb

* subversion/include/private/svn_fs_fs_private.h

* subversion/include/private/svn_packed_data.h

* subversion/include/private/svn_repos_private.h

* subversion/include/private/svn_sorts_private.h

* subversion/include/private/svn_subr_private.h

* subversion/include/private/svn_wc_private.h

* subversion/include/svn_auth.h

* subversion/include/svn_cache_config.h

* subversion/include/svn_client.h

* subversion/include/svn_cmdline.h

* subversion/include/svn_diff.h

* subversion/include/svn_fs.h

* subversion/include/svn_io.h

* subversion/include/svn_ra.h

* subversion/include/svn_repos.h

* subversion/include/svn_string.h

* subversion/libsvn_client/blame.c

* subversion/libsvn_client/commit.c

* subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/copy.c

* subversion/libsvn_client/diff.c

* subversion/libsvn_client/externals.c

* subversion/libsvn_client/log.c

* subversion/libsvn_client/patch.c

* subversion/libsvn_client/ra.c

* subversion/libsvn_client/update.c

* subversion/libsvn_delta/svndiff.c

* subversion/libsvn_diff/parse-diff.c

* subversion/libsvn_fs/fs-loader.c

* subversion/libsvn_fs_base/lock.c

* subversion/libsvn_fs_fs/cached_data.c

* subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/hotcopy.c

* subversion/libsvn_fs_fs/id.c

* subversion/libsvn_fs_fs/index.c

* subversion/libsvn_fs_fs/index.h

* subversion/libsvn_fs_fs/lock.c

* subversion/libsvn_fs_fs/low_level.c

* subversion/libsvn_fs_fs/low_level.h

* subversion/libsvn_fs_fs/pack.c

* subversion/libsvn_fs_fs/recovery.c

* subversion/libsvn_fs_fs/rev_file.c

* subversion/libsvn_fs_fs/revprops.c

* subversion/libsvn_fs_fs/revprops.h

* subversion/libsvn_fs_fs/stats.c

* subversion/libsvn_fs_fs/transaction.c

* subversion/libsvn_fs_fs/tree.c

* subversion/libsvn_fs_fs/verify.c

* subversion/libsvn_fs_x/cached_data.c

* subversion/libsvn_fs_x/changes.c

* subversion/libsvn_fs_x/dag.h

* subversion/libsvn_fs_x/fs.h

* subversion/libsvn_fs_x/fs_id.c

* subversion/libsvn_fs_x/fs_x.c

* subversion/libsvn_fs_x/hotcopy.c

* subversion/libsvn_fs_x/hotcopy.h

* subversion/libsvn_fs_x/index.c

* subversion/libsvn_fs_x/index.h

* subversion/libsvn_fs_x/lock.c

* subversion/libsvn_fs_x/lock.h

* subversion/libsvn_fs_x/low_level.c

* subversion/libsvn_fs_x/low_level.h

* subversion/libsvn_fs_x/noderevs.c

* subversion/libsvn_fs_x/pack.c

* subversion/libsvn_fs_x/reps.c

* subversion/libsvn_fs_x/rev_file.c

* subversion/libsvn_fs_x/revprops.c

* subversion/libsvn_fs_x/revprops.h

* subversion/libsvn_fs_x/string_table.c

* subversion/libsvn_fs_x/string_table.h

* subversion/libsvn_fs_x/transaction.c

* subversion/libsvn_fs_x/tree.c

* subversion/libsvn_fs_x/util.c

* subversion/libsvn_fs_x/verify.c

* subversion/libsvn_ra_local/ra_plugin.c

* subversion/libsvn_ra_serf/ra_serf.h

* subversion/libsvn_ra_serf/serf.c

* subversion/libsvn_ra_serf/update.c

* subversion/libsvn_ra_serf/util.c

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/marshal.c

* subversion/libsvn_repos/authz_pool.c

* subversion/libsvn_repos/config_pool.c

* subversion/libsvn_repos/dump.c

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_repos/log.c

* subversion/libsvn_subr/bit_array.c

* subversion/libsvn_subr/cache-membuffer.c

* subversion/libsvn_subr/config.c

* subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/fnv1a.c

* subversion/libsvn_subr/gpg_agent.c

* subversion/libsvn_subr/hash.c

* subversion/libsvn_subr/io.c

* subversion/libsvn_subr/object_pool.c

* subversion/libsvn_subr/packed_data.c

* subversion/libsvn_subr/prefix_string.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_subr/sqlite.c

* subversion/libsvn_subr/subst.c

* subversion/libsvn_subr/sysinfo.c

* subversion/libsvn_subr/types.c

* subversion/libsvn_subr/utf.c

* subversion/libsvn_subr/utf8proc/utf8proc_data.c

* subversion/libsvn_subr/x509info.c

* subversion/libsvn_wc/diff.h

* subversion/libsvn_wc/props.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/wc.h

* subversion/libsvn_wc/wc_db.c

* subversion/libsvn_wc/wc_db.h

* subversion/mod_dav_svn/lock.c

* subversion/mod_dav_svn/mod_dav_svn.c

* subversion/mod_dav_svn/status.c

* subversion/svn/auth-cmd.c

* subversion/svn/info-cmd.c

* subversion/svn/mergeinfo-cmd.c

* subversion/svn/notify.c

* subversion/svn/propget-cmd.c

* subversion/svn/svn.c

* subversion/svnadmin/svnadmin.c

* subversion/svnserve/logger.c

* subversion/svnserve/serve.c

* subversion/svnserve/server.h

* subversion/svnserve/svnserve.c

* subversion/tests/cmdline/blame_tests.py

* subversion/tests/cmdline/checkout_tests.py

* subversion/tests/cmdline/commit_tests.py

* subversion/tests/cmdline/export_tests.py

* subversion/tests/cmdline/externals_tests.py

* subversion/tests/cmdline/lock_tests.py

* subversion/tests/cmdline/merge_tests.py

* subversion/tests/cmdline/merge_tree_conflict_tests.py

* subversion/tests/cmdline/move_tests.py

* subversion/tests/cmdline/redirect_tests.py

* subversion/tests/cmdline/stat_tests.py

* subversion/tests/cmdline/svnadmin_tests.py

* subversion/tests/cmdline/switch_tests.py

* subversion/tests/cmdline/update_tests.py

* subversion/tests/libsvn_client/client-test.c

* subversion/tests/libsvn_client/mtcc-test.c

* subversion/tests/libsvn_fs/fs-test.c

* subversion/tests/libsvn_fs/locks-test.c

* subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c

* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c

* subversion/tests/libsvn_fs_x/fs-x-pack-test.c

* subversion/tests/libsvn_fs_x/string-table-test.c

* subversion/tests/libsvn_ra/ra-test.c

* subversion/tests/libsvn_subr/cache-test.c

* subversion/tests/libsvn_subr/checksum-test.c

* subversion/tests/libsvn_subr/config-test.c

* subversion/tests/libsvn_subr/io-test.c

* subversion/tests/libsvn_subr/packed-data-test.c

* subversion/tests/libsvn_subr/priority-queue-test.c

* subversion/tests/libsvn_subr/sqlite-test.c

* subversion/tests/libsvn_subr/string-test.c

* subversion/tests/libsvn_subr/subst_translate-test.c

* subversion/tests/libsvn_subr/x509-test.c

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

* subversion/tests/svn_test_main.c

* tools/dev/benchmarks/RepoPerf/copy_repo.py

* tools/dev/benchmarks/RepoPerf/win_repo_bench.py

* tools/dev/build-svn-deps-win.pl

* tools/dev/fsfs-access-map.c

* tools/dev/po-merge.py

* tools/dev/x509-parser.c

* tools/diff/diff.c

* tools/dist/backport.pl

* tools/dist/backport_tests.py

* tools/hook-scripts/mailer/mailer.py

* tools/server-side/svnpubsub/daemonize.py

* win-tests.py

Remove unneeded whitespace via script.

  1. … 184 more files in changeset.
Remove the now unused "is-fresh-txn-root" flag from FSX.

* subversion/libsvn_fs_x/fs.h

(svn_fs_x__noderev_t): Remove the flag from our internal struct.

* subversion/libsvn_fs_x/low_level.c

(HEADER_FRESHTXNRT): Remove this noderev header.

(svn_fs_x__read_noderev,

svn_fs_x__write_noderev): One noderev element less to process.

* subversion/libsvn_fs_x/cached_data.c

(block_read_noderev): No workaround necessary anymore.

* subversion/libsvn_fs_x/transaction.h

(svn_fs_x__put_node_revision): Drop the fresh-txn-root flag.

* subversion/libsvn_fs_x/transaction.c

(svn_fs_x__put_node_revision): Update implementation.

(create_new_txn_noderev_from_rev,

svn_fs_x__create_node,

svn_fs_x__set_entry

rep_write_contents_close,

svn_fs_x__create_successor,

svn_fs_x__set_proplist): Update callers.

(write_final_rev): No workaround necessary anymore.

* subversion/libsvn_fs_x/dag.c

(svn_fs_x__dag_increment_mergeinfo_count,

svn_fs_x__dag_set_has_mergeinfo,

svn_fs_x__dag_update_ancestry): Update callers.

  1. … 5 more files in changeset.
* subversion/libsvn_fs_x/low_level.c

(auto_escape_path,

auto_unescape_path): The POOL parameter is a pure RESULT_POOL.

Add missing docstrings.

In FSX, complete the renaming of global structs to meet our coding

guidelines. This is part of a series of search-replace changes.

* subversion/libsvn_fs_x/fs.h

(svn_fs_x__data_t): Update docstring.

(change_t): Rename to ...

(svn_fs_x__change_t): ... this.

* subversion/libsvn_fs_x/changes.c

* subversion/libsvn_fs_x/changes.h

* subversion/libsvn_fs_x/low_level.c

* subversion/libsvn_fs_x/low_level.h

* subversion/libsvn_fs_x/temp_serializer.c

* subversion/libsvn_fs_x/temp_serializer.h

* subversion/libsvn_fs_x/transaction.c

* subversion/libsvn_fs_x/tree.c

(): s/change_t/svn_fs_x__change_t/g

  1. … 8 more files in changeset.
In FSX, continue renaming global structs to meet our coding guidelines.

This is part of a series of search-replace changes.

* subversion/libsvn_fs_x/fs.h

(node_revision_t): Rename to ...

(svn_fs_x__noderev_t): ... this. Shorten the name to match the typical

'noderev' variable names.

* subversion/libsvn_fs_x/cached_data.c

* subversion/libsvn_fs_x/cached_data.h

* subversion/libsvn_fs_x/dag.c

* subversion/libsvn_fs_x/fs_id.c

* subversion/libsvn_fs_x/fs_x.c

* subversion/libsvn_fs_x/fs_x.h

* subversion/libsvn_fs_x/low_level.c

* subversion/libsvn_fs_x/low_level.h

* subversion/libsvn_fs_x/noderevs.c

* subversion/libsvn_fs_x/noderevs.h

* subversion/libsvn_fs_x/pack.c

* subversion/libsvn_fs_x/temp_serializer.c

* subversion/libsvn_fs_x/temp_serializer.h

* subversion/libsvn_fs_x/transaction.c

* subversion/libsvn_fs_x/transaction.h

* subversion/libsvn_fs_x/tree.c

(): s/node_revision_t/svn_fs_x__noderev_t/g

  1. … 16 more files in changeset.
In FSX, continue renaming global structs to meet our coding guidelines.

This is part of a series of search-replace changes.

* subversion/libsvn_fs_x/fs.h

(representation_t): Rename to ...

(svn_fs_x__representation_t): ... this.

(node_revision_t): Update references.

* subversion/libsvn_fs_x/cached_data.c

* subversion/libsvn_fs_x/cached_data.h

* subversion/libsvn_fs_x/fs_x.c

* subversion/libsvn_fs_x/fs_x.h

* subversion/libsvn_fs_x/low_level.c

* subversion/libsvn_fs_x/low_level.h

* subversion/libsvn_fs_x/noderevs.c

* subversion/libsvn_fs_x/pack.c

* subversion/libsvn_fs_x/rep-cache.c

* subversion/libsvn_fs_x/rep-cache.h

* subversion/libsvn_fs_x/reps.c

* subversion/libsvn_fs_x/reps.h

* subversion/libsvn_fs_x/temp_serializer.c

* subversion/libsvn_fs_x/transaction.c

* subversion/libsvn_fs_x/verify.c

():s/representation_t/svn_fs_x__representation_t/g

  1. … 15 more files in changeset.
Merge branches/fsx-id in /trunk, remove the BRANCH-README and

resolve trivial conflicts.

  1. … 27 more files in changeset.
Sync FSX with FSFS: Merge assorted fixes and improvements from libsvn_fs_fs

and resolve the usual conflicts with FSX. The merged revisions are:

r1605633 - remove obsolete race handling between 'hotcopy' and 'pack'

r1616613 - improve config file documentation

r1620930 - reintroduce SVN_FS_FS__USE_LOCK_MUTEX conditional flag

r1622946 - fix rev/pack file open retry after pack

r1623368 - factor out some common code into svn_fs_fs__packed_base_rev()

r1623381 - bump instance ID upon recover

r1623402 - don't use instance IDs as part of the cache keys

r1626246 - fix some compiler warnings

r1627949 - make sure to detect format upgrades before committing

r1628161 - add missing error tracing

r1628393, r1628415 - fix compiler warnings in index.c

r1632908 - fix error leak

  1. … 14 more files in changeset.
Sync FSX with FSFS: Merge revisions

r1631050, r1631051 and r1631186 from libsvn_fs_fs and resolve a

minor text conflict.

These are fixes to the 'changed paths list' code.

  1. … 2 more files in changeset.
Sync FSX with FSFS: Merge revisions

r1623377, r1629879 and r1631049 from libsvn_fs_fs and resolve a

few text conflicts.

These are docstring fixes ported to FSX.

  1. … 4 more files in changeset.
Sync FSX with FSFS: Merge revisions

r1627966, r1628093, r1628159, r1631563, r1631567, r1631588, r1631598

and r1634920, resolved the usual conflicts and adapted the code to FSX.

This ports the latest indexing improvements (platform independence,

index checksumming, text markers) to FSX.

  1. … 9 more files in changeset.
Sync FSX with FSFS: Merge revisions

r1603605, r1606840, r1622931, r1622937, r1622942, r1622959, r1622963,

r1622987, r1623373, r1623398, r1628392, r1628427, r1631196, r1631197,

r1631240, r1631548, r1631550 and r1633617 from libsvn_fs_fs and resolve

the usual text conflicts with FSX.

This ports the "parser hardening" patches to FSX.

  1. … 9 more files in changeset.
Remove unused functions from FSX.

* subversion/libsvn_fs_x/low_level.h

(svn_fs_x__parse_revision_trailer,

svn_fs_x__unparse_revision_trailer): Drop as FSX rev / pack files don't

have revision trailers.

* subversion/libsvn_fs_x/low_level.c

(svn_fs_x__parse_revision_trailer,

svn_fs_x__unparse_revision_trailer): Ditto.

  1. … 1 more file in changeset.
Sync FSX with FSFS:

Merge revisions r1604947, r1605064, r1605188, r1605189 and r1605191 from

libsvn_fs_fs and resolve the usual FSX conflicts.

This ports various 'svn log' memory consumption improvements to FSX.

  1. … 5 more files in changeset.
Sync FSX with FSFS:

Merge revisions r1604802, r1604824, r1604836, r1604902, r1604911,

r1604925, r1605060, r1605065, r1605068, r1605071, r1605072 and r1605073

from libsvn_fs_fs. Fix the usual text conflicts caused by reordered code

and renamed functions in FSX.

This ports dual pool paradigm introduction in the lower data access layer

to FSX.

  1. … 8 more files in changeset.
Sync FSX with FSFS:

Merge and adapt revisions r1604416, r1604417 and 1604421 from libsvn_fs_fs.

The usual conflicts caused by reordered code and renamed functions in FSX

had to be resolved.

This ports the "indexes as part of the rev / pack file" changes to FSX.

  1. … 15 more files in changeset.
Sync FSX with FSFS:

Merge and adapt revisions r1604188, r1604413, r1604442, r1604700, r1604726

r1604755 and r1604844 from libsvn_fs_fs. Various conflicts were caused by

reordered code and renamed functions in FSX.

This ports memory / pool usage improvements in the parser and lower data

access layers.

  1. … 4 more files in changeset.
Reverting experimental move-related APIs.

For details see http://svn.haxx.se/dev/archive-2014-05/0155.shtml

This effectively reverts revisions 1595600,1572044,1547039,1535341,

1535330,1535080,1535029,1534280,1532200,1527217,1527088,1526057,

1526014,1526013,1525484,1525467,1525464,1525463,1525462,1525460,

1525459,1525453,1525448,1525442,1525432,1525429 and 1525419.

Remove respective entries from CHANGES.

  1. … 43 more files in changeset.
Sync'ing FSX with FSFS:

Merge r1559912,1560107,1586947,1586953 from /subversion/libsvn_fs_fs

into subversion/libsvn_fs_x. Conflicts were due to name and structural

differences between FSX and FSFS.

This ports the 'svn log' related changes.

  1. … 6 more files in changeset.
Sync'ing FSX with FSFS:

Merge r1519624,1523440,1575623,1582370,1584356,1588713,1590384

from /subversion/libsvn_fs_fs into subversion/libsvn_fs_x.

Conflicts were mainly due to name prefix differences (svn_fs_x vs svn_fs_fs).

This ports a number of local bug fixes.

  1. … 7 more files in changeset.
Sync'ing FSX with FSFS:

Merge r1533396,1544717,1544719,1544721,1559777,1590385,1590416,1590440

from /subversion/libsvn_fs_fs into subversion/libsvn_fs_x. Conflicts

were due earlier cherry-picks and structural differences between FSX

and FSFS.

This ports a number of local improvements.

  1. … 3 more files in changeset.
Sync'ing FSX with FSFS:

Merge r1510901,-96 from /branches/fsfs-improvements/subversion/libsvn_fs_fs

into /trunk/subversion/libsvn_fs_x. No conflicts. Docstring fixes only.

  1. … 2 more files in changeset.