view tests/test_push_renames.py @ 717:ae5968ffe6fe

svnwrap: fix handling of quotable URLs (fixes #197, refs #132) The way hgsubversion handles URLs that may or may not be quoted is somewhat fragile. As part of fixing issue 132 in 925ff8c5989c, the path component of URLs was always quoted. The URL has been attempted encoded since the initial check-in. The fix from 925ff8c5989c was incomplete; reverting it allows us to clone a URL with a '~' in it.[1] Encoding the URL as UTF-8 seldom works as expected, as the default string encoding is ASCII, causing Python to be unable to decode any URL containing an 8-bit character. The core problem here is that we don't know whether the URL specified by the user is quoted or not. Rather than trying to deal with this ourselves, we pass the problem on to Subversion. Then, we obtain the URL from the RA instance, where it is always quoted. (It's worth noting that the editor interface, on the other hand, always deals with unquoted paths...) Thus, the following invariants should apply to SubversionRepo attributes: - svn_url and root will always be quoted. - subdir will always be unquoted. Tests are added that verify that it won't affect the conversion whether a URL is specified in quoted or unquoted form. Furthermore, a test fixture for this is added *twice*, so that we can thoroughly test both quoted and unquoted URLs. I'm not adding a test dedicated to tildes in URLs; it doesn't seem necessary. [1] Such as <https://svn.kenai.com/svn/winsw~subversion>.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Mon, 04 Oct 2010 21:00:36 -0500
parents d2ef7220a079
children e9af7eba88db
line wrap: on
line source

import test_util

import sys
import unittest

class TestPushRenames(test_util.TestBase):
    def setUp(self):
        test_util.TestBase.setUp(self)
        test_util.load_fixture_and_fetch('pushrenames.svndump',
                                         self.repo_path,
                                         self.wc_path,
                                         True)

    def _debug_print_copies(self, ctx):
        w = sys.stderr.write
        for f in ctx.files():
            if f not in ctx:
                w('R %s\n' % f)
            else:
                w('U %s %r\n' % (f, ctx[f].data()))
                if ctx[f].renamed():
                    w('%s copied from %s\n' % (f, ctx[f].renamed()[0]))

    def test_push_renames(self):
        repo = self.repo

        changes = [
            # Regular copy of a single file
            ('a', 'a2', None),
            # Copy and update of target
            ('a', 'a3', 'aa\n'),
            # Regular move of a single file
            ('b', 'b2', None),
            ('b', None, None),
            # Regular move and update of target
            ('c', 'c2', 'c\nc\n'),
            ('c', None, None),
            # Copy and update of source and targets
            ('d', 'd2', 'd\nd2\n'),
            ('d', 'd', 'd\nd\n'),
            # Double copy and removal (aka copy and move)
            ('e', 'e2', 'e\ne2\n'),
            ('e', 'e3', 'e\ne3\n'),
            ('e', None, None),
            ]
        self.commitchanges(changes)
        self.pushrevisions()
        tip = self.repo['tip']
        # self._debug_print_copies(tip)
        self.assertchanges(changes, tip)

    def test_push_rename_with_space(self):
        changes = [
            ('random/dir with space/file with space',
             'random/dir with space/file with space',
             'file contents'),
            ]
        self.commitchanges(changes)

        changes = [
            ('random/dir with space/file with space',
             'random2/dir with space/file with space',
             None),
            ('random/dir with space/file with space',
             None, None),
            ]
        self.commitchanges(changes)
        self.pushrevisions()
        self.assertEqual(self.repo['tip'].manifest().keys(),
                         ['a', 'c', 'b', 'e', 'd',
                          'random2/dir with space/file with space'])

    def test_push_rename_tree(self):
        repo = self.repo

        changes = [
            ('geek/alpha', 'geek/alpha', 'content',),
            ('geek/beta', 'geek/beta', 'content',),
            ('geek/delta', 'geek/delta', 'content',),
            ('geek/gamma', 'geek/gamma', 'content',),
            ('geek/later/pi', 'geek/later/pi', 'content geek/later/pi',),
            ('geek/later/rho', 'geek/later/rho', 'content geek/later/rho', ),
            ('geek/other/blah', 'geek/other/blah', 'content geek/other/blah', ),
            ('geek/other/another/layer', 'geek/other/another/layer', 'content deep file', ),
            ]

        self.commitchanges(changes)
        self.pushrevisions()
        self.assertchanges(changes, self.repo['tip'])

        changes = [
            # rename (copy + remove) all of geek to greek
            ('geek/alpha', 'greek/alpha', None, ),
            ('geek/beta', 'greek/beta', None, ),
            ('geek/delta', 'greek/delta', None, ),
            ('geek/gamma', 'greek/gamma', None, ),
            ('geek/later/pi', 'greek/later/pi', None, ),
            ('geek/later/rho', 'greek/later/rho', None, ),
            ('geek/other/blah', 'greek/other/blah', None, ),
            ('geek/other/another/layer', 'greek/other/another/layer', None, ),

            ('geek/alpha', None, None, ),
            ('geek/beta', None, None, ),
            ('geek/delta', None, None, ),
            ('geek/gamma', None, None, ),
            ('geek/later/pi', None, None, ),
            ('geek/later/rho', None, None, ),
            ('geek/other/blah', None, None, ),
            ('geek/other/another/layer', None, None, ),
            ]
        self.commitchanges(changes)
        self.pushrevisions()
        # print '\n'.join(sorted(self.svnls('trunk')))
        assert reduce(lambda x, y: x and y,
                      ('geek' not in f for f in self.svnls('trunk'))),(
            'This failure means rename of an entire tree is broken.'
            ' There is a print on the preceding line commented out '
            'that should help you.')


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