Mercurial > hgsubversion

comparison tests/test_push_command.py @ 671:e910e3ebd23b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
svnmeta: strip all repeated slashes from subdir
author Peter Arrenbrecht <peter.arrenbre...@gmail.com>
date Wed, 28 Jul 2010 14:47:44 +0200
parents d2ef7220a079
children 4b55fb6d6847
comparison
equal deleted inserted replaced
670:186f13b35d15 671:e910e3ebd23b
74 except hgutil.Abort: 74 except hgutil.Abort:
75 pass 75 pass
76 tip = self.repo['tip'] 76 tip = self.repo['tip']
77 self.assertEqual(new_hash, tip.node()) 77 self.assertEqual(new_hash, tip.node())
78 78
79 def test_push_over_svnserve(self, commit=True): 79 def internal_push_over_svnserve(self, subdir='', commit=True):
80 test_util.load_svndump_fixture(self.repo_path, 'simple_branch.svndump') 80 test_util.load_svndump_fixture(self.repo_path, 'simple_branch.svndump')
81 open(os.path.join(self.repo_path, 'conf', 'svnserve.conf'), 81 open(os.path.join(self.repo_path, 'conf', 'svnserve.conf'),
82 'w').write('[general]\nanon-access=write\n[sasl]\n') 82 'w').write('[general]\nanon-access=write\n[sasl]\n')
83 self.port = random.randint(socket.IPPORT_USERRESERVED, 65535) 83 self.port = random.randint(socket.IPPORT_USERRESERVED, 65535)
84 self.host = 'localhost' 84 self.host = 'localhost'
92 self.svnserve_pid = svnserve.pid 92 self.svnserve_pid = svnserve.pid
93 try: 93 try:
94 time.sleep(2) 94 time.sleep(2)
95 import shutil 95 import shutil
96 shutil.rmtree(self.wc_path) 96 shutil.rmtree(self.wc_path)
97 commands.clone(self.ui(), 'svn://%s:%d/' % (self.host, self.port), 97 commands.clone(self.ui(),
98 'svn://%s:%d/%s' % (self.host, self.port, subdir),
98 self.wc_path, noupdate=True) 99 self.wc_path, noupdate=True)
99 100
100 repo = self.repo 101 repo = self.repo
101 old_tip = repo['tip'].node() 102 old_tip = repo['tip'].node()
102 expected_parent = repo['default'].node() 103 expected_parent = repo['default'].node()
133 self.assertEqual('None', tip.user().rsplit('@', 1)[0]) 134 self.assertEqual('None', tip.user().rsplit('@', 1)[0])
134 finally: 135 finally:
135 # TODO: use svnserve.kill() in Python >2.5 136 # TODO: use svnserve.kill() in Python >2.5
136 test_util.kill_process(svnserve) 137 test_util.kill_process(svnserve)
137 138
139 def test_push_over_svnserve(self):
140 self.internal_push_over_svnserve()
141
142 def test_push_over_svnserve_with_subdir(self):
143 self.internal_push_over_svnserve(subdir='///branches////the_branch/////')
144
138 def test_push_to_default(self, commit=True): 145 def test_push_to_default(self, commit=True):
139 repo = self.repo 146 repo = self.repo
140 old_tip = repo['tip'].node() 147 old_tip = repo['tip'].node()
141 expected_parent = repo['default'].node() 148 expected_parent = repo['default'].node()
142 def file_callback(repo, memctx, path): 149 def file_callback(repo, memctx, path):