You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/10/28 17:29:44 UTC
svn commit: r1711048 -
/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Author: julianfoad
Date: Wed Oct 28 16:29:44 2015
New Revision: 1711048
URL: http://svn.apache.org/viewvc?rev=1711048&view=rev
Log:
On the 'move-tracking-2' branch: Tweak 'svnmover' notifications.
* subversion/svnmover/svnmover.c
(svnmover_notify_v): Print these verbose-mode-only notifications in blue
instead of green.
(list_branch):Use a normal notification, not verbose-mode-only, for the
branch description.
(execute): Let the 'info-wc' subcommand also state whether the WC has
modifications.
Modified:
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1711048&r1=1711047&r2=1711048&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Oct 28 16:29:44 2015
@@ -175,7 +175,7 @@ svnmover_notify_v(const char *fmt,
if (! quiet)
{
- settext(TEXT_FG_GREEN);
+ settext(TEXT_FG_BLUE);
va_start(ap, fmt);
vprintf(fmt, ap);
va_end(ap);
@@ -1175,7 +1175,7 @@ list_branch(svn_branch_state_t *branch,
svn_boolean_t with_elements,
apr_pool_t *scratch_pool)
{
- svnmover_notify_v(" %s", branch_id_str(branch, scratch_pool));
+ svnmover_notify(" %s", branch_id_str(branch, scratch_pool));
if (with_elements)
{
@@ -2686,10 +2686,17 @@ execute(svnmover_wc_t *wc,
switch (action->action)
{
case ACTION_INFO_WC:
- svnmover_notify("Repository Root: %s", wc->repos_root_url);
- svnmover_notify("Base Revision: %ld", wc->base->revision);
- svnmover_notify("Base Branch: %s", wc->base->branch_id);
- svnmover_notify("Working Branch: %s", wc->working->branch_id);
+ {
+ svn_boolean_t is_modified;
+
+ SVN_ERR(txn_is_changed(wc->working->branch->txn, &is_modified,
+ iterpool));
+ svnmover_notify("Repository Root: %s", wc->repos_root_url);
+ svnmover_notify("Base Revision: %ld", wc->base->revision);
+ svnmover_notify("Base Branch: %s", wc->base->branch_id);
+ svnmover_notify("Working Branch: %s", wc->working->branch_id);
+ svnmover_notify("Modified: %s", is_modified ? "yes" : "no");
+ }
break;
case ACTION_DIFF: