You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/08/30 17:50:46 UTC
svn commit: r990830 -
/subversion/trunk/subversion/tests/cmdline/diff_tests.py
Author: dannas
Date: Mon Aug 30 15:50:46 2010
New Revision: 990830
URL: http://svn.apache.org/viewvc?rev=990830&view=rev
Log:
Revert r990772 and r990774. "Adjust diff tests to include copied paths".
It turns out that determing copyfrom information is more involved
than I first anticipated. We first need a proper definition of
what kind of information the server should send.
Modified:
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=990830&r1=990829&r2=990830&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Mon Aug 30 15:50:46 2010
@@ -3420,37 +3420,17 @@ def diff_git_format_url_wc(sbox):
iota_path = os.path.join(wc_dir, 'iota')
mu_path = os.path.join(wc_dir, 'A', 'mu')
new_path = os.path.join(wc_dir, 'new')
- lambda_path = os.path.join(wc_dir, 'A', 'B', 'lambda')
- lambda_copied_path = os.path.join(wc_dir, 'A', 'B', 'lambda_copied')
- alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
- alpha_copied_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha_copied')
-
svntest.main.file_append(iota_path, "Changed 'iota'.\n")
svntest.main.file_append(new_path, "This is the file 'new'.\n")
svntest.main.run_svn(None, 'add', new_path)
svntest.main.run_svn(None, 'rm', mu_path)
- svntest.main.run_svn(None, 'cp', lambda_path, lambda_copied_path)
- svntest.main.run_svn(None, 'cp', alpha_path, alpha_copied_path)
- svntest.main.file_append(alpha_copied_path, "This is a copy of 'alpha'.\n")
- ### We're not testing moved paths
+ ### We're not testing copied or moved paths
svntest.main.run_svn(None, 'commit', '-m', 'Committing changes', wc_dir)
svntest.main.run_svn(None, 'up', wc_dir)
- expected_output = make_git_diff_header(lambda_copied_path,
- "A/B/lambda_copied",
- "revision 1", "working copy",
- copyfrom_path="A/B/lambda", cp=True,
- text_changes=False) \
- + make_git_diff_header(alpha_copied_path, "A/B/E/alpha_copied",
- "revision 0", "working copy",
- copyfrom_path="A/B/E/alpha", cp=True,
- text_changes=True) + [
- "@@ -1 +1,2 @@\n",
- " This is the file 'alpha'.\n",
- "+This is a copy of 'alpha'.\n",
- ] + make_git_diff_header(new_path, "new", "revision 0",
+ expected_output = make_git_diff_header(new_path, "new", "revision 0",
"revision 2", add=True) + [
"@@ -0,0 +1 @@\n",
"+This is the file 'new'.\n",
@@ -3478,38 +3458,18 @@ def diff_git_format_url_url(sbox):
iota_path = os.path.join(wc_dir, 'iota')
mu_path = os.path.join(wc_dir, 'A', 'mu')
new_path = os.path.join(wc_dir, 'new')
- lambda_path = os.path.join(wc_dir, 'A', 'B', 'lambda')
- lambda_copied_path = os.path.join(wc_dir, 'A', 'B', 'lambda_copied')
- alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
- alpha_copied_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha_copied')
-
svntest.main.file_append(iota_path, "Changed 'iota'.\n")
svntest.main.file_append(new_path, "This is the file 'new'.\n")
svntest.main.run_svn(None, 'add', new_path)
svntest.main.run_svn(None, 'rm', mu_path)
- svntest.main.run_svn(None, 'cp', lambda_path, lambda_copied_path)
- svntest.main.run_svn(None, 'cp', alpha_path, alpha_copied_path)
- svntest.main.file_append(alpha_copied_path, "This is a copy of 'alpha'.\n")
- ### We do not test moved paths. We propably won't be able to track those
- ### until we have editor-v2.
+ ### We're not testing copied or moved paths. When we do, we will not be
+ ### able to identify them as copies/moves until we have editor-v2.
svntest.main.run_svn(None, 'commit', '-m', 'Committing changes', wc_dir)
svntest.main.run_svn(None, 'up', wc_dir)
- expected_output = make_git_diff_header(lambda_copied_path,
- "A/B/lambda_copied",
- "revision 1", "revision 2",
- copyfrom_path="A/B/lambda", cp=True,
- text_changes=False) \
- + make_git_diff_header(alpha_copied_path, "A/B/E/alpha_copied",
- "revision 1", "revision 2",
- copyfrom_path="A/B/E/alpha", cp=True,
- text_changes=True) + [
- "@@ -1 +1,2 @@\n",
- " This is the file 'alpha'.\n",
- "+This is a copy of 'alpha'.\n",
- ] + make_git_diff_header("A/mu", "A/mu", "revision 1",
+ expected_output = make_git_diff_header("A/mu", "A/mu", "revision 1",
"revision 2",
delete=True) + [
"@@ -1 +0,0 @@\n",
@@ -3800,8 +3760,8 @@ test_list = [ None,
XFail(diff_url_against_local_mods),
XFail(diff_preexisting_rev_against_local_add),
diff_git_format_wc_wc,
- XFail(diff_git_format_url_wc),
- XFail(diff_git_format_url_url),
+ diff_git_format_url_wc,
+ diff_git_format_url_url,
diff_prop_missing_context,
diff_prop_multiple_hunks,
diff_git_empty_files,