comparison tests/test_externals.py @ 218:a360ddc97719

branches: change handling again, but this time a little less magic. This change means that files located in the actual branches directory will now be wholly ignored. If we want to handle those correctly, it will take a reasonably large amount of work and probably a configuration flag. Also, any non-related paths outside of branches/trunk will be explicitly ignored, which is similar to the somewhat accidental pre-branch-refactor behavior. Finally, any unrelated files located as children of branches will cause the directory in branches to be used as the branch - not, as recently was the case, the directory immediately containing that file.
author Augie Fackler <durin42@gmail.com>
date Sat, 28 Mar 2009 16:38:57 -0500
parents b5ef9a404f5d
children ba8e91a7c077
comparison
equal deleted inserted replaced
217:6eb691a163cd 218:a360ddc97719
32 repo = self._load_fixture_and_fetch('externals.svndump', stupid=stupid) 32 repo = self._load_fixture_and_fetch('externals.svndump', stupid=stupid)
33 33
34 ref0 = """[.] 34 ref0 = """[.]
35 ^/externals/project1 deps/project1 35 ^/externals/project1 deps/project1
36 """ 36 """
37 self.assertEqual(ref0, repo[0+2]['.hgsvnexternals'].data()) 37 self.assertEqual(ref0, repo[0]['.hgsvnexternals'].data())
38 ref1 = """[.] 38 ref1 = """[.]
39 ^/externals/project1 deps/project1 39 ^/externals/project1 deps/project1
40 ^/externals/project2 deps/project2 40 ^/externals/project2 deps/project2
41 """ 41 """
42 self.assertEqual(ref1, repo[1+2]['.hgsvnexternals'].data()) 42 self.assertEqual(ref1, repo[1]['.hgsvnexternals'].data())
43 43
44 ref2 = """[.] 44 ref2 = """[.]
45 ^/externals/project2 deps/project2 45 ^/externals/project2 deps/project2
46 [subdir] 46 [subdir]
47 ^/externals/project1 deps/project1 47 ^/externals/project1 deps/project1
48 [subdir2] 48 [subdir2]
49 ^/externals/project1 deps/project1 49 ^/externals/project1 deps/project1
50 """ 50 """
51 actual = repo[2+2]['.hgsvnexternals'].data() 51 actual = repo[2]['.hgsvnexternals'].data()
52 self.assertEqual(ref2, actual) 52 self.assertEqual(ref2, actual)
53 53
54 ref3 = """[.] 54 ref3 = """[.]
55 ^/externals/project2 deps/project2 55 ^/externals/project2 deps/project2
56 [subdir] 56 [subdir]
57 ^/externals/project1 deps/project1 57 ^/externals/project1 deps/project1
58 """ 58 """
59 self.assertEqual(ref3, repo[3+2]['.hgsvnexternals'].data()) 59 self.assertEqual(ref3, repo[3]['.hgsvnexternals'].data())
60 60
61 ref4 = """[subdir] 61 ref4 = """[subdir]
62 ^/externals/project1 deps/project1 62 ^/externals/project1 deps/project1
63 """ 63 """
64 self.assertEqual(ref4, repo[4+2]['.hgsvnexternals'].data()) 64 self.assertEqual(ref4, repo[4]['.hgsvnexternals'].data())
65 65
66 ref5 = """[.] 66 ref5 = """[.]
67 ^/externals/project2 deps/project2 67 ^/externals/project2 deps/project2
68 [subdir2] 68 [subdir2]
69 ^/externals/project1 deps/project1 69 ^/externals/project1 deps/project1
70 """ 70 """
71 self.assertEqual(ref5, repo[5+2]['.hgsvnexternals'].data()) 71 self.assertEqual(ref5, repo[5]['.hgsvnexternals'].data())
72 72
73 ref6 = """[.] 73 ref6 = """[.]
74 ^/externals/project2 deps/project2 74 ^/externals/project2 deps/project2
75 """ 75 """
76 self.assertEqual(ref6, repo[6+2]['.hgsvnexternals'].data()) 76 self.assertEqual(ref6, repo[6]['.hgsvnexternals'].data())
77 77
78 def test_externals_stupid(self): 78 def test_externals_stupid(self):
79 self.test_externals(True) 79 self.test_externals(True)
80 80
81 81