Mercurial > hgsubversion
comparison tests/test_fetch_command.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 |
comparison
equal
deleted
inserted
replaced
716:38ebf7714cdf | 717:ae5968ffe6fe |
---|---|
1 import test_util | 1 import test_util |
2 | 2 |
3 import os | |
3 import unittest | 4 import unittest |
4 | 5 import urllib |
6 | |
7 from mercurial import commands | |
5 from mercurial import hg | 8 from mercurial import hg |
6 from mercurial import node | 9 from mercurial import node |
7 from mercurial import ui | 10 from mercurial import ui |
8 | 11 |
9 class TestBasicRepoLayout(test_util.TestBase): | 12 class TestBasicRepoLayout(test_util.TestBase): |
145 repo = self._load_fixture_and_fetch('file_not_in_trunk_root.svndump', stupid=stupid) | 148 repo = self._load_fixture_and_fetch('file_not_in_trunk_root.svndump', stupid=stupid) |
146 self.assertEqual(repo['tip'].branch(), 'default') | 149 self.assertEqual(repo['tip'].branch(), 'default') |
147 | 150 |
148 def test_fetch_when_trunk_has_no_files_stupid(self): | 151 def test_fetch_when_trunk_has_no_files_stupid(self): |
149 self.test_fetch_when_trunk_has_no_files(stupid=True) | 152 self.test_fetch_when_trunk_has_no_files(stupid=True) |
153 | |
154 def test_path_quoting(self, stupid=False): | |
155 test_util.load_svndump_fixture(self.repo_path, | |
156 'non_ascii_path_1.svndump') | |
157 subdir = '/b\xC3\xB8b' | |
158 quoted_subdir = urllib.quote(subdir) | |
159 | |
160 repo_url = test_util.fileurl(self.repo_path) | |
161 wc_path = self.wc_path | |
162 wc2_path = wc_path + '-2' | |
163 | |
164 ui = self.ui(stupid=stupid) | |
165 | |
166 commands.clone(ui, repo_url + subdir, wc_path) | |
167 commands.clone(ui, repo_url + quoted_subdir, wc2_path) | |
168 repo = hg.repository(ui, wc_path) | |
169 repo2 = hg.repository(ui, wc2_path) | |
170 | |
171 self.assertEqual(repo['tip'].extra()['convert_revision'], | |
172 repo2['tip'].extra()['convert_revision']) | |
173 self.assertEqual(len(repo), len(repo2)) | |
174 | |
175 for r in repo: | |
176 self.assertEqual(repo[r].hex(), repo2[r].hex()) | |
177 | |
178 def test_path_quoting_stupid(self): | |
179 self.test_path_quoting(True) | |
180 | |
181 def test_identical_fixtures(self): | |
182 '''ensure that the non_ascii_path_N fixtures are identical''' | |
183 fixturepaths = [ | |
184 os.path.join(test_util.FIXTURES, 'non_ascii_path_1.svndump'), | |
185 os.path.join(test_util.FIXTURES, 'non_ascii_path_2.svndump'), | |
186 ] | |
187 self.assertMultiLineEqual(open(fixturepaths[0]).read(), | |
188 open(fixturepaths[1]).read()) | |
150 | 189 |
151 class TestStupidPull(test_util.TestBase): | 190 class TestStupidPull(test_util.TestBase): |
152 def test_stupid(self): | 191 def test_stupid(self): |
153 repo = test_util.load_fixture_and_fetch('two_heads.svndump', | 192 repo = test_util.load_fixture_and_fetch('two_heads.svndump', |
154 self.repo_path, | 193 self.repo_path, |