view tests/test_diff.py @ 777:60948939555d

clone: pass on the repository instance rather than the string given Previously, cloning a Mercurial repository that required authentication would prompt for authentication twice. This is because hgclonewrapper() first created a repository instance, but didn't pass it on. hg.close() would then create another instance, and since Mercurial doesn't cache authentication credentials across instances, this would cause a second credential prompt. This change could have unfortunate side effects in case of other extensions wanting to modify the source passed to clone. This seems like a somewhat unlikely scenario. I'll think about a possible way to avoid all this hackery...
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Tue, 14 Dec 2010 12:09:27 +0100
parents 95abc4cfc78f
children e9af7eba88db
line wrap: on
line source

import test_util

import unittest

from mercurial import ui

from hgsubversion import wrappers

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()
        u.pushbuffer()
        wrappers.diff(lambda x,y,z: None, u, self.repo, svn=True)
        self.assertEqual(u.popbuffer(), expected_diff_output)


def suite():
    all = [unittest.TestLoader().loadTestsFromTestCase(DiffTests),
          ]
    return unittest.TestSuite(all)