comparison tests/test_utility_commands.py @ 1503:180e0d5fba2e

join: remove uses of repo.join/wjoin Upstream Mercurial has dropped these functions as of 4.3. Let's switch to the appropriate repo.[w]vfs.join functions.
author Durham Goode <durham@fb.com>
date Tue, 09 May 2017 15:20:16 -0700
parents e73df57b2b07
children 0ebcc5bbf692
comparison
equal deleted inserted replaced
1502:fb91566d849c 1503:180e0d5fba2e
126 def test_info_custom_single(self): 126 def test_info_custom_single(self):
127 self.test_info_single(custom=True) 127 self.test_info_single(custom=True)
128 128
129 def test_missing_metadata(self): 129 def test_missing_metadata(self):
130 self._load_fixture_and_fetch('two_heads.svndump') 130 self._load_fixture_and_fetch('two_heads.svndump')
131 os.remove(self.repo.join('svn/branch_info')) 131 os.remove(self.repo.vfs.join('svn/branch_info'))
132 svncommands.updatemeta(self.ui(), self.repo, []) 132 svncommands.updatemeta(self.ui(), self.repo, [])
133 133
134 test_util.rmtree(self.repo.join('svn')) 134 test_util.rmtree(self.repo.vfs.join('svn'))
135 self.assertRaises(hgutil.Abort, 135 self.assertRaises(hgutil.Abort,
136 self.repo.svnmeta) 136 self.repo.svnmeta)
137 self.assertRaises(hgutil.Abort, 137 self.assertRaises(hgutil.Abort,
138 svncommands.info, 138 svncommands.info,
139 self.ui(), repo=self.repo, args=[]) 139 self.ui(), repo=self.repo, args=[])
140 self.assertRaises(hgutil.Abort, 140 self.assertRaises(hgutil.Abort,
141 svncommands.genignore, 141 svncommands.genignore,
142 self.ui(), repo=self.repo, args=[]) 142 self.ui(), repo=self.repo, args=[])
143 143
144 os.remove(self.repo.join('hgrc')) 144 os.remove(self.repo.vfs.join('hgrc'))
145 self.assertRaises(hgutil.Abort, 145 self.assertRaises(hgutil.Abort,
146 self.repo.svnmeta) 146 self.repo.svnmeta)
147 self.assertRaises(hgutil.Abort, 147 self.assertRaises(hgutil.Abort,
148 svncommands.info, 148 svncommands.info,
149 self.ui(), repo=self.repo, args=[]) 149 self.ui(), repo=self.repo, args=[])