HuiHuang <yellow.flying@yahoo.com.cn>

Patch

r878849, r878773, r878771, r878654, r878630, r878295, r878104, r878032, r877924

r877924 | stsp | 2009-05-27 14:15:36 +0000 (Wed, 27 May 2009)

* notes/commit-from-multiple-working-copies.txt: New file.

Patch by: HuiHuang <yellow.flying@yahoo.com.cn>
(with whitespace tweaks by me)

r878032 | stsp | 2009-06-08 16:56:27 +0000 (Mon, 08 Jun 2009)

* notes/commit-from-multiple-working-copies.txt
  Explain which functions will have to be modified to solve issue #2381.

Patch by: HuiHuang <yellow.flying@yahoo.com.cn>
(log message tweaked by me)

r878104 | stsp | 2009-06-14 11:46:56 +0000 (Sun, 14 Jun 2009)

Add and tweak some tests for issue #2381.

* subversion/tests/cmdline/commit_tests.py
  (commit_multiple_wc): Rename to ...
  (commit_multiple_wc_nested): ... this, because it tests the case where
   two working copies are nested. Also change this test to expect the
   commit to succeed, which is the goal of issue #2381.
  (commit_multiple_wc): New test, like commit_multiple_wc_nested, except
   that working copies are not nested. Also expects a commit from multiple
   working copies to succeed.
  (commit_multiple_wc_multiple_repos): New test which tries to commit
   from two working copies which do not come from the same repository.
   The commit is expected to fail, because commits to multiple repositories
   are outside the scope of issue #2381.
  (test_list): Track renamed test and add the new tests.
   Mark commit_multiple_wc_nested and commit_multiple_wc as XFail,
   because issue #2381 is still work in progress.

Patch by: HuiHuang <yellow.flying@yahoo.com.cn>
(tweaked by me)

r878295 | stsp | 2009-06-29 10:30:52 +0000 (Mon, 29 Jun 2009)

* notes/commit-from-multiple-working-copies.txt: Update with results of
   latest discussion. Tweak the plan to be "one single commit for each
   working copy" for now. Also list the other, more viable, solutions
   which might be tackled once the current plan has been realised.

Patch by: HuiHuang <yellow.flying@yahoo.com.cn>
          me

r878630 | hwright | 2009-08-04 14:12:56 +0000 (Tue, 04 Aug 2009)

Rip out some adm_access usage in svn_wc_transmit_prop_deltas().

Patch by: HuiHuang <yellow.flying@yahoo.com.cn>

* subversion/include/svn_wc.h
 (svn_wc_transmit_prop_deltas2): New.
 (svn_wc_transmit_prop_deltas): Deprecate.

* subversion/libsvn_wc/adm_crawler.c
 (svn_wc__internal_transmit_prop_deltas): New.
 (svn_wc_transmit_prop_deltas2): New.
 (svn_wc_transmit_prop_deltas): Remove.

* subversion/libsvn_wc/deprecated.c
 (svn_wc_transmit_prop_deltas): Reimplement as a wrapper.

* subversion/libsvn_wc/wc.h
 (svn_wc__internal_transmit_prop_deltas): New.

r878654 | stsp | 2009-08-06 12:30:36 +0000 (Thu, 06 Aug 2009)

Rip out some adm_access usage, this time in svn_client__do_commit(). 

Patch by: HuiHuang <yellow.flying@yahoo.com.cn>

* subversion/libsvn_client/client.h
  (svn_client__do_commit): Remove adm_access parameter.

* subversion/libsvn_client/commit.c,
  subversion/libsvn_client/copy.c
  (svn_client_commit4, wc_to_repos_copy): Track above parameter removal.

* subversion/libsvn_client/commit_util.c
  (do_item_commit): Stop using an adm_access and entries.
   Move an already existing local_abspath to function-wide scope,
   and use it and the wc context provided in the client context
   for various updates from wc-1 APIs to WC-NG APIs.

r878771 | julianfoad | 2009-08-12 17:09:41 +0000 (Wed, 12 Aug 2009)

Make the WC "loggy" functions able to deal with absolute paths.

Patch by: HuiHuang <yellow.flying{_AT_}yahoo.com.cn>

* subversion/libsvn_wc/log.c
  (loggy_path): Make it able to deal with absolute paths. In order to achieve
    this, change the function signature to be able to return an error, to pass
    the result through an output argument, and to take a pool parameter.
    Update all callers.

* subversion/libsvn_wc/log.h
  Update the comment at the top of the file to indicate that absolute paths
  are now allowed.

r878773 | julianfoad | 2009-08-12 17:31:37 +0000 (Wed, 12 Aug 2009)

Rip out some adm_access usage: create svn_wc_translated_file3() as a successor
to svn_wc_translated_file2() that uses svn_wc_context_t and absolute paths
instead of adm_access and relative paths.

Patch by: HuiHuang <yellow.flying{_AT_}yahoo.com.cn>

* subversion/include/svn_wc.h
  (svn_wc_translated_file3): New.
  (svn_wc_translated_file2): Deprecate.

* subversion/libsvn_wc/deprecated.c
  (svn_wc_translated_file2): Reimplement as a wrapper.

* subversion/libsvn_wc/translate.c
  (svn_wc__internal_translated_file): New.
  (svn_wc_translated_file3): New.
  (svn_wc_translated_file2): Remove.

* subversion/libsvn_wc/translate.h
  (svn_wc__internal_translated_file): New.

r878849 | hwright | 2009-08-17 14:25:19 +0000 (Mon, 17 Aug 2009)

Use the library-internal version of translated_file() and tweak 
diff_external_diffcmd test to use absolute path.

Patch by: HuiHuang <yellow.flying{_AT_}yahoo.com.cn>
Tweaked by: me

* subversion/tests/cmdline/diff_tests.py
  (diff_external_diffcmd): Modify expected output as absolute path.

* subversion/libsvn_wc/diff.c
  (file_diff, report_wc_file_as_added, close_file): Call  
   svn_wc__internal_translated_file() in favor of 
   svn_wc_translated_file2().

* subversion/libsvn_wc/log.c
  (install_committed_file): Call svn_wc__internal_translated_file()   
   in favor of svn_wc_translated_file2().

* subversion/libsvn_wc/merge.c
  (preserve_pre_merge_files): Call svn_wc__internal_translated_file()  
   in favor of svn_wc_translated_file2().

* subversion/libsvn_wc/update_editor.c
  (merge_file): Call svn_wc__internal_translated_file() in favor of  
   svn_wc_translated_file2().