Mercurial > hgsubversion
comparison tests/test_util.py @ 1346:538bbb927609
Merge with stable.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Tue, 11 Aug 2015 17:07:59 -0400 |
| parents | 38be7a6b6def |
| children | 3c213ca49f7e |
comparison
equal
deleted
inserted
replaced
| 1341:7e10891666fe | 1346:538bbb927609 |
|---|---|
| 288 u.setconfig('hgsubversion', 'layout', layout) | 288 u.setconfig('hgsubversion', 'layout', layout) |
| 289 u.setconfig('hgsubversion', 'startrev', startrev) | 289 u.setconfig('hgsubversion', 'startrev', startrev) |
| 290 return u | 290 return u |
| 291 | 291 |
| 292 def dispatch(cmd): | 292 def dispatch(cmd): |
| 293 assert '--quiet' in cmd | |
| 293 cmd = getattr(dispatchmod, 'request', lambda x: x)(cmd) | 294 cmd = getattr(dispatchmod, 'request', lambda x: x)(cmd) |
| 294 return dispatchmod.dispatch(cmd) | 295 return dispatchmod.dispatch(cmd) |
| 295 | 296 |
| 296 def rmtree(path): | 297 def rmtree(path): |
| 297 # Read-only files cannot be removed under Windows | 298 # Read-only files cannot be removed under Windows |
| 565 if subdir: | 566 if subdir: |
| 566 projectpath += '/' + subdir | 567 projectpath += '/' + subdir |
| 567 | 568 |
| 568 cmd = [ | 569 cmd = [ |
| 569 'clone', | 570 'clone', |
| 571 '--quiet', | |
| 570 '--layout=%s' % layout, | 572 '--layout=%s' % layout, |
| 571 '--startrev=%s' % startrev, | 573 '--startrev=%s' % startrev, |
| 572 fileurl(projectpath), | 574 fileurl(projectpath), |
| 573 self.wc_path, | 575 self.wc_path, |
| 574 ] | 576 ] |
| 744 def getgraph(self, repo): | 746 def getgraph(self, repo): |
| 745 """Helper function displaying a repository graph, especially | 747 """Helper function displaying a repository graph, especially |
| 746 useful when debugging comprehensive tests. | 748 useful when debugging comprehensive tests. |
| 747 """ | 749 """ |
| 748 # Could be more elegant, but it works with stock hg | 750 # Could be more elegant, but it works with stock hg |
| 749 _ui = ui.ui() | 751 _ui = testui() |
| 750 _ui.setconfig('extensions', 'graphlog', '') | 752 _ui.setconfig('extensions', 'graphlog', '') |
| 751 extensions.loadall(_ui) | 753 extensions.loadall(_ui) |
| 752 graphlog = extensions.find('graphlog') | 754 graphlog = extensions.find('graphlog') |
| 753 templ = """\ | 755 templ = """\ |
| 754 changeset: {rev}:{node|short} (r{svnrev}) | 756 changeset: {rev}:{node|short} (r{svnrev}) |
