You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/08/25 21:57:05 UTC
svn commit: r989327 - in /subversion/trunk/subversion: svn/main.c
tests/cmdline/diff_tests.py
Author: stsp
Date: Wed Aug 25 19:57:05 2010
New Revision: 989327
URL: http://svn.apache.org/viewvc?rev=989327&view=rev
Log:
Rename the --git-diff option to --git for consistency with Mercurial.
* subversion/svn/main.c
(svn_cl__options): Rename "--git-diff" option to "--git".
* subversion/tests/cmdline/diff_tests.py:
(diff_git_format_wc_wc, diff_git_format_url_wc,
diff_git_format_url_url, diff_git_empty_files): Adjust.
Patch by: anatoly techtonik <te...@gmail.com>
(log message tweaked slightly by me)
Modified:
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=989327&r1=989326&r2=989327&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Aug 25 19:57:05 2010
@@ -368,7 +368,7 @@ const apr_getopt_option_t svn_cl__option
N_("override diff-cmd specified in config file\n"
" "
"[alias: --idiff]")},
- {"git-diff", opt_use_git_diff_format, 0,
+ {"git", opt_use_git_diff_format, 0,
N_("use git's extended diff format\n")},
/* Long-opt Aliases
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=989327&r1=989326&r2=989327&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed Aug 25 19:57:05 2010
@@ -3394,7 +3394,7 @@ def diff_git_format_wc_wc(sbox):
"working copy", copyfrom=lambda_path)
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
- '--git-diff', wc_dir)
+ '--git', wc_dir)
def diff_git_format_url_wc(sbox):
"create a diff in git unidiff format for url-wc"
@@ -3433,7 +3433,7 @@ def diff_git_format_url_wc(sbox):
]
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
- '--git-diff',
+ '--git',
'--old', repo_url + '@1', '--new',
wc_dir)
@@ -3473,7 +3473,7 @@ def diff_git_format_url_url(sbox):
]
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
- '--git-diff',
+ '--git',
'--old', repo_url + '@1', '--new',
repo_url + '@2')
@@ -3641,7 +3641,7 @@ def diff_git_empty_files(sbox):
delete=True, text_changes=False)
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
- '--git-diff', wc_dir)
+ '--git', wc_dir)
########################################################################