Mercurial > hgsubversion
comparison tests/comprehensive/test_stupid_pull.py @ 1346:538bbb927609
Merge with stable.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 11 Aug 2015 17:07:59 -0400 |
parents | c6b01fd34694 |
children | 89997a5fc181 |
comparison
equal
deleted
inserted
replaced
1341:7e10891666fe | 1346:538bbb927609 |
---|---|
17 | 17 |
18 | 18 |
19 def _do_case(self, name, layout): | 19 def _do_case(self, name, layout): |
20 subdir = test_util.subdir.get(name, '') | 20 subdir = test_util.subdir.get(name, '') |
21 config = {} | 21 config = {} |
22 u = ui.ui() | 22 u = test_util.testui() |
23 for branch, path in test_util.custom.get(name, {}).iteritems(): | 23 for branch, path in test_util.custom.get(name, {}).iteritems(): |
24 config['hgsubversionbranch.%s' % branch] = path | 24 config['hgsubversionbranch.%s' % branch] = path |
25 u.setconfig('hgsubversionbranch', branch, path) | 25 u.setconfig('hgsubversionbranch', branch, path) |
26 repo, repo_path = self.load_and_fetch(name, | 26 repo, repo_path = self.load_and_fetch(name, |
27 subdir=subdir, | 27 subdir=subdir, |
36 u.setconfig('hgsubversion', 'stupid', '1') | 36 u.setconfig('hgsubversion', 'stupid', '1') |
37 u.setconfig('hgsubversion', 'layout', layout) | 37 u.setconfig('hgsubversion', 'layout', layout) |
38 test_util.hgclone(u, test_util.fileurl(checkout_path), wc2_path, update=False) | 38 test_util.hgclone(u, test_util.fileurl(checkout_path), wc2_path, update=False) |
39 if layout == 'single': | 39 if layout == 'single': |
40 self.assertEqual(len(self.repo.heads()), 1) | 40 self.assertEqual(len(self.repo.heads()), 1) |
41 self.repo2 = hg.repository(ui.ui(), wc2_path) | 41 self.repo2 = hg.repository(test_util.testui(), wc2_path) |
42 self.assertEqual(self.repo.heads(), self.repo2.heads()) | 42 self.assertEqual(self.repo.heads(), self.repo2.heads()) |
43 | 43 |
44 | 44 |
45 def buildmethod(case, name, layout): | 45 def buildmethod(case, name, layout): |
46 m = lambda self: self._do_case(case, layout) | 46 m = lambda self: self._do_case(case, layout) |