Mercurial > hgsubversion
comparison tests/comprehensive/test_custom_layout.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 |
---|---|
29 'Repo had no changes, maybe you need to add a subdir entry in test_util?' | 29 'Repo had no changes, maybe you need to add a subdir entry in test_util?' |
30 wc2_path = self.wc_path + '_custom' | 30 wc2_path = self.wc_path + '_custom' |
31 checkout_path = repo_path | 31 checkout_path = repo_path |
32 if subdir: | 32 if subdir: |
33 checkout_path += '/' + subdir | 33 checkout_path += '/' + subdir |
34 u = ui.ui() | 34 u = test_util.testui(stupid=stupid, layout='custom') |
35 if stupid: | |
36 u.setconfig('hgsubversion', 'stupid', '1') | |
37 u.setconfig('hgsubversion', 'layout', 'custom') | |
38 for branch, path in test_util.custom.get(name, {}).iteritems(): | 35 for branch, path in test_util.custom.get(name, {}).iteritems(): |
39 u.setconfig('hgsubversionbranch', branch, path) | 36 u.setconfig('hgsubversionbranch', branch, path) |
40 test_util.hgclone(u, | 37 test_util.hgclone(u, |
41 test_util.fileurl(checkout_path), | 38 test_util.fileurl(checkout_path), |
42 wc2_path, | 39 wc2_path, |
43 update=False) | 40 update=False) |
44 self.repo2 = hg.repository(ui.ui(), wc2_path) | 41 self.repo2 = hg.repository(test_util.testui(), wc2_path) |
45 self.assertEqual(self.repo.heads(), self.repo2.heads()) | 42 self.assertEqual(self.repo.heads(), self.repo2.heads()) |
46 | 43 |
47 | 44 |
48 def buildmethod(case, name, stupid): | 45 def buildmethod(case, name, stupid): |
49 m = lambda self: self._do_case(case, stupid) | 46 m = lambda self: self._do_case(case, stupid) |