Mercurial > hgsubversion
view tests/test_diff.py @ 218:a360ddc97719
branches: change handling again, but this time a little less magic.
This change means that files located in the actual branches directory will now be wholly
ignored. If we want to handle those correctly, it will take a reasonably large amount of work
and probably a configuration flag. Also, any non-related paths outside of branches/trunk will
be explicitly ignored, which is similar to the somewhat accidental pre-branch-refactor
behavior. Finally, any unrelated files located as children of branches will cause the directory
in branches to be used as the branch - not, as recently was the case, the directory immediately
containing that file.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Sat, 28 Mar 2009 16:38:57 -0500 |
| parents | 46f6b872c988 |
| children | 28d0ee605308 |
line wrap: on
line source
import unittest from mercurial import ui import diff_cmd import test_util expected_diff_output = '''Index: alpha =================================================================== --- alpha\t(revision 3) +++ alpha\t(working copy) @@ -1,1 +1,3 @@ -file: alpha +alpha + +added line Index: foo =================================================================== new file mode 100644 --- foo\t(revision 0) +++ foo\t(working copy) @@ -0,0 +1,1 @@ +This is missing a newline. \ No newline at end of file ''' class DiffTests(test_util.TestBase): def test_diff_output(self): self._load_fixture_and_fetch('two_revs.svndump') self.commitchanges([('foo', 'foo', 'This is missing a newline.'), ('alpha', 'alpha', 'alpha\n\nadded line\n'), ]) u = ui.ui() diff_cmd.diff_command(u, self.repo, self.wc_path) self.assertEqual(u.stream.getvalue(), expected_diff_output) def suite(): all = [unittest.TestLoader().loadTestsFromTestCase(DiffTests), ] return unittest.TestSuite(all)