On 10/14/2016 8:53 PM, Daniel Shahaf wrote:
Stefan wrote on Fri, Oct 14, 2016 at 17:30:57 +0200:
Add an XFail test for issue #4642 (Setting depth to exclude for a path
containing unversioned files requires a cleanup afterwards).
Looks good overall. Just a few minor questions:
+def fold_tree_with_unversioned_items(sbox):
+ "unversioned files in excluded directory"
+ ign_a, ign_b, ign_c, wc_dir = set_up_depthy_working_copies(sbox,
+ infinity=True)
I see that "ign_a" is a preëxisting convention throughout the file.
It's unfortunate we have our own convention, since there's already
a Python convention for an ignored value in a tuple unpacking: using "_"
as the assigned-to variable name.
+ # create an unversioned directory within a versioned one
+ A_path = sbox.ospath('A')
+ A_local_path = os.path.join(A_path, 'A_local')
+ os.mkdir(A_local_path)
+
+ # Set A to be excluded.
+ svntest.main.run_svn(None, 'update', '--set-depth=exclude', A_path)
+
+ # try a simple update afterwards
+ svntest.main.run_svn(None, 'update', wc_dir)
Don't we prefer «sbox.simple_update()» for new code?
@@ -3009,6 +3027,7 @@
spurious_nodes_row,
commit_excluded,
fold_tree_with_deleted_moved_items,
+ fold_tree_with_unversioned_items,
Both of these lines use tabs instead of spaces.
Thanks for the review Daniel. Just a quick heads up that I'll get back
to this asap. Might take a few days until I can free up some time though.
--
Regards,
Stefan Hett, Developer/Administrator
EGOSOFT GmbH, Heidestrasse 4, 52146 Würselen, Germany
Tel: +49 2405 4239970, www.egosoft.com
Geschäftsführer: Bernd Lehahn, Handelsregister Aachen HRB 13473
