hgsubversion: tests/test_svnwrap.py annotate

annotate tests/test_svnwrap.py @ 634:a400f3bf5611

replay/stupid: fix tagging on a branch renamed using a branch map Previously, both convert_rev() functions used parentctx.extra() to determine the branch to pass to meta.movetag(). This assumed that the branch name stored in the changeset matches the internal branch. The introduction of branch maps made this assumption unsafe, however: Now, the Mercurial branch can be completely unrelated to the origin of the changeset. It turns out, however, that movetag() already has sufficient knowledge to determine the branch. Given the hash of the new changeset to be tagged, we walk its ancestors until we find an open changeset, which we then know to be the originating branch. This assumes that there were `few' commits made to the tag; an assumption I would consider reasonable.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Sun, 11 Jul 2010 11:46:19 +0200
parents	a42fb4f1716a
children	c2d606a1dc6f

rev	line source
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	1 import imp
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	2 import os
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	3 import subprocess
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	4 import shutil
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	5 import tempfile
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	6 import unittest
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	7
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	8 import test_util
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	9
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	10 from hgsubversion import svnwrap
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	11
481 e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	12 import os
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	13 import stat
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	14 def force_rm(path):
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	15 os.chmod(
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	16 path,
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	17 os.stat(path).st_mode \| stat.S_IWUSR \| stat.S_IWGRP \| stat.S_IWOTH
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	18 )
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	19 os.remove(path)
e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	20
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	21 class TestBasicRepoLayout(unittest.TestCase):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	22 def setUp(self):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	23 self.tmpdir = tempfile.mkdtemp('svnwrap_test')
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	24 self.repo_path = '%s/testrepo' % self.tmpdir
478 37304494cd15 No os.spawnvp() in Windows, use subprocess.call() instead Risto Kankkunen <risto.kankkunen@iki.fi> parents: 347 diff changeset	25 subprocess.call(['svnadmin', 'create', self.repo_path,])
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	26 inp = open(os.path.join(os.path.dirname(__file__), 'fixtures',
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	27 'project_root_at_repo_root.svndump'))
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	28 proc = subprocess.call(['svnadmin', 'load', self.repo_path,],
479 83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 478 diff changeset	29 stdin=inp,
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 478 diff changeset	30 close_fds=test_util.canCloseFds,
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	31 stdout=subprocess.PIPE,
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	32 stderr=subprocess.STDOUT)
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	33 assert proc == 0
480 7fa100ae1a11 Avoid 'Abort: Illegal repository URL' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	34 self.repo = svnwrap.SubversionRepo(test_util.fileurl(self.repo_path))
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	35
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	36 def tearDown(self):
482 a42fb4f1716a Reclaim repository object to avoid tearDown() failing to remove the open file 'testrepo/db/rep-cache.db' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 481 diff changeset	37 del self.repo
481 e5a9c824ffbf Make tearDown() be able to delete read-only files to avoid an exception when removing 'testrepo/db/format' Risto Kankkunen <risto.kankkunen@iki.fi> parents: 480 diff changeset	38 shutil.rmtree(self.tmpdir, onerror=lambda func, path, e: force_rm(path))
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	39
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	40
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	41 def test_num_revs(self):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	42 revs = list(self.repo.revisions())
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	43 self.assertEqual(len(revs), 7)
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	44 r = revs[1]
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	45 self.assertEqual(r.revnum, 2)
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	46 self.assertEqual(sorted(r.paths.keys()),
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	47 ['trunk/alpha', 'trunk/beta', 'trunk/delta'])
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	48 for r in revs:
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	49 for p in r.paths:
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	50 # make sure these paths are always non-absolute for sanity
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	51 if p:
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	52 assert p[0] != '/'
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	53 revs = list(self.repo.revisions(start=3))
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	54 self.assertEqual(len(revs), 4)
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	55
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	56
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	57 def test_branches(self):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	58 self.assertEqual(self.repo.branches.keys(), ['crazy', 'more_crazy'])
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	59 self.assertEqual(self.repo.branches['crazy'], ('trunk', 2, 4))
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	60 self.assertEqual(self.repo.branches['more_crazy'], ('trunk', 5, 7))
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	61
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	62
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	63 def test_tags(self):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	64 tags = self.repo.tags
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	65 self.assertEqual(tags.keys(), ['rev1'])
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	66 self.assertEqual(tags['rev1'], ('trunk', 2))
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	67
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	68 class TestRootAsSubdirOfRepo(TestBasicRepoLayout):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	69 def setUp(self):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	70 self.tmpdir = tempfile.mkdtemp('svnwrap_test')
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	71 self.repo_path = '%s/testrepo' % self.tmpdir
478 37304494cd15 No os.spawnvp() in Windows, use subprocess.call() instead Risto Kankkunen <risto.kankkunen@iki.fi> parents: 347 diff changeset	72 subprocess.call(['svnadmin', 'create', self.repo_path,])
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	73 inp = open(os.path.join(os.path.dirname(__file__), 'fixtures',
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	74 'project_root_not_repo_root.svndump'))
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	75 ret = subprocess.call(['svnadmin', 'load', self.repo_path,],
479 83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 478 diff changeset	76 stdin=inp,
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 478 diff changeset	77 close_fds=test_util.canCloseFds,
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	78 stdout=subprocess.PIPE,
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	79 stderr=subprocess.STDOUT)
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	80 assert ret == 0
480 7fa100ae1a11 Avoid 'Abort: Illegal repository URL' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	81 self.repo = svnwrap.SubversionRepo(test_util.fileurl(
7fa100ae1a11 Avoid 'Abort: Illegal repository URL' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	82 self.repo_path + '/dummyproj'
7fa100ae1a11 Avoid 'Abort: Illegal repository URL' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	83 ))
7fa100ae1a11 Avoid 'Abort: Illegal repository URL' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	84
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	85 def suite():
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	86 all = [unittest.TestLoader().loadTestsFromTestCase(TestBasicRepoLayout),
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	87 unittest.TestLoader().loadTestsFromTestCase(TestRootAsSubdirOfRepo)]
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	88 return unittest.TestSuite(all)

Mercurial > hgsubversion

annotate tests/test_svnwrap.py @ 634:a400f3bf5611