On Tue, Apr 24, 2012 at 1:07 PM, Hyrum K Wright
<hyrum.wright_at_wandisco.com> wrote:
> On Tue, Apr 24, 2012 at 1:01 PM, Â <rhuijben_at_apache.org> wrote:
>> Author: rhuijben
>> Date: Tue Apr 24 18:01:23 2012
>> New Revision: 1329897
>>
>> URL: http://svn.apache.org/viewvc?rev=1329897&view=rev
>> Log:
>> Following up on r1329876, report updated files that had only their lock removed
>> with a specific notify action.
>>
>> * subversion/include/svn_wc.h
>> Â (svn_wc_notify_action_t): Add value.
>>
>> * subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
>> Â (ClientNotifyInformation): Add value.
>>
>> * subversion/tests/cmdline/svntest/wc.py
>> Â (_re_parse_checkout): Handle B action.
>>
>> * subversion/tests/cmdline/lock_tests.py
>> Â (update_locked_deleted): Update expected output.
>>
>> * svn/notify.c
>> Â (notify): Add special action for just unlocking.
>>
>> * libsvn_wc/update_editor.c
>> Â (close_file): Use special action.
>>
>> Modified:
>> Â Â subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
>> Â Â subversion/trunk/subversion/include/svn_wc.h
>> Â Â subversion/trunk/subversion/libsvn_wc/update_editor.c
>> Â Â subversion/trunk/subversion/svn/notify.c
>> Â Â subversion/trunk/subversion/tests/cmdline/lock_tests.py
>> Â Â subversion/trunk/subversion/tests/cmdline/svntest/wc.py
>>
>> Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1329897&r1=1329896&r2=1329897&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
>> +++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Tue Apr 24 18:01:23 2012
>> @@ -546,6 +546,10 @@ public class ClientNotifyInformation ext
>> Â Â Â Â /** Operation skipped the path because it was conflicted */
>> Â Â Â Â skip_conflicted ("skipped conflicted path");
>
> This line should end in a comma.
This was breaking the bots, so I committed the fix in r1329911.
-Hyrum
>>
>> + Â Â Â Â /** The lock on a file was removed during update */
>> + Â Â Â Â update_broken_lock ("broken lock removed");
>> +
>> +
>> Â Â Â Â /**
>> Â Â Â Â Â * The description of the action.
>> Â Â Â Â Â */
>>
>> Modified: subversion/trunk/subversion/include/svn_wc.h
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1329897&r1=1329896&r2=1329897&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/include/svn_wc.h (original)
>> +++ subversion/trunk/subversion/include/svn_wc.h Tue Apr 24 18:01:23 2012
>> @@ -1219,7 +1219,11 @@ typedef enum svn_wc_notify_action_t
>>
>> Â /** The operation skipped the path because it was conflicted.
>> Â Â * @since New in 1.7. */
>> - Â svn_wc_notify_skip_conflicted
>> + Â svn_wc_notify_skip_conflicted,
>> +
>> + Â /** Just the lock on a file was removed during update.
>> + Â * @since New in 1.8. */
>> + Â svn_wc_notify_update_broken_lock
>>
>> Â } svn_wc_notify_action_t;
>>
>>
>> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1329897&r1=1329896&r2=1329897&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
>> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Apr 24 18:01:23 2012
>> @@ -4582,6 +4582,11 @@ close_file(void *file_baton,
>> Â Â Â Â Â Â Â action = svn_wc_notify_update_add;
>> Â Â Â Â Â Â }
>> Â Â Â Â }
>> + Â Â Â else
>> + Â Â Â Â {
>> + Â Â Â Â Â SVN_ERR_ASSERT(lock_state == svn_wc_notify_lock_state_unlocked);
>> + Â Â Â Â Â action = svn_wc_notify_update_broken_lock;
>> + Â Â Â Â }
>>
>> Â Â Â /* If the file was moved-away, notify for the moved-away node.
>> Â Â Â Â * The original location only had its BASE info changed and
>>
>> Modified: subversion/trunk/subversion/svn/notify.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1329897&r1=1329896&r2=1329897&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/svn/notify.c (original)
>> +++ subversion/trunk/subversion/svn/notify.c Tue Apr 24 18:01:23 2012
>> @@ -181,6 +181,10 @@ notify(void *baton, const svn_wc_notify_
>> Â Â Â if ((err = svn_cmdline_printf(pool, "D Â Â %s\n", path_local)))
>> Â Â Â Â goto print_error;
>> Â Â Â break;
>> + Â Â case svn_wc_notify_update_broken_lock:
>> + Â Â Â if ((err = svn_cmdline_printf(pool, "B Â Â %s\n", path_local)))
>> + Â Â Â Â goto print_error;
>> + Â Â Â break;
>>
>> Â Â case svn_wc_notify_update_external_removed:
>> Â Â Â nb->received_some_change = TRUE;
>>
>> Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1329897&r1=1329896&r2=1329897&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
>> +++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Tue Apr 24 18:01:23 2012
>> @@ -1694,9 +1694,9 @@ def update_locked_deleted(sbox):
>> Â Â Â Â Â Â Â Â Â Â Â Â status='D ', writelocked='O')
>>
>> Â expected_output = svntest.wc.State(wc_dir, {
>> - Â Â 'A/mu' Â Â Â Â Â Â Â : Item(status=' Â '),
>> - Â Â 'A/B/E/alpha' Â Â Â : Item(status=' Â '),
>> - Â Â 'iota' Â Â Â Â Â Â Â : Item(status=' Â '),
>> + Â Â 'A/mu' Â Â Â Â Â Â Â : Item(status='B '),
>> + Â Â 'A/B/E/alpha' Â Â Â : Item(status='B '),
>> + Â Â 'iota' Â Â Â Â Â Â Â : Item(status='B '),
>> Â })
>>
>> Â svntest.actions.run_and_verify_update(wc_dir, expected_output,
>>
>> Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1329897&r1=1329896&r2=1329897&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
>> +++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Tue Apr 24 18:01:23 2012
>> @@ -98,7 +98,7 @@ _re_parse_skipped = re.compile("^Skipped
>>
>> Â _re_parse_summarize = re.compile("^([MAD ][M ]) Â Â Â (.+)\n")
>>
>> -_re_parse_checkout = re.compile('^([RMAGCUDE_ ][MAGCUDE_ ])'
>> +_re_parse_checkout = re.compile('^([RMAGCUDE_ B][MAGCUDE_ ])'
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '([B ])'
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '([CAUD ])\s+'
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â '(.+)')
>>
>>
>
>
>
> --
>
> uberSVN: Apache Subversion Made Easy
> http://www.uberSVN.com/
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Received on 2012-04-24 20:24:36 CEST