Subversion SVN Changelog

Changelog for Subversion (57,769 revisions):

r1241554: 2012-02-07 19:10:41 [stsp] Stefan Sperling

Click to show all 11 changes...

 Allow setting the SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
 authentication parameter from the perl, python and ruby bindings.
 
 This parameter cannot be set using the regular svn_auth_set_parameter
 function, since the function from perl/python/ruby space must be wrapped
 in a C function to allow it to be called. For this reason, a new
 function, svn_auth_set_gnome_keyring_unlock_prompt_func, is introduced
 (in the bindings only).
 
 [in subversion/bindings/swig]
 
 * core.i
   (svn_auth_set_gnome_keyring_unlock_prompt_func): Add function and
   setup corresponding authprompt_callback_typemap.
 
 * perl/libsvn_swig_perl/swigutil_pl.c,
   perl/libsvn_swig_perl/swigutil_pl.h
   (svn_swig_pl_thunk_gnome_keyring_unlock_prompt): Add function (called
   by authprompt_callback_typemap)
 
 * python/libsvn_swig_py/swigutil_py.c
   python/libsvn_swig_py/swigutil_py.h
   (svn_swig_py_auth_gnome_keyring_unlock_prompt_func): Add function
   (called by authprompt_callback_typemap)
 
 * ruby/libsvn_swig_ruby/swigutil_rb.c,
   ruby/libsvn_swig_ruby/swigutil_rb.h
   (svn_swig_rb_auth_gnome_keyring_unlock_prompt_func): Add function
   (called by authprompt_callback_typemap)
 
 * perl/native/t/3client.t,
   python/tests/client.py
   Add test for svn_auth_set_gnome_keyring_unlock_prompt_func.
 
 [in tools/examples]
 
 * get-location-segments.py,
   info.rb
   Use the new svn_auth_set_gnome_keyring_unlock_prompt_func function.
 
 Patch by: Matthijs Kooijman <matthijs@...>

r1241553: 2012-02-07 19:04:02 [stsp] Stefan Sperling

  /subversion/bindings/swig/include/svn_containers.swg  [diff, log, file]
  /subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c  [diff, log, file]
  /subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h  [diff, log, file]
  /subversion/bindings/swig/ruby/svn/core.rb  [diff, log, file]
  /tools/examples/info.rb  [log, file]

 Fix the ruby bindings for svn_auth_get_platform_specific_client_providers.
 
 The bindings were present, but due to a missing argout typemap for
 apr_array_header_t **providers, they threw a not implemented error. This
 was fixed for perl in r1035745 and for python in r1241530, but was still
 broken for ruby.
 
 [in subversion/bindings/swig]
 
 * include/svn_containers.swg
   (apr_array_header_t **providers):
   New SWIGRUBY typemap.
 
 * ruby/libsvn_swig_ruby/swigutil_rb.c,
   ruby/libsvn_swig_ruby/swigutil_rb.h
   (svn_swig_rb_apr_array_to_array_auth_provider_object): Add function.
 
 * ruby/svn/core.rb
   (add_platform_specific_client_providers, add_providers): Add
   functions.
 
 [in tools/examples]
 
 * info.rb
   Add a new example that shows how to do remote access instead of
   working on an existing working copy (like the existing examples do).
   This example also shows how to call
   svn_auth_get_platform_specific_client_providers.
 
 Patch by: Matthijs Kooijman <matthijs@...>

r1241540: 2012-02-07 18:21:04 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/libsvn_wc/update_editor.c  [diff, log, file]

 On the moves-scan-log branch:
 
 * subversion/libsvn_wc/update_editor.c
   (delete_entry): Add empty placeholders for the following tree conflict
    resolution cases (none implemented yet):
      o incoming move vs. local move, choose incoming
      o incoming move vs. local move, choose local
      o incoming move vs. local delete, choose incoming
      o incoming move vs. local delete, choose local

r1241534: 2012-02-07 17:51:26 [danielsh] Daniel Shahaf

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

 Nominate r1241530.

r1241531: 2012-02-07 17:49:27 [hwright] Hyrum Wright

  /subversion/libsvn_client/repos_diff.c  [diff, log, file]
  /subversion/libsvn_delta/compat.c  [diff, log, file]
  /subversion/libsvn_fs_base/tree.c  [diff, log, file]
  /subversion/libsvn_fs_fs/tree.c  [diff, log, file]
  /subversion/libsvn_wc/externals.c  [diff, log, file]
  /subversion/libsvn_wc/update_editor.c  [diff, log, file]

 Revert r1241097, persuant to the discussion in this thread:
 http://svn.haxx.se/dev/archive-2012-02/0116.shtml

r1241530: 2012-02-07 17:44:43 [danielsh] Daniel Shahaf

  /subversion/bindings/swig/include/svn_containers.swg  [diff, log, file]
  /subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c  [diff, log, file]
  /subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h  [diff, log, file]
  /subversion/bindings/swig/python/tests/client.py  [diff, log, file]
  /tools/examples/get-location-segments.py  [diff, log, file]

 Fix the python bindings for svn_auth_get_platform_specific_client_providers.
 
 The bindings were present, but due to a missing argout typemap for
 apr_array_header_t **providers, they threw a not implemented error. This
 was fixed for perl in r1035745, but was still broken for python and
 ruby. (The ruby bindings will be fixed in a separate commit.)
 
 [in subversion/bindings/swig]
 
 * include/svn_containers.swg
   (apr_array_header_t **RANGELIST):
     Track rename.
   (apr_array_header_t **providers):
     New SWIGPYTHON typemap.
 
 * python/libsvn_swig_py/swigutil_py.c
   (convert_rangelist): Rename to..
   (convert_pointerlist): .. this.
     Use 'void *' instead of a concrete pointer type for the array elements.
   (svn_swig_py_ranglist_to_list): Rename to..
   (svn_swig_py_pointerlist_to_list): .. this.
   (svn_swig_py_mergeinfo_to_dict):
     Track renames.
 
 * python/libsvn_swig_py/swigutil_py.h
   (svn_swig_py_ranglist_to_list): Rename to..
   (svn_swig_py_pointerlist_to_list): .. this.
 
 * python/test/client.py
   (test_platform_providers): Add testcase.
 
 * tools/examples/get-location-segments.py
   (main): Use svn_auth_get_platform_specific_client_providers.
 
 Patch by: Matthijs Kooijman <matthijs@...>

r1241529: 2012-02-07 17:40:29 [julianfoad] Julian Foad

  /tools/dev/mergegraph/mergegraph.py  [diff, log, file]

 * ../tools/dev/mergegraph/mergegraph.py
   (add_annotation): Change the annotation style to a pale blue background.

r1241516: 2012-02-07 16:45:20 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/libsvn_wc/update_editor.c  [diff, log, file]

 On the moves-scan-log branch:
 
 * subversion/libsvn_wc/update_editor.c
   (delete_entry): Use more obvious conditions when testing for the
    'local moved away, incoming delete' tree-conflict case.
 

r1241515: 2012-02-07 16:44:27 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/libsvn_wc/update_editor.c  [diff, log, file]

 On the moves-scan-log branch:
 
 * subversion/libsvn_wc/update_editor.c
   (delete_entry): Handle the 'local delete vs. incoming delete' case
    which is of course trivial to merge.

r1241512: 2012-02-07 16:35:50 [julianfoad] Julian Foad

  /tools/dev/mergegraph/mergegraph.py  [diff, log, file]

 * tools/dev/mergegraph/mergegraph.py
   (read_config): To simplify graph config files, supply a default output
     filename based on the config file name; and make the title, merges and
     annotations all optional.

r1241507: 2012-02-07 16:15:36 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/libsvn_wc/update_editor.c  [diff, log, file]

 On the moves-scan-log branch:
 
 * subversion/libsvn_wc/update_editor.c
   (delete_entry): Move the block of code that auto-merges an incoming delete
    on top of a local move to a more useful place. The current location makes
    sense on trunk. But on this branch the flow of code would soon be getting
    hard to follow otherwise (in fact, I suppose delete_entry() will eventually
    need to be split into several functions on this branch).

r1241493: 2012-02-07 15:44:40 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/svn/conflict-callbacks.c  [diff, log, file]

 On the moves-scan-log branch:
 
 * subversion/svn/conflict-callbacks.c
   (svn_cl__conflict_handler): Fix reversed logic in help text of the
    move conflict prompt.

r1241490: 2012-02-07 15:42:35 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/libsvn_wc/update_editor.c  [diff, log, file]

 On the moves-scan-log branch:
 
 * subversion/libsvn_wc/update_editor.c
   (delete_entry): Invoke the conflict callback again after determining
    details of an "incoming move vs. local move/delete' conflict,
    instead of falling out of the conflict callback loop prematurely.
    While here, mark another spot where we deliberately return to the
    callback with a comment.

r1241440: 2012-02-07 12:23:50 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/libsvn_wc/util.c  [diff, log, file]

 On the moves-scan-log branch, fix svn_wc__conflict_description2_dup().
 
 * subversion/libsvn_wc/util.c
   (svn_wc__conflict_description2_dup): Copy the new 'suggested_moves'
    element, too.

r1241437: 2012-02-07 12:06:22 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/bindings/swig/ruby/svn/info.rb  [diff, log, file]
  [moves-scan-log] /subversion/bindings/swig/ruby/svn/util.rb  [diff, log, file]

 On the moves-scan-log branch, revert changes to the ruby bindings
 accidentally committed in r1232025. Confirmed by philip.

r1241421: 2012-02-07 10:53:50 [stsp] Stefan Sperling

  [moves-scan-log] /subversion/tests/libsvn_client  [diff, log, file]

 On the moves-scan-log branch:
 * subversion/tests/libsvn_client
   (svn:ignore): Add get-repos-moves-test.

r1241415: 2012-02-07 10:33:18 [stsp] Stefan Sperling

Click to show all 44 changes...

 Sync the moves-scan-log branch with trunk.

r1241408: 2012-02-07 10:15:03 [stsp] Stefan Sperling

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

 * STATUS (for 1.6.x): Vote.

r1241391: 2012-02-07 09:30:18 [philip] Philip Martin

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

 * STATUS: Propose r1230212

r1241388: 2012-02-07 09:23:22 [philip] Philip Martin

  [1.6.x-r1230212] /  [diff, log, file]
  [1.6.x-r1230212] /subversion/libsvn_fs_fs/fs_fs.c  [diff, log, file]

 Merge r1230212 to 1.6.x-r1230212 and resolve conflicts.

r1241386: 2012-02-07 09:20:25 [philip] Philip Martin

  [1.6.x-r1230212] /  [diff, log, file]
  [1.6.x-r1230212] /subversion/libsvn_fs_fs/fs_fs.c  [diff, log, file]

 Revert r1241385 as the conflict resolution was wrong.

r1241385: 2012-02-07 09:17:12 [philip] Philip Martin

  [1.6.x-r1230212] /  [diff, log, file]
  [1.6.x-r1230212] /subversion/libsvn_fs_fs/fs_fs.c  [diff, log, file]

 Merge r1230212 to 1.6.x-r1230212 and resolve conflicts.
 
 [Reverted by r1241386.]

r1241382: 2012-02-07 09:14:48 [philip] Philip Martin

  [1.6.x-r1230212] /  [log, file]  (copied from r1241381 of [1.6.x] /)

 Branch for r1230212 backport to 1.6

r1241344: 2012-02-07 04:00:08 [svn-role] User: svn-role

  [1.6.x] /  [diff, log, file]
  [1.6.x] /STATUS  [diff, log, file]
  [1.6.x] /subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c  [diff, log, file]
  [1.6.x] /subversion/bindings/swig/python/tests/mergeinfo.py  [diff, log, file]

 Merge the r1235264 group from trunk:
 
  * r1235264, r1235296, r1235302, r1235736
    Fix a swig-py memory leak.
    Justification:
      Seen in the wild with significant effects.
    Notes:
      r1235264 is the fix.
      r1235296 adds a regression test.
      r1235302 is trivial / obvious fix.
      r1235736 is trivial / obvious fix.
    Votes:
      +1: danielsh
      +0: gstein

r1241313: 2012-02-07 01:29:47 [danielsh] Daniel Shahaf

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

 Nominate the r1235264 group as approved (with gstein's voice via dev@).
 
 Suggested by: Trent Nelson