Subversion SVN Changelog

Changelog for Subversion (103 revisions):

r862198: 2006-10-26 14:22:52 [dberlin] Daniel Berlin

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

 Vote for r21738, r21924, r22026, approving

r861397: 2006-08-31 14:13:17 [dberlin] Daniel Berlin

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

 Use the same prepared statement across multiple invocation of same query.
 Bind the invariant values outside the 'for loop'.
 
 * subversion/libsvn_fs_fs/fs_fs.c
   (index_path_merge_info):
    Create the statement outside the for loop.
    Reset the statement after each execution as mandated by sqlite
    using sqlite3_reset.
    Bind 'mergedfrom', 'mergedto', 'revision' outside the for loop as they
    are invariants across iterations.
    Finalize the statement outside the 'for loop'.
 
 Patch by: Kamesh Jayachandran <kamesh@...>
 Review by: dberlin
            malcolm

r861396: 2006-08-31 14:11:23 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_subr/mergeinfo.c  [diff, log, file]

 Refactor 'svn_mergeinfo_diff' and 'svn_mergeinfo_remove' by moving the
 common code out of them to 'walk_mergeinfo_hash_for_diff'.
 
 * subversion/libsvn_subr/mergeinfo.c
   (walk_mergeinfo_hash_for_diff): New function
   (svn_mergeinfo_diff): uses walk_mergeinfo_hash_for_diff.
   (svn_mergeinfo_remove): uses walk_mergeinfo_hash_for_diff.
 
 Patch by: Kamesh Jayachandran <kamesh@...>
 Review by: Daniel Berlin <dberlin@...>

r861395: 2006-08-31 14:10:02 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_subr/mergeinfo.c  [diff, log, file]

 
 Refactor code for 'combining of lastrange and some range'.
 
 * subversion/libsvn_subr/mergeinfo.c
   (combine_with_lastrange): New function.
 
   (parse_revlist): uses 'combine_with_lastrange'.
   (svn_rangelist_merge): uses 'combine_with_lastrange'.
   (rangelist_intersect_or_remove): uses 'combine_with_lastrange'.
 
 Patch by: Kamesh Jayachandran <kamesh@...>
 Review by: Daniel Berlin <dberlin@...>

r861332: 2006-08-25 14:35:20 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_fs_fs/tree.c  [diff, log, file]

 * subversion/libsvn_fs_fs/tree.c (get_merge_info_for_path):
   Set has_no_mergeinfo in case 'mergeinfo' has no corresponding records
   in 'mergeinfo_changed'.
 
 Patch by: Kamesh Jayachandran <kamesh@...>
 Review by: dberlin

r860892: 2006-07-21 03:41:14 [dberlin] Daniel Berlin

Click to show all 148 changes...

 Merge r20759-r20804 from trunk into merge-tracking-branch.

r860878: 2006-07-20 18:36:04 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_fs_fs/fs_fs.c  [diff, log, file]
  [merge-tracking] /subversion/libsvn_subr/mergeinfo.c  [diff, log, file]

 Remove SVN_REVNUM_T_FMT uses in favor of %ld
 
 * subversion/libsvn_subr/mergeinfo.c (svn_range_to_string): Use %ld.
 * subversion/libsvn_fs_fs/fs_fs.c (commit_body): Ditto.
 

r860860: 2006-07-20 03:29:23 [dberlin] Daniel Berlin

  [merge-tracking] /TODO  [diff, log, file]

 Update my todo items

r860812: 2006-07-19 01:51:24 [dberlin] Daniel Berlin

  [merge-tracking] /TODO  [diff, log, file]

 Remove items from TODO

r860809: 2006-07-18 23:55:39 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_ra_dav/mergeinfo.c  [diff, log, file]
  [merge-tracking] /subversion/libsvn_ra_dav/ra_dav.h  [diff, log, file]
  [merge-tracking] /subversion/mod_dav_svn/mergeinfo.c  [diff, log, file]

 Cleanup whitespace and formatting a bit
 
 * subversion/mod_dav_svn/mergeinfo.c (dav_svn__get_merge_info_report):
 Cleanup formatting a bit.
 * subversion/libsvn_ra_dav/ra_dav.h: Remove extraneous comma.
 * subversion/libsvn_ra_dav/mergeinfo.c: Comment and rename a few variables.
 (start_element): Ditto.
 (end_element): Ditto.
 (svn_ra_dav__get_merge_info): Ditto.

r860802: 2006-07-18 19:42:41 [dberlin] Daniel Berlin

Click to show all 13 changes...

 Make svn_ra_get_mergeinfo work over DAV, and fix bindings
 so svn_ra_get_mergeinfo and svn_repos_fs_get_mergeinfo work.
 
 (This was done for testing the DAV stuff, which is why it was part
  of this change)
 
 * subversion/include/svn_repos.h
 (svn_repos_fs_get_mergeinfo): Rename parameter for consistency.
 
 * subversion/include/svn_ra.h
 (svn_ra_get_merge_info): Ditto.
 
 * subversion/bindings/swig/svn_ra.i: Apply MERGEHASHHASH to mergeoutput.
 
 * subversion/bindings/swig/svn_repos.i: Apply MERGEHASH to mergeoutput.
 
 * subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
 (convert_mergeinfo_hash): New function.
 (svn_swig_py_mergeinfo_hash_to_dict): Ditto.
 
 * subversion/bindings/swig/include/svn_types.swg: Add typemap MERGEHASHASH.
 
 * subversion/mod_dav_svn/dav_svn.h
 (dav_svn__get_merge_info_report): New prototype.
 
 * subversion/mod_dav_svn/mergeinfo.c: New file.
 
 * subversion/mod_dav_svn/version.c: New file.
 
 * subversion/libsvn_ra_dav/ra_dav.h: Add merge_info elements.
 
 * subversion/libsvn_ra_dav/fetch.c: Remove svn_ra_dav__get_mergeinfo.
 
 * subversion/libsvn_ra_dav/mergeinfo.c: New function
 

r860783: 2006-07-17 20:07:56 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_ra_local/ra_plugin.c  [diff, log, file]

 Make local parse mergeinfo as per the API docs
 
 * subversion/libsvn_ra_local/ra_plugin.c: Include svn_mergeinfo.h.
 (svn_ra_local__get_merge_info): Parse returned mergeinfo strings into hash.
 

r860689: 2006-07-13 01:15:54 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/bindings/swig/include/svn_types.swg  [diff, log, file]
  [merge-tracking] /subversion/bindings/swig/svn_fs.i  [diff, log, file]

 Fix bindings since merge from trunk broke them.
 
 * subversion/bindings/swig/include/svn_types.swg: Remove in,
   numinputs map.
 * subversion/bindings/swig/svn_fs.i: Ditto.
 

r860656: 2006-07-12 07:47:29 [dberlin] Daniel Berlin

  [merge-tracking] /TODO  [diff, log, file]

 Add a todo item of mine

r860538: 2006-07-07 03:53:55 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_subr/mergeinfo.c  [diff, log, file]
  [merge-tracking] /subversion/tests/libsvn_subr/mergeinfo-test.c  [diff, log, file]

 On the merge-tracking branch: Fix a thinko in remove causing certain
 removals to fail. We were outputting one extra value we shouldn't
 have in most cases.
 
 Change and update testcases to match.
 
 * subversion/libsvn_subr/mergeinfo.c
   (rangelist_intersect_or_remove): Fix condition.
 
 * subversion/tests/libsvn_subr/mergeinfo-test.c
   (mergeinfo5, mergeinfo6, mergeinfo7, mergeinfo8): New variables.
 
   (test_remove_rangelist): Update.
 
 Found by: Kamesh Jayachandran <kamesh@...>

r860517: 2006-07-06 00:11:16 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/libsvn_subr/mergeinfo.c  [diff, log, file]

 Fix rangelist_intersect_or_remove to do merge combining in all
 the right places.
 
 * subversion/libsvn_subr/mergeinfo.c (rangelist_intersect_or_remove): Update
 merge combining code

r860428: 2006-07-03 01:22:22 [dberlin] Daniel Berlin

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

 Make hotcopy work in the presence of mergeinfo.
 
 * subversion/libsvn_fs_fs/fs_fs.c (PATH_MERGEINFO_DB): New macro.
 (path_mergeinfo_db): New function.
 (svn_fs_fs__open): Use it.
 (commit_body): Ditto.
 (svn_fs_fs__create): Ditto.
 (svn_fs_fs__hotcopy): Copy merge tracking info.
 

r860325: 2006-06-26 22:24:09 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/bindings/swig/include/svn_types.swg  [diff, log, file]

 Our mergeinfo API is not NULL tolerant, so if a conversion function
 caused an error, don't just pass null to the underlying wrapped function.
 
 * subversion/bindings/swig/include/svn_types.swg: If error occurred,
   fail instead of passing NULL along.

r860280: 2006-06-21 17:30:13 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/include/svn_fs.h  [diff, log, file]

 Fix comment typo noticed by kamesh@...
 
 * subversion/include/svn_fs.h (svn_fs_get_merge_info): info -> minfohash.

r860279: 2006-06-21 14:47:47 [dberlin] Daniel Berlin

Click to show all 15 changes...

 Add include_parents option to get_merge_info to control whether we
 recursively check our parents mergeinfo or not.
 
 * subversion/libsvn_ra/ra_loader.c (svn_ra_get_merge_info): Add parameter.
 * subversion/libsvn_ra/ra_loader.h (get_merge_info): Ditto.
 * subversion/include/svn_fs.h (svn_fs_get_merge_info): Ditto.
 * subversion/include/svn_repos.h (svn_repos_fs_get_merge_info): Ditto.
 * subversion/include/svn_repos.h (svn_ra_get_merge_info): Ditto.
 * subversion/libsvn_fs/fs-loader.h (get_merge_info): Ditto.
 * subversion/libsvn_fs/fs-loader.c (svn_fs_get_merge_info): Ditto.
 * subversion/libsvn_ra_local/ra_plugin.c
 (svn_ra_local__get_merge_info): Ditto.
 * subversion/tests/libsvn_fs/fs-test.c (get_merge_info): Ditto.
 * subversion/libsvn_repos/fs-wrap.c (svn_repos_fs_get_merge_info): Ditto.
 * subversion/libsvn_ra_svn/client.c (ra_svn_get_merge_info): Ditto.
 * subversion/libsvn_ra_dav/ra_dav.h (svn_ra_dav__get_merge_info): Ditto.
 * subversion/libsvn_ra_dav/fetch.c (svn_ra_dav__get_merge_info): Ditto.
 * subversion/svnserve/serve.c (get_merge_info): Ditto.
 * subversion/libsvn_fs_fs/tree.c (get_merge_info_for_path): Ditto.
 (fs_get_merge_info): Ditto.
 

r860277: 2006-06-20 23:46:22 [dberlin] Daniel Berlin

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

 Cleanup unused variables.
 
 * subversion/libsvn_fs_fs/fs_fs.c (update_mergeinfo_index): Remove two
 unused variables.

r860276: 2006-06-20 23:36:30 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/include/svn_fs.h  [diff, log, file]
  [merge-tracking] /subversion/libsvn_fs/fs-loader.c  [diff, log, file]
  [merge-tracking] /subversion/libsvn_fs/fs-loader.h  [diff, log, file]
  [merge-tracking] /subversion/libsvn_fs_fs/tree.c  [diff, log, file]
  [merge-tracking] /subversion/libsvn_repos/fs-wrap.c  [diff, log, file]
  [merge-tracking] /subversion/tests/libsvn_fs/fs-test.c  [diff, log, file]

 Remove revnum argument to get_merge_info since it has a revision root.
 Do path translation during merge info getting.
 Add small test of fs_get_mergeinfo
 
 * subversion/include/svn_fs.h (svn_fs_get_mergeinfo): Remove revnum parameter.
 * subversion/libsvn_fs/fs-loader.h (get_merge_info): Ditto.
 * subversion/libsvn_fs/fs-loader.c (svn_fs_get_merge_info): Ditto.
 * subversion/tests/libsvn_fs/fs-test.c (get_mergeinfo): New test.
 * subversion/libsvn_repos/fs-wrap.c
 (svn_repos_fs_get_merge_info): Remove rev parameter.
 * subversion/libsvn_fs_fs/tree.c (append_component_to_paths): New function.
 (get_merge_info_for_path): Use it.
 (fs_get_merge_info): Remove rev parameter, get it from the revision root.
 

r860215: 2006-06-16 02:45:30 [dberlin] Daniel Berlin

  [1.4.x] /  [diff, log, file]

 Fixup svnmerge-integrated property to include r20115

r860214: 2006-06-16 02:41:46 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/bindings/swig/core.i  [diff, log, file]
  [merge-tracking] /subversion/bindings/swig/include/svn_types.swg  [diff, log, file]
  [merge-tracking] /subversion/bindings/swig/svn_fs.i  [diff, log, file]
  [merge-tracking] /subversion/include/svn_fs.h  [diff, log, file]
  [merge-tracking] /subversion/libsvn_fs/fs-loader.c  [diff, log, file]
  [merge-tracking] /subversion/libsvn_fs/fs-loader.h  [diff, log, file]
  [merge-tracking] /subversion/libsvn_fs_fs/tree.c  [diff, log, file]

 Make svn_fs_change_merge_info and svn_fs_get_merge_info
 work.
 This required const'ifying a paths to reuse some existing
 typemaping.
 
 * subversion/include/svn_fs.h
 (svn_fs_change_merge_info): Rename hash to mergeinhash.
 (svn_fs_get_merge_info): Constify paths.
 
 * subversion/libsvn_fs/fs-loader.h (get_merge_info): Constify paths.
 
 * subversion/bindings/swig/core.i: Rename mistyped typemap.
 
 * subversion/bindings/swig/include/svn_types.swg: Ditto.
 
 * subversion/bindings/swig/svn_fs.i: Set up MERGEINFO typemap.
 
 * subversion/libsvn_fs_fs/tree.c (fs_get_merge_info): Constify paths.
 

r860212: 2006-06-16 01:57:19 [dberlin] Daniel Berlin

  [merge-tracking] /subversion/bindings/swig/core.i  [diff, log, file]
  [merge-tracking] /subversion/bindings/swig/include/svn_types.swg  [diff, log, file]
  [merge-tracking] /subversion/include/svn_mergeinfo.h  [diff, log, file]

 Wrap the rest of the mergeinfo functions
 
 * subversion/bindings/swig/include/svn_types.swg:
 Add MERGEHASH typemap.
 
 * subversion/bindings/swig/core.i: Use MERGEHASH typemap.
 
 * subversion/include/svn_mergeinfo.h: Rename some arguments
 to be easily typemappable. Fix up comments to match.