Subversion SVN Changelog

Changelog for Subversion (38,331 revisions):

r38331: 2009-07-03 21:54:42 [hwright] Hyrum Wright

  /subversion/libsvn_client/merge.c  [diff, log, file]

 More prop wc-ng API cleanup. (Almost done with the client-layered stuff.)
 
 * subversion/libsvn_client/merge.c
   (files_same_p): Add a wc_ctx param, and use it with the updated APIs.
   (merge_file_deleted): Update calls to functions with wc_ctx param.
   (get_mergeinfo_walk_baton): Add wc_ctx member.
   (get_subtree_mergeinfo_walk_cb, get_mergeinfo_walk_cb,
    record_mergeinfo_for_added_subtrees): Get a local path, and update API calls.
   (svn_client_merge_reintegrate, get_mergeinfo_paths): Initialize new baton
     member.
   (get_subtree_mergeinfo_walk_baton): New member.

r38330: 2009-07-03 21:42:55 [hwright] Hyrum Wright

  /subversion/libsvn_client/cat.c  [diff, log, file]

 Update a few wc-ng deprecated function calls in libsvn_client.
 
 * subversion/libsvn_client/cat.c
   (cat_local_file): Add a wc_ctx parameter, and use it to call the updated
     APIs.
   (svn_client_cat2): Create (or reuse) a wc_context, and update the call to
     cat_local_file().

r38329: 2009-07-03 21:29:24 [hwright] Hyrum Wright

  /subversion/libsvn_client/mergeinfo.c  [diff, log, file]

 A few more wc_context and API updates to mergeinfo.c.
 
 * subversion/libsvn_client/mergeinfo.c
   (elide_mergeinfo): Use a wc_ctx and absolute path. Update calls to the old
     wc API.
   (svn_client__elide_children, svn_client__elide_mergeinfo): Update calls to
     elide_mergeinfo() with absolute paths and wc_ctx.

r38328: 2009-07-03 19:25:44 [hwright] Hyrum Wright

  /subversion/libsvn_client/client.h  [diff, log, file]
  /subversion/libsvn_client/copy.c  [diff, log, file]
  /subversion/libsvn_client/merge.c  [diff, log, file]
  /subversion/libsvn_client/mergeinfo.c  [diff, log, file]
  /subversion/libsvn_client/mergeinfo.h  [diff, log, file]
  /subversion/libsvn_client/prop_commands.c  [diff, log, file]

 Let callers to svn_client__get_prop_from_wc() supply a working copy context,
 in place of creating one each time this function is called.
 
 The result of this change is many new wc_ctx function parameters, primarily
 within mergeinfo.c and merge.c. The paradigm we are shooting for is that
 client APIs create a wc_ctx (or reuse ctx->wc_ctx), and then pass it around
 where ever needed. Although this is similar to passing adm_access batons
 everywhere, the key insight is that the wc_ctx doesn't change depending on
 which working copy directory or path we are accessing, which ultimately
 means less trouble for the callers.
 
 Also, as much as I would love to, we can't yet remove all the adm_access
 batons, since there are still many APIs which require them. :(
 
 
 * subversion/libsvn_client/client.h
   (svn_client__get_prop_from_wc): Add wc_ctx param.
 
 * subversion/libsvn_client/merge.c
   (merge_cmd_baton_t): Add wc_ctx member.
   (get_full_mergeinfo, inherit_implicit_mergeinfo_from_parent,
    ensure_implicit_mergeinfo, filter_merged_revisions,
    calculate_remaining_ranges, populate_remaining_ranges,
    calculate_merge_inheritance, do_merge,
    merge_cousins_and_supplement_mergeinfo):
     Add wc_ctx param and propogate it to other function calls.
   (record_skips, get_mergeinfo_paths, do_file_merge,
    process_children_with_new_mergeinfo, record_mergeinfo_for_dir_merge,
    record_mergeinfo_for_added_subtrees):
     Use the wc_ctx from the merge_baton to call other functions.
   (svn_client_merge3, svn_client_merge_reintegrate, svn_client_merge_peg3):
     Create (or reuse) a wc_ctx for further use.
 
 * subversion/libsvn_client/prop_commands.c
   (svn_client__get_prop_from_wc): Add wc_ctx param, and use it instead of
     creating one.
   (svn_client_propget3): Get a wc_ctx for later use.
 
 * subversion/libsvn_client/copy.c
   (calculate_target_mergeinfo, extend_wc_mergeinfo, repos_to_repos_copy,
    wc_to_repos_copy, repos_to_wc_copy_single, try_copy):
     Add wc_ctx param and propogate it to other function calls.
   (svn_client_copy5): Allocate the context from the correct pool.
 
 * subversion/libsvn_client/mergeinfo.c
   (svn_client__parse_mergeinfo, svn_client__get_wc_mergeinfo,
    svn_client__get_wc_or_repos_mergeinfo, svn_client__elide_children,
    svn_client__elide_mergeinfo, svn_client__elide_mergeinfo_for_tree,
    get_mergeinfo):
     Add wc_ctx param and propogate it to other function calls.
   (svn_client__record_wc_mergeinfo):
     Add wc_ctx param, remove access baton, and make sure the path we
     receive is an absolute path. Update deprecated function call while
     we're here.
   (svn_client_mergeinfo_log_merged, svn_client_mergeinfo_get_merged,
    svn_client_mergeinfo_log_eligible, svn_client_suggest_merge_sources):
     Get a wc_ctx to use.
 
 * subversion/libsvn_client/mergeinfo.h
   (svn_client__get_wc_mergeinfo, svn_client__get_wc_or_repos_mergeinfo,
    svn_client__elide_mergeinfo, svn_client__elide_children,
    svn_client_elide_mergeinfo_for_tree):
     Add wc_ctx param.
   (svn_client__record_wc_mergeinfo): Remove adm_access baton param, and add
     a wc_ctx param. Update docs.

r38327: 2009-07-03 15:11:27 [stsp] Stefan Sperling

  /subversion/tests/cmdline/README  [diff, log, file]
  /www/faq.html  [diff, log, file]

 Migrate very important information to a place where it's much easier
 to find.
 
 * subversion/tests/cmdline/README:
   Explain how to run tests in a RAM disk. Copied verbatim from the FAQ.
 * www/faq.html
   (ramdisk-tests): Instead of having the answer to the "ram disk" question
   here, link to cmdline/README.

r38326: 2009-07-03 06:22:45 [stylesen] Senthil Kumaran S

  /subversion/include/svn_path.h  [diff, log, file]

 Remove warning of 'redundant redeclaration of function'.
 
 * subversion/include/svn_path.h
   (): Include 'svn_dirent_uri.h', to make use of ifndef SVN_DIRENT_URI_H.

r38325: 2009-07-03 01:29:22 [pburba] Paul T. Burba

  /subversion/libsvn_client/merge.c  [diff, log, file]
  /subversion/tests/cmdline/merge_tests.py  [diff, log, file]

 Fix issue #3432 'Merge can record mergeinfo from natural history gaps',
 reimplementing r34393 along the way.
 
 * subversion/libsvn_client/merge.c
   (merge_cmd_baton_t): New member implicit_src_gap.
   (calculate_remaining_ranges): Add new argument corresponding to the new
   merge_cmd_baton_t member. Tweak doc string a bit. Ignore explicit
   mergeinfo that falls within a natural history gap, that is a different
   line of history.
   (find_gaps_in_merge_source_history): New, finds gap in natural history, if
   any.
   (populate_remaining_ranges): Use new find_gaps_in_merge_source_history
   function to find any gap in the merge source's natural history and stash
   this information in the new merge_cmd_baton_t member. Rip out the old
   r34393 fix for dealing with gaps in natural history.
   (do_file_merge): Update call to calculate_remaining_ranges().
   (record_mergeinfo_for_dir_merge): Remove natural history gaps from the
   mergeinfo recorded to describe this merge.
   (do_merge): Initialize new merge_cmd_baton_t member.
 
 * subversion/tests/cmdline/merge_tests.py
   (handle_gaps_in_implicit_mergeinfo): Remove comment re XFail status.
   (test_list): Remove XFail from handle_gaps_in_implicit_mergeinfo.

r38324: 2009-07-03 00:59:09 [rhuijben] Bert Huijben

  /subversion/tests/cmdline/patch_tests.py  [diff, log, file]

 * subversion/tests/cmdline/patch_tests.py
   (test_list): Following up on recent unified diff application work for
     supporting multiple eol-styles, remove the Windows specific XFail
     marker from patch tests 2, 3 and 4.

r38323: 2009-07-02 22:06:45 [rhuijben] Bert Huijben

  /build/generator/gen_win.py  [diff, log, file]

 * build/generator/gen_win.py
   (get_install_targets): Following up on r38305, skip swig file generation
     if swig_libdir is not available. This matches other tests for swig and
     should fix the Windows buildbot.

r38322: 2009-07-02 21:41:20 [hwright] Hyrum Wright

  /subversion/libsvn_client/copy.c  [diff, log, file]

 Use client contexts and update APIs in libsvn_client/copy.c
 
 * subversion/libsvn_client/copy.c
   (extend_wc_mergeinfo): Add an wc_ctx param.
   (repos_to_wc_copy_single, repos_to_wc_copy, try_copy): Add an wc_ctx param,
     and use it internally.
   (svn_client_copy5, svn_client_move5): Intialize a context, if needed, and
     use it internally.

r38321: 2009-07-02 21:07:36 [hwright] Hyrum Wright

  /  [diff, log, file]

 * ^/trunk:
   Add 'serf' to svn:ignore.
 
 Suggested by: Роман Донченко <DXDragon@...>

r38320: 2009-07-02 21:05:29 [hwright] Hyrum Wright

  /subversion/libsvn_client/blame.c  [diff, log, file]

 Replace another instance of svn_wc_prop_list().
 
 * subversion/libsvn_client/blame.c
   (svn_client_blame5): Create and use a context to get property lists.

r38319: 2009-07-02 20:40:54 [hwright] Hyrum Wright

  /subversion/libsvn_client/prop_commands.c  [diff, log, file]

 Rework the internals of the various property commands in libsvn_client.
 This removes several uses of adm_access batons, and also updates to use
 the newest working copy APIs.
 
 * subversion/libsvn_client/prop_commands.c
   (propset_walk_baton, proplist_walk_baton): Swap an access baton for a wc
     context.
   (propset_walk_cb): Update API use, don't bother fetching an adm access baton.
   (svn_client_propset3): Get a wc context, use an update API.
   (pristine_or_working_props): Update docs, params and API usage to remove
     access batons.
   (pristine_or_working_propval): Same as above, and use the new APIs.
   (propget_walk_baton): Get rid of the base access member.
   (propget_walk_cb): Use the new APIs for getting props.
   (svn_client__get_prop_from_wc): Don't set the access baton in the walk baton.
   (proplist_walk_cb): Use the update APIs.
   (svn_client_proplist3): Get a context, don't store the access baton in the
     walk baton, and update API calls.

r38318: 2009-07-02 20:15:56 [hwright] Hyrum Wright

  /subversion/libsvn_client/export.c  [diff, log, file]

 Update some deprecated functions in libsvn_client/export.c
 
 * subversion/libsvn_client/export.c
   (copy_one_versioned_file): Use a provided wc_ctx to call the new APIs.
   (svn_client_export4): Optionally create, and then use, a working copy
     context.

r38317: 2009-07-02 18:35:47 [hwright] Hyrum Wright

  /subversion/libsvn_client/add.c  [diff, log, file]

 * subversion/libsvn_client/add.c
   (svn_client__get_auto_props): Use a wc_context to interact with the new
     prop setting API.
   (add_dir_recursive): Use a provided wc_context in place of creating our own.
   (add): Take a wc_context parameter to properly propogate.
   (svn_client_add4): If not provided a wc_context, create one for use.

r38316: 2009-07-02 17:54:42 [hwright] Hyrum Wright

  /subversion/svnserve/main.c  [diff, log, file]

 More deprecated function updates.
 
 * subversion/svnserve/main.c
   (main): Remove the last calls to svn_path_get_absolute(), and use
     svn_dirent_get_absolute() instead.

r38315: 2009-07-02 17:33:11 [hwright] Hyrum Wright

  /subversion/svnadmin/main.c  [diff, log, file]
  /subversion/svndumpfilter/main.c  [diff, log, file]
  /subversion/svnlook/main.c  [diff, log, file]
  /subversion/svnserve/main.c  [diff, log, file]

 Fix yet more deprecation warnings with svn_path_internal_style().
 
 * subversion/svndumpfilter/main.c
   subversion/svnadmin/main.c
   subversion/svnlook/main.c
   subversion/svnserve/main.c
    Replace all calls to svn_path_internal_style() with relevant svn_dirent or
    svn_uri varients.

r38314: 2009-07-02 17:30:44 [hwright] Hyrum Wright

  /subversion/include/private/svn_fs_util.h  [diff, log, file]
  /subversion/libsvn_fs_fs/tree.c  [diff, log, file]
  /subversion/libsvn_fs_util/fs-util.c  [diff, log, file]

 Add a few include files to remove some declaration-duplicated warnings.
 
 (I'd still like to know why these warnings are header-file-include-order
 dependent. Kinda makes me a bit wary.)
 
 * subversion/libsvn_fs_util/fs-util.c,
   subversion/libsvn_fs_fs/tree.c:
   Include svn_dirent_uri.h before svn_path.h.
 
 * subversion/include/private/svn_fs_util.h:
   Include svn_path.h after svn_dirent_uri.h.

r38313: 2009-07-02 17:26:19 [blair] Blair Zajac

  [1.6.x] /STATUS  [diff, log, file]

 * STATUS: Vote for r38311.

r38312: 2009-07-02 17:22:28 [hwright] Hyrum Wright

  [1.6.x] /STATUS  [diff, log, file]

 * STATUS: Add r38311 to the r38279 group.

r38311: 2009-07-02 17:15:19 [hwright] Hyrum Wright

  /subversion/libsvn_fs_fs/fs_fs.c  [diff, log, file]

 * subversion/libsvn_fs_fs/fs_fs.c
   (svn_fs_fs__change_txn_props): Remove unused variable.

r38310: 2009-07-02 17:11:37 [hwright] Hyrum Wright

  /subversion/libsvn_ra/compat.c  [diff, log, file]
  /subversion/libsvn_ra/util.c  [diff, log, file]
  /subversion/libsvn_ra_serf/commit.c  [diff, log, file]
  /subversion/libsvn_ra_serf/util.c  [diff, log, file]
  /subversion/libsvn_subr/cmdline.c  [diff, log, file]
  /subversion/libsvn_subr/dirent_uri.c  [diff, log, file]
  /subversion/libsvn_subr/opt.c  [diff, log, file]
  /subversion/libsvn_subr/path.c  [diff, log, file]
  /subversion/libsvn_subr/subst.c  [diff, log, file]
  /subversion/svnadmin/main.c  [diff, log, file]

 Fix yet more deprecation warnings with svn_path_local_style().
 
 (Does it never end?!?)
 
 * subversion/libsvn_ra/compat.c,
   subversion/libsvn_ra/util.c,
   subversion/libsvn_subr/subst.c,
   subversion/libsvn_subr/cmdline.c,
   subversion/libsvn_subr/opt.c,
   subversion/libsvn_subr/dirent_uri.c,
   subversion/libsvn_subr/path.c,
   subversion/svnadmin/main.c,
   subversion/libsvn_ra_serf/util.c,
   subversion/libsvn_ra_serf/commit.c:
    Replace all calls to svn_path_local_style() with relevant svn_dirent or
    svn_uri varients.

r38309: 2009-07-02 16:34:11 [hwright] Hyrum Wright

  /subversion/libsvn_client/merge.c  [diff, log, file]
  /subversion/libsvn_wc/props.c  [diff, log, file]

 Update deprecated calls to svn_mergeinfo_{remove,intersect} and slightly
 tighten our memory footprint while we're at it.
 
 * subversion/libsvn_wc/props.c
   (combine_forked_mergeinfo_props),
 * subversion/libsvn_client/merge.c
   (split_mergeinfo_on_revision, filter_self_referential_mergeinfo,
    filter_unmerged_mergeinfo):
     Remove use of svn_mergeinfo_remove() and svn_mergeinfo_intersect().

r38308: 2009-07-02 16:02:18 [hwright] Hyrum Wright

  /subversion/libsvn_client/merge.c  [diff, log, file]

 Code cleanliness change: Trade a giant else clause for an itsy-bitsy continue
 statement, thus eliminating a level of indentation. No functional change.
 
 * subversion/libsvn_client/merge.c
   (filter_self_referential_mergeinfo): Add a continue statement, and
     remove an else clause.

r38307: 2009-07-02 15:40:01 [hwright] Hyrum Wright

  /subversion/libsvn_wc/deprecated.c  [diff, log, file]

 Create proper wrapper functions for svn_wc_diff_callbacks3_t and use them.
 Also change the misleading comments on the old wrappers.
 
 * subversion/libsvn_wc/deprecated.c
   (file_changed, file_deleted, dir_deleted, dir_props_changed, dir_opened,
    dir_closed): Relabel as svn_wc_diff_callbacks3_t functions, since that's
     what they're used as.
   (file_changed3, file_deleted3, dir_deleted3, dir_props_changed3,
    dir_opened2, dir_closed2): New functions.
   (callbacks3_wrapper): Use the new functions above.
 
 Patch by: Роман Донченко <DXDragon@...>