stsp@tigris.org wrote:
> Author: stsp
> Date: Wed Dec 19 09:44:01 2007
> New Revision: 28567
>
> Log:
> On the tree-conflicts branch, make 'svn status' aware of tree conflicts.
>
> This includes making 'svn status' print a 'C' in the first column
> for tree-conflicted directories, and adding the ability to query
> tree conflict information via 'svn status --show-tree-conflicts'.
> The shorthand "svn status -t" was added for new option because we
> expect it to be used interactively a lot.
>
> 'svn status --show-tree-conflicts' does not yet work with '--xml',
> this is still a todo item.
>
> * subversion/include/svn_wc.h
> (svn_wc_status2_t): Add new member tree_status.
> * subversion/libsvn_wc/status.c
> (dir_baton): Add new member tree_conflicted.
> (assemble_status): Initilise new tree_status member of svn_wc_status2_t, and
> use svn_wc_conflicted_p2 to handle tree conflicts.
> (is_sendable_status): Send tree-conflict information if applicable.
> (close_directory): Set tree_status to svn_wc_status_conflicted if a
> tree conflict was detected.
> * subversion/tests/cmdline/update_tests.py
> (tree_conflicts_in_updated_files): Change expected output of 'svn status',
> it now prints a C for tree-conflicted directories.
> * subversion/svn/cl.h
> (svn_cl__opt_state_t): Add new member show_tree_conflicts.
> (svn_cl__print_commit_info): Add new parameter show_tree_conflicts and
> document it.
> * subversion/svn/status.c
> (print_status): Add new parameter show_tree_conflicts. If the latter
> is true, use API functions in libsvn_wc that were recently added on
> this branch to get possibly localised human readable tree conflict
> descriptions and print them.
> (svn_cl__print_status): Add new parameter show_tree_conflicts, pass
> its value down to print_status.
> * subversion/svn/main.c
> (svn_cl__options): Add new option --show-tree-conflicts (alias '-t').
> (svn_cl__cmd_table): Add new option to 'svn status' subcommand.
> (main): Handle new option. Add comment about '-t' implying '-v' because
> of the way svn_wc_client3 currently works.
> * subversion/svn/status-cmd.c
> (status_baton): Add new member show_tree_conflicts.
> (print_status_normal_or_xml): Pass new member in status_baton as
> parameter to svn_cl__print_status.
> (svn_cl__status): Initialise new show_tree_conflicts member of status_baton.
I haven't looked at the patch, but do have a comment on the log message.
We typically insert a newline between files in the detailed section of
the message, to improve readability. Not really a big deal, just
letting you know for next time.
Thanks for the good work!
-Hyrum
Received on Wed Dec 19 18:51:03 2007