Mercurial > hgsubversion

diff tests/test_externals.py @ 218:a360ddc97719

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test_externals.py
+++ b/tests/test_externals.py
@@ -34,12 +34,12 @@ class TestFetchExternals(test_util.TestB
         ref0 = """[.]
  ^/externals/project1 deps/project1
 """
-        self.assertEqual(ref0, repo[0+2]['.hgsvnexternals'].data())
+        self.assertEqual(ref0, repo[0]['.hgsvnexternals'].data())
         ref1 = """[.]
  ^/externals/project1 deps/project1
  ^/externals/project2 deps/project2
 """
-        self.assertEqual(ref1, repo[1+2]['.hgsvnexternals'].data())
+        self.assertEqual(ref1, repo[1]['.hgsvnexternals'].data())
 
         ref2 = """[.]
  ^/externals/project2 deps/project2
@@ -48,7 +48,7 @@ class TestFetchExternals(test_util.TestB
 [subdir2]
  ^/externals/project1 deps/project1
 """
-        actual = repo[2+2]['.hgsvnexternals'].data()
+        actual = repo[2]['.hgsvnexternals'].data()
         self.assertEqual(ref2, actual)
 
         ref3 = """[.]
@@ -56,24 +56,24 @@ class TestFetchExternals(test_util.TestB
 [subdir]
  ^/externals/project1 deps/project1
 """
-        self.assertEqual(ref3, repo[3+2]['.hgsvnexternals'].data())
+        self.assertEqual(ref3, repo[3]['.hgsvnexternals'].data())
 
         ref4 = """[subdir]
  ^/externals/project1 deps/project1
 """
-        self.assertEqual(ref4, repo[4+2]['.hgsvnexternals'].data())
+        self.assertEqual(ref4, repo[4]['.hgsvnexternals'].data())
 
         ref5 = """[.]
  ^/externals/project2 deps/project2
 [subdir2]
  ^/externals/project1 deps/project1
 """
-        self.assertEqual(ref5, repo[5+2]['.hgsvnexternals'].data())
+        self.assertEqual(ref5, repo[5]['.hgsvnexternals'].data())
 
         ref6 = """[.]
  ^/externals/project2 deps/project2
 """
-        self.assertEqual(ref6, repo[6+2]['.hgsvnexternals'].data())
+        self.assertEqual(ref6, repo[6]['.hgsvnexternals'].data())
 
     def test_externals_stupid(self):
         self.test_externals(True)