[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] (v2) Fixed issue 3436 : Short option for --ignore-externals (-i?)

From: Edmund Wong <ed_at_kdtc.net>
Date: Wed, 02 Sep 2009 16:37:28 +0800

Stefan Sperling wrote:
>
> Sounds good. The test tests for the semantics of the --ignore-externals
> option, which you've shortened to --ie. So for --ie this should work
> just as well.

Exactly.

>> +#----------------------------------------------------------------------
>> +
>> +# Test for issue #3436
>
> I'd simply drop the above comment.
> It might be a bit confusing, as #3436 is really about adding an alias
> for an existing command line option, rather than about "exports from
> a WC without externals". Testing the new --ie option is just a
> desirable side-effect of this new test, which tests whether ignoring
> externals works when exporting from a working copy.
>
>> +def export_wc_without_externals(sbox):
>> + "test exports from wc without externals"
>
> "export from working copy, ignoring externals"

I found out the hard way that I'm limited to 50 characters
and wanted to express that I was using the short cut,
which I still failed to put in. You know, to be more
specific.

I'll drop that comment.

>
>> +
>> + externals_test_setup(sbox)
>> +
>> + wc_dir = sbox.wc_dir
>> + repo_url = sbox.repo_url
>> + export_target = sbox.add_wc_path('export')
>> +
>> + # Create a working copy.
>> + svntest.actions.run_and_verify_svn(None, None, [],
>> + 'checkout',
>> + repo_url, wc_dir)
>> +
>> + # Export the working copy without externals
>> + svntest.actions.run_and_verify_svn(None, None, [],
>> + 'export', '--ie',
>> + wc_dir, export_target)
>> +
>> + paths = [
>> + os.path.join(export_target, "A", "D", "x"),
>> + os.path.join(export_target, "A", "D", "x", "y"),
>> + os.path.join(export_target, "A", "D", "x", "y", "z"),
>> + os.path.join(export_target, "A", "D", "x", "y", "z", "blah"),
>> + os.path.join(export_target, "A", "D", "x", "y", "z", "blah", "E", "alpha"),
>> + os.path.join(export_target, "A", "D", "x", "y", "z", "blah", "E", "beta"),
>> + ]
>> +# probe_paths_exist(paths)
>
> Why is the above line present?

To be honest, I wasn't sure which one to use so I thought
carefully about it and decided it was the missing paths that
I was interested in rather than whatever paths exist.
Now that I've thought about it, it works both ways. If only
the existing paths exist, then it works but I'd need to
fiddle with the paths construct.

>> ########################################################################
>> # Run the tests
>>
>> @@ -1406,6 +1442,7 @@
>> XFail(update_lose_file_external),
>> XFail(switch_relative_external),
>> export_sparse_wc_with_externals,
>> + export_wc_without_externals,
>> ]
>>
>> if __name__ == '__main__':
>> Index: subversion/svn/main.c
>> ===================================================================
>> --- subversion/svn/main.c (revision 39017)
>> +++ subversion/svn/main.c (working copy)
>> @@ -226,7 +226,9 @@
>> {"ignore-ancestry", opt_ignore_ancestry, 0,
>> N_("ignore ancestry when calculating merges")},
>> {"ignore-externals", opt_ignore_externals, 0,
>> - N_("ignore externals definitions")},
>> + N_("ignore externals definitions\n"
>> + " "
>> + "[aliases: --e]")},
>
> This should say --ie not --e.

Yes, I goofed there. So I made two more attempts at fixing the
above. First was a missing ' ' at the end of the empty space.
Second was the missing 'i'. I fixed one, but didn't see the
missing 'i' until I ran the getopt_tests.py. Was really
too hasty in putting this patch out. I gotta watch it next
time.

Edmund

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2390091
Received on 2009-09-02 10:43:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.