Checkout
rhuijben
committed
on 17 Apr 11
Add three more arguments to our function with the most arguments. Do this to
allow handling more operations with a single read transaction a… Show more
Add three more arguments to our function with the most arguments. Do this to

allow handling more operations with a single read transaction and to allow

fixing code that should know about multiple WORKING layers.

This patch adds the following three new (optional) boolean output arguments:

 had_props       - Does it have pristine properties

 op_root         - Is it a layer defining operation

 have_more_work  - Does it have multiple working layers

Because I had to update all callers anyway, I moved a few arguments to a more

sensible location. (See the wc_db.h change for more information on that).

This patch just updates the callers to get the same information as before.

No functional changes in any of the callers.

* subversion/libsvn_wc/adm_crawler.c

 (svn_wc_restore,

  report_revisions_and_depths,

  find_base_rev,

  svn_wc_crawl_revisions5,

  read_and_checksum_pristine_text): Update callers.

* subversion/libsvn_wc/adm_files.c

 (svn_wc__text_base_path_to_read,

  svn_wc__get_pristine_contents,

  svn_wc__internal_ensure_adm): Update callers.

* subversion/libsvn_wc/adm_ops.c

 (process_committed_leaf,

  svn_wc__process_committed_internal,

  svn_wc_delete4,

  check_can_add_to_parent,

  check_can_add_node,

  revert_restore,

  new_revert_partial,

  svn_wc__internal_remove_from_revision_control,

  svn_wc__internal_changelist_match): Update callers.

* subversion/libsvn_wc/ambient_depth_filter_editor.c

 (ambient_read_info): Update caller.

* subversion/libsvn_wc/cleanup.c

 (repair_timestamps): Update caller.

* subversion/libsvn_wc/conflicts.c

 (recursive_resolve_conflict): Update caller.

* subversion/libsvn_wc/copy.c

 (copy_pristine_text_if_necessary,

  svn_wc_copy3): Update callers.

* subversion/libsvn_wc/crop.c

 (crop_children,

  svn_wc_exclude,

  svn_wc_crop_tree2): Update callers.

* subversion/libsvn_wc/diff.c

 (get_nearest_pristine_text_as_file,

  file_diff,

  report_wc_file_as_added,

  report_wc_directory_as_added,

  delete_entry,

  apply_textdelta,

  close_file,

* subversion/libsvn_wc/entries.c

 (get_base_info_for_deleted,

  read_one_entry,

  svn_wc_walk_entries3,

* subversion/libsvn_wc/lock.c

 (svn_wc__internal_check_wc,

  adm_available,

  child_is_disjoint): Update callers.

* subversion/libsvn_wc/node.c

 (svn_wc__node_get_repos_info,

  svn_wc_read_kind,

  svn_wc__node_get_depth,

  svn_wc__node_get_changed_info,

  svn_wc__node_get_changelist,

  svn_wc__node_get_base_checksum,

  svn_wc__node_get_translated_size,

  svn_wc__node_get_repos_relpath,

  svn_wc__internal_get_copyfrom_info,

  svn_wc__internal_walk_children,

  svn_wc__node_is_status_deleted,

  svn_wc__node_is_status_absent,

  svn_wc__node_is_status_not_present,

  svn_wc__node_is_status_excluded,

  svn_wc__node_is_added,

  svn_wc__node_get_base_rev,

  svn_wc__node_get_working_rev_info,

  svn_wc__node_get_commit_base_rev,

  svn_wc__internal_node_get_schedule,

  svn_wc__node_get_info_bits,

  svn_wc__get_mergeinfo_walk_info,

  svn_wc__node_depth_is_exclude,

  svn_wc__node_get_origin,

  svn_wc__node_get_commit_status): Update callers.

* subversion/libsvn_wc/props.c

 (svn_wc__get_pristine_props,

  svn_wc__internal_propset,

  svn_wc__props_modified): Update callers.

* subversion/libsvn_wc/questions.c

 (compare_and_verify,

  svn_wc__internal_file_modified_p,

  svn_wc__internal_conflicted_p,

  svn_wc__expand_keywords): Update caller.

* subversion/libsvn_wc/relocate.c

 (svn_wc_relocate4): Update callers.

* subversion/libsvn_wc/status.c

 (read_info,

  internal_status): Update callers. Avoid C++ keyword mutable.

* subversion/libsvn_wc/translate.c

 (svn_wc__expand_keywords): Update callers.

* subversion/libsvn_wc/update_editor.c

 (already_in_a_tree_conflict,

  delete_entry,

  add_directory,

  open_directory,

  add_file,

  open_file,

  make_editor,

  svn_wc__check_wc_root,

  svn_wc_add_repos_file4):

* subversion/libsvn_wc/wc_db.c

 (read_info): Update argument list of prototype.

 (cross_db_copy,

  get_info_for_copy,

  temp_op_delete_txn): Update callers.

 (read_info): Update argument list and calculate new values.

 (svn_wc__db_read_info): Update argument list and update caller.

 (read_url_txn,

  svn_wc__db_global_relocate,

  svn_wc__db_node_hidden,

  has_switched_subtrees): Update callers.

* subversion/libsvn_wc/wc_db.h

 (svn_wc__db_read_info): Update, extend and cleanup documentation. Update argument

    list.

* subversion/libsvn_wc/workqueue.c

 (remove_base_node,

  log_do_committed,

  run_file_install): Update callers.

* subversion/tests/libsvn_wc/db-test.c

 (test_working_info,

  test_global_relocate): Update callers.

Show less