1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411
|
/*
* diff-cmd.c -- Display context diff of a file
*
* ====================================================================
* Copyright (c) 2000-2007 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://subversion.tigris.org/license-1.html.
* If newer versions of this license are posted there, you may use a
* newer version instead, at your option.
*
* This software consists of voluntary contributions made by many
* individuals. For exact contribution history, see the revision
* history and logs, available at http://subversion.tigris.org/.
* ====================================================================
*/
/* ==================================================================== */
/*** Includes. ***/
#include "svn_pools.h"
#include "svn_client.h"
#include "svn_string.h"
#include "svn_path.h"
#include "svn_error_codes.h"
#include "svn_error.h"
#include "svn_types.h"
#include "svn_cmdline.h"
#include "svn_xml.h"
#include "cl.h"
#include "svn_private_config.h"
/*** Code. ***/
/* Convert KIND into a single character for display to the user. */
static char
kind_to_char(svn_client_diff_summarize_kind_t kind)
{
switch (kind)
{
case svn_client_diff_summarize_kind_modified:
return 'M';
case svn_client_diff_summarize_kind_added:
return 'A';
case svn_client_diff_summarize_kind_deleted:
return 'D';
default:
return ' ';
}
}
/* Convert KIND into a word describing the kind to the user. */
static const char *
kind_to_word(svn_client_diff_summarize_kind_t kind)
{
switch (kind)
{
case svn_client_diff_summarize_kind_modified: return "modified";
case svn_client_diff_summarize_kind_added: return "added";
case svn_client_diff_summarize_kind_deleted: return "deleted";
default: return "none";
}
}
/* Print summary information about a given change as XML, implements the
* svn_client_diff_summarize_func_t interface. The @a baton is a 'char *'
* representing the either the path to the working copy root or the url
* the path the working copy root corresponds to. */
static svn_error_t *
summarize_xml(const svn_client_diff_summarize_t *summary,
void *baton,
apr_pool_t *pool)
{
/* Full path to the object being diffed. This is created by taking the
* baton, and appending the target's relative path. */
const char *path = baton;
svn_stringbuf_t *sb = svn_stringbuf_create("", pool);
/* Tack on the target path, so we can differentiate between different parts
* of the output when we're given multiple targets. */
path = svn_path_join(path, summary->path, pool);
/* Convert non-urls to local style, so that things like "" show up as "." */
if (! svn_path_is_url(path))
path = svn_path_local_style(path, pool);
svn_xml_make_open_tag(&sb, pool, svn_xml_protect_pcdata, "path",
"kind", svn_cl__node_kind_str(summary->node_kind),
"item", kind_to_word(summary->summarize_kind),
"props", summary->prop_changed ? "modified" : "none",
NULL);
svn_xml_escape_cdata_cstring(&sb, path, pool);
svn_xml_make_close_tag(&sb, pool, "path");
SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
return SVN_NO_ERROR;
}
/* Print summary information about a given change, implements the
* svn_client_diff_summarize_func_t interface. */
static svn_error_t *
summarize_regular(const svn_client_diff_summarize_t *summary,
void *baton,
apr_pool_t *pool)
{
const char *path = baton;
/* Tack on the target path, so we can differentiate between different parts
* of the output when we're given multiple targets. */
path = svn_path_join(path, summary->path, pool);
/* Convert non-urls to local style, so that things like "" show up as "." */
if (! svn_path_is_url(path))
path = svn_path_local_style(path, pool);
/* Note: This output format tries to look like the output of 'svn status',
* thus the blank spaces where information that is not relevant to
* a diff summary would go. */
SVN_ERR(svn_cmdline_printf(pool,
"%c%c %s\n",
kind_to_char(summary->summarize_kind),
summary->prop_changed ? 'M' : ' ',
path));
SVN_ERR(svn_cmdline_fflush(stdout));
return SVN_NO_ERROR;
}
/* An svn_opt_subcommand_t to handle the 'diff' command.
This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__diff(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
apr_array_header_t *options;
apr_array_header_t *targets;
apr_file_t *outfile, *errfile;
apr_status_t status;
const char *old_target, *new_target;
apr_pool_t *iterpool;
svn_boolean_t pegged_diff = FALSE;
int i;
const svn_client_diff_summarize_func_t summarize_func =
(opt_state->xml ? summarize_xml : summarize_regular);
/* Fall back to "" to get options initialized either way. */
{
const char *optstr = opt_state->extensions ? opt_state->extensions : "";
options = svn_cstring_split(optstr, " \t\n\r", TRUE, pool);
}
/* Get an apr_file_t representing stdout and stderr, which is where
we'll have the external 'diff' program print to. */
if ((status = apr_file_open_stdout(&outfile, pool)))
return svn_error_wrap_apr(status, _("Can't open stdout"));
if ((status = apr_file_open_stderr(&errfile, pool)))
return svn_error_wrap_apr(status, _("Can't open stderr"));
if (opt_state->xml)
{
svn_stringbuf_t *sb;
/* Check that the --summarize is passed as well. */
if (!opt_state->summarize)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'--xml' option only valid with "
"'--summarize' option"));
SVN_ERR(svn_cl__xml_print_header("diff", pool));
sb = svn_stringbuf_create("", pool);
svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "paths", NULL);
SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
}
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
pool));
if (! opt_state->old_target && ! opt_state->new_target
&& (targets->nelts == 2)
&& svn_path_is_url(APR_ARRAY_IDX(targets, 0, const char *))
&& svn_path_is_url(APR_ARRAY_IDX(targets, 1, const char *))
&& opt_state->start_revision.kind == svn_opt_revision_unspecified
&& opt_state->end_revision.kind == svn_opt_revision_unspecified)
{
/* The 'svn diff OLD_URL[@OLDREV] NEW_URL[@NEWREV]' case matches. */
SVN_ERR(svn_opt_parse_path(&opt_state->start_revision, &old_target,
APR_ARRAY_IDX(targets, 0, const char *),
pool));
SVN_ERR(svn_opt_parse_path(&opt_state->end_revision, &new_target,
APR_ARRAY_IDX(targets, 1, const char *),
pool));
targets->nelts = 0;
if (opt_state->start_revision.kind == svn_opt_revision_unspecified)
opt_state->start_revision.kind = svn_opt_revision_head;
if (opt_state->end_revision.kind == svn_opt_revision_unspecified)
opt_state->end_revision.kind = svn_opt_revision_head;
}
else if (opt_state->old_target)
{
apr_array_header_t *tmp, *tmp2;
svn_opt_revision_t old_rev, new_rev;
/* The 'svn diff --old=OLD[@OLDREV] [--new=NEW[@NEWREV]]
[PATH...]' case matches. */
tmp = apr_array_make(pool, 2, sizeof(const char *));
APR_ARRAY_PUSH(tmp, const char *) = (opt_state->old_target);
APR_ARRAY_PUSH(tmp, const char *) = (opt_state->new_target
? opt_state->new_target
: APR_ARRAY_IDX(tmp, 0,
const char *));
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&tmp2, os, tmp,
pool));
SVN_ERR(svn_opt_parse_path(&old_rev, &old_target,
APR_ARRAY_IDX(tmp2, 0, const char *),
pool));
if (old_rev.kind != svn_opt_revision_unspecified)
opt_state->start_revision = old_rev;
SVN_ERR(svn_opt_parse_path(&new_rev, &new_target,
APR_ARRAY_IDX(tmp2, 1, const char *),
pool));
if (new_rev.kind != svn_opt_revision_unspecified)
opt_state->end_revision = new_rev;
if (opt_state->start_revision.kind == svn_opt_revision_unspecified)
opt_state->start_revision.kind = svn_path_is_url(old_target)
? svn_opt_revision_head : svn_opt_revision_base;
if (opt_state->end_revision.kind == svn_opt_revision_unspecified)
opt_state->end_revision.kind = svn_path_is_url(new_target)
? svn_opt_revision_head : svn_opt_revision_working;
}
else if (opt_state->new_target)
{
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'--new' option only valid with "
"'--old' option"));
}
else
{
svn_boolean_t working_copy_present = FALSE, url_present = FALSE;
/* The 'svn diff [-r N[:M]] [TARGET[@REV]...]' case matches. */
/* Here each target is a pegged object. Find out the starting
and ending paths for each target. */
svn_opt_push_implicit_dot_target(targets, pool);
old_target = "";
new_target = "";
/* Check to see if at least one of our paths is a working copy
path. */
for (i = 0; i < targets->nelts; ++i)
{
const char *path = APR_ARRAY_IDX(targets, i, const char *);
if (! svn_path_is_url(path))
working_copy_present = TRUE;
else
url_present = TRUE;
}
if (url_present && working_copy_present)
return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Target lists to diff may not contain "
"both working copy paths and URLs"));
if (opt_state->start_revision.kind == svn_opt_revision_unspecified
&& working_copy_present)
opt_state->start_revision.kind = svn_opt_revision_base;
if (opt_state->end_revision.kind == svn_opt_revision_unspecified)
opt_state->end_revision.kind = working_copy_present
? svn_opt_revision_working : svn_opt_revision_head;
/* Determine if we need to do pegged diffs. */
if ((opt_state->start_revision.kind != svn_opt_revision_base
&& opt_state->start_revision.kind != svn_opt_revision_working)
|| (opt_state->end_revision.kind != svn_opt_revision_base
&& opt_state->end_revision.kind != svn_opt_revision_working))
pegged_diff = TRUE;
}
svn_opt_push_implicit_dot_target(targets, pool);
iterpool = svn_pool_create(pool);
for (i = 0; i < targets->nelts; ++i)
{
const char *path = APR_ARRAY_IDX(targets, i, const char *);
const char *target1, *target2;
svn_pool_clear(iterpool);
if (! pegged_diff)
{
target1 = svn_path_join(old_target, path, iterpool);
target2 = svn_path_join(new_target, path, iterpool);
if (opt_state->summarize)
SVN_ERR(svn_client_diff_summarize2
(target1,
&opt_state->start_revision,
target2,
&opt_state->end_revision,
opt_state->depth,
opt_state->notice_ancestry ? FALSE : TRUE,
opt_state->changelists,
summarize_func,
(void *) target1,
((svn_cl__cmd_baton_t *)baton)->ctx,
iterpool));
else
SVN_ERR(svn_client_diff4
(options,
target1,
&(opt_state->start_revision),
target2,
&(opt_state->end_revision),
NULL,
opt_state->depth,
opt_state->notice_ancestry ? FALSE : TRUE,
opt_state->no_diff_deleted,
opt_state->force,
svn_cmdline_output_encoding(pool),
outfile,
errfile,
opt_state->changelists,
((svn_cl__cmd_baton_t *)baton)->ctx,
iterpool));
}
else
{
const char *truepath;
svn_opt_revision_t peg_revision;
/* First check for a peg revision. */
SVN_ERR(svn_opt_parse_path(&peg_revision, &truepath, path,
iterpool));
/* Set the default peg revision if one was not specified. */
if (peg_revision.kind == svn_opt_revision_unspecified)
peg_revision.kind = svn_path_is_url(path)
? svn_opt_revision_head : svn_opt_revision_working;
if (opt_state->summarize)
SVN_ERR(svn_client_diff_summarize_peg2
(truepath,
&peg_revision,
&opt_state->start_revision,
&opt_state->end_revision,
opt_state->depth,
opt_state->notice_ancestry ? FALSE : TRUE,
opt_state->changelists,
summarize_func,
(void *) truepath,
((svn_cl__cmd_baton_t *)baton)->ctx,
iterpool));
else
SVN_ERR(svn_client_diff_peg4
(options,
truepath,
&peg_revision,
&opt_state->start_revision,
&opt_state->end_revision,
NULL,
opt_state->depth,
opt_state->notice_ancestry ? FALSE : TRUE,
opt_state->no_diff_deleted,
opt_state->force,
svn_cmdline_output_encoding(pool),
outfile,
errfile,
opt_state->changelists,
((svn_cl__cmd_baton_t *)baton)->ctx,
iterpool));
}
}
if (opt_state->xml)
{
svn_stringbuf_t *sb = svn_stringbuf_create("", pool);
svn_xml_make_close_tag(&sb, pool, "paths");
SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
SVN_ERR(svn_cl__xml_print_footer("diff", pool));
}
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
|