Mercurial > hgsubversion
comparison tests/test_diff.py @ 331:75f082b5897e
Switch to using url scheme wrappers instead of duplicating each command we wrap.
The 'hg svn url' command has been killed; the replacement is
'.hg/hgrc'. More stuff related to its disappearance has been stripped,
including two tests.
HgChangeReceiver now takes a UUID argument, which it uses to ensure
that remote repositories remain unchanged. This is a temporary
solution, and I'm not entirely satisfied with how it's done either.
Access to the UUID file has been isolated in a HgChangeReceiver
property.
Some more tests have been updated to use ui.pushbuffer()/popbuffer(),
and to pass through the Mercurial API.
Moved the arguments to wrappers.pull() to the UI configuration.
Also, remove HgChangeReceiver.opts in favour of a 'usebranchnames'
instance & configuration variable. The name is taken from the
ConvertExtension.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Fri, 15 May 2009 19:18:43 +0200 |
| parents | ffccf0080e54 |
| children | 46e69be8e2c8 |
comparison
equal
deleted
inserted
replaced
| 330:5f8f2fd4fd54 | 331:75f082b5897e |
|---|---|
| 30 self._load_fixture_and_fetch('two_revs.svndump') | 30 self._load_fixture_and_fetch('two_revs.svndump') |
| 31 self.commitchanges([('foo', 'foo', 'This is missing a newline.'), | 31 self.commitchanges([('foo', 'foo', 'This is missing a newline.'), |
| 32 ('alpha', 'alpha', 'alpha\n\nadded line\n'), | 32 ('alpha', 'alpha', 'alpha\n\nadded line\n'), |
| 33 ]) | 33 ]) |
| 34 u = ui.ui() | 34 u = ui.ui() |
| 35 wrappers.diff(lambda x,y,z: None, | 35 u.pushbuffer() |
| 36 u, self.repo, svn=True) | 36 wrappers.diff(lambda x,y,z: None, u, self.repo, svn=True) |
| 37 self.assertEqual(u.stream.getvalue(), expected_diff_output) | 37 self.assertEqual(u.popbuffer(), expected_diff_output) |
| 38 | 38 |
| 39 | 39 |
| 40 def suite(): | 40 def suite(): |
| 41 all = [unittest.TestLoader().loadTestsFromTestCase(DiffTests), | 41 all = [unittest.TestLoader().loadTestsFromTestCase(DiffTests), |
| 42 ] | 42 ] |