Author: stsp Date: Mon Dec 12 17:08:50 2011 New Revision: 1213314 URL: http://svn.apache.org/viewvc?rev=1213314&view=rev Log: On the 1.7.x-r1210147 branch, merge r1202132, r1202333, and r1210147 from trunk, resolving conflicts.
Modified: subversion/branches/1.7.x-r1210147/ (props changed) subversion/branches/1.7.x-r1210147/subversion/svn/log-cmd.c subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/log_tests.py Propchange: subversion/branches/1.7.x-r1210147/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 12 17:08:50 2011 @@ -69,4 +69,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115 6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090, 1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115 6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090, 1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533,1210147 Modified: subversion/branches/1.7.x-r1210147/subversion/svn/log-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/svn/log-cmd.c?rev=1213314&r1=1213313&r2=1213314&view=diff ============================================================================== --- subversion/branches/1.7.x-r1210147/subversion/svn/log-cmd.c (original) +++ subversion/branches/1.7.x-r1210147/subversion/svn/log-cmd.c Mon Dec 12 17:08:50 2011 @@ -51,8 +51,9 @@ struct log_receiver_baton /* Client context. */ svn_client_ctx_t *ctx; - /* The URL target of the log operation. */ - const char *target_url; + /* The target of the log operation. */ + const char *target_path_or_url; + svn_opt_revision_t target_peg_revision; /* Don't print log message body nor its line count. */ svn_boolean_t omit_log_message; @@ -283,7 +284,6 @@ log_entry_receiver(void *baton, apr_status_t status; svn_opt_revision_t start_revision; svn_opt_revision_t end_revision; - svn_error_t *err; if ((status = apr_file_open_stdout(&outfile, pool))) return svn_error_wrap_apr(status, _("Can't open stdout")); @@ -303,82 +303,22 @@ log_entry_receiver(void *baton, end_revision.value.number = log_entry->revision; SVN_ERR(svn_cmdline_printf(pool, _("\n"))); - err = svn_client_diff5(diff_options, - lb->target_url, - &start_revision, - lb->target_url, - &end_revision, - NULL, - lb->depth, - FALSE, /* ignore ancestry */ - TRUE, /* no diff deleted */ - FALSE, /* show copies as adds */ - FALSE, /* ignore content type */ - FALSE, /* use git diff format */ - svn_cmdline_output_encoding(pool), - outfile, - errfile, - NULL, - lb->ctx, pool); - if (err) - { - /* We get a "path not found" error in case the revision created - * lb->target_url. Try to show a diff from the parent instead. */ - if (err->apr_err == SVN_ERR_FS_NOT_FOUND) - { - const char *parent; - apr_pool_t *iterpool; - - svn_error_clear(err); - - parent = svn_uri_dirname(lb->target_url, pool); - iterpool = svn_pool_create(pool); - while (strcmp(parent, lb->target_url) != 0) - { - svn_pool_clear(iterpool); - err = svn_client_diff5(diff_options, - parent, - &start_revision, - parent, - &end_revision, - NULL, - lb->depth, - FALSE, /* ignore ancestry */ - TRUE, /* no diff deleted */ - FALSE, /* show copies as adds */ - FALSE, /* ignore content type */ - FALSE, /* use git diff format */ - svn_cmdline_output_encoding(iterpool), - outfile, - errfile, - NULL, - lb->ctx, iterpool); - if (err == SVN_NO_ERROR) - break; - else - { - if (err->apr_err == SVN_ERR_FS_NOT_FOUND) - { - svn_error_clear(err); - parent = svn_uri_dirname(parent, pool); - continue; - } - if (err->apr_err == SVN_ERR_RA_ILLEGAL_URL || - err->apr_err == SVN_ERR_AUTHZ_UNREADABLE || - err->apr_err == SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED) - { - svn_error_clear(err); - break; - } - return svn_error_trace(err); - } - } - svn_pool_destroy(iterpool); - } - else - return svn_error_trace(err); - } - + SVN_ERR(svn_client_diff_peg5(diff_options, + lb->target_path_or_url, + &lb->target_peg_revision, + &start_revision, &end_revision, + NULL, + lb->depth, + FALSE, /* ignore ancestry */ + TRUE, /* no diff deleted */ + FALSE, /* show copies as adds */ + FALSE, /* ignore content type */ + FALSE, /* use git diff format */ + svn_cmdline_output_encoding(pool), + outfile, + errfile, + NULL, + lb->ctx, pool)); SVN_ERR(svn_cmdline_printf(pool, _("\n"))); } @@ -571,8 +511,6 @@ svn_cl__log(apr_getopt_t *os, struct log_receiver_baton lb; const char *target; int i; - svn_opt_revision_t peg_revision; - const char *true_path; apr_array_header_t *revprops; if (!opt_state->xml) @@ -626,8 +564,6 @@ svn_cl__log(apr_getopt_t *os, /* Add "." if user passed 0 arguments */ svn_opt_push_implicit_dot_target(targets, pool); - target = APR_ARRAY_IDX(targets, 0, const char *); - /* Determine if they really want a two-revision range. */ if (opt_state->used_change_arg) { @@ -649,9 +585,15 @@ svn_cl__log(apr_getopt_t *os, } } - /* Strip peg revision. */ - SVN_ERR(svn_opt_parse_path(&peg_revision, &true_path, target, pool)); - APR_ARRAY_IDX(targets, 0, const char *) = true_path; + /* Parse the first target into path-or-url and peg revision. */ + target = APR_ARRAY_IDX(targets, 0, const char *); + SVN_ERR(svn_opt_parse_path(&lb.target_peg_revision, &lb.target_path_or_url, + target, pool)); + if (lb.target_peg_revision.kind == svn_opt_revision_unspecified) + lb.target_peg_revision.kind = (svn_path_is_url(target) + ? svn_opt_revision_head + : svn_opt_revision_working); + APR_ARRAY_IDX(targets, 0, const char *) = lb.target_path_or_url; if (svn_path_is_url(target)) { @@ -670,8 +612,6 @@ svn_cl__log(apr_getopt_t *os, lb.ctx = ctx; lb.omit_log_message = opt_state->quiet; - SVN_ERR(svn_client_url_from_path2(&lb.target_url, true_path, ctx, - pool, pool)); lb.show_diff = opt_state->show_diff; lb.depth = opt_state->depth == svn_depth_unknown ? svn_depth_infinity : opt_state->depth; @@ -722,7 +662,7 @@ svn_cl__log(apr_getopt_t *os, APR_ARRAY_PUSH(revprops, const char *) = SVN_PROP_REVISION_LOG; } SVN_ERR(svn_client_log5(targets, - &peg_revision, + &lb.target_peg_revision, opt_state->revision_ranges, opt_state->limit, opt_state->verbose, @@ -745,7 +685,7 @@ svn_cl__log(apr_getopt_t *os, if (!opt_state->quiet) APR_ARRAY_PUSH(revprops, const char *) = SVN_PROP_REVISION_LOG; SVN_ERR(svn_client_log5(targets, - &peg_revision, + &lb.target_peg_revision, opt_state->revision_ranges, opt_state->limit, opt_state->verbose, Modified: subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/log_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/log_tests.py?rev=1213314&r1=1213313&r2=1213314&view=diff ============================================================================== --- subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/log_tests.py (original) +++ subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/log_tests.py Mon Dec 12 17:08:50 2011 @@ -2028,6 +2028,45 @@ def log_on_nonexistent_path_and_valid_re svntest.actions.run_and_verify_svn(None, None, expected_error, 'log', '-q', bad_path_default_rev) +#---------------------------------------------------------------------- +def log_diff(sbox): + "'svn log --diff'" + + guarantee_repos_and_wc(sbox) + + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + + exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + 'log', '--diff') + os.chdir(was_cwd) + + for line in output: + if line.startswith('Index:'): + break + else: + raise SVNLogParseError("no diffs found in log output") + + # After a copy, a log of the copy destination used to fail because the + # diff tried to use the head-revision URL with the old revision numbers + # without using the correct peg revision. + + sbox.simple_copy('A', 'A2') + sbox.simple_commit() + + os.chdir(sbox.wc_dir) + exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + 'log', '--diff', + '-r10:8', 'A2') + os.chdir(was_cwd) + + for line in output: + if line.startswith('Index:'): + break + else: + raise SVNLogParseError("no diffs found in log output") + + ######################################################################## # Run the tests @@ -2067,6 +2106,7 @@ test_list = [ None, merge_sensitive_log_ignores_cyclic_merges, log_with_unrelated_peg_and_operative_revs, log_on_nonexistent_path_and_valid_rev, + log_diff, ] if __name__ == '__main__':