hgsubversion: tests/test_single_dir

annotate tests/test_single_dir_push.py @ 1081:c8d0f5983571

tests: cd to tempdir during setUp Since we were running hg clone from the hgsubversion repo, we would often pick up config settings from hgsubversion/.hg/hgrc, including loading extensions. This caused tests to fail for me when they asserted that obsolete is disabled because I have evolve enabled in my hgsubversion checkout. This was probably decreasing the overall stability of the test suite as well, since it meant that clones were running with pretty much arbitrary configs settings. Interestingly, the setUp was already keeping a record of the cwd before creating the tempdir, and tearDown was already cd-ing back to that directory.

author	David Schleimer <dschleimer@fb.com>
date	Wed, 14 Aug 2013 17:33:40 -0700
parents	cf325cd90b22
children	6e1dbf6cbc92

rev	line source
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	1 import test_util
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	2
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	3 import errno
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	4 import shutil
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	5 import unittest
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	6
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	7 from mercurial import commands
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	8 from mercurial import context
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	9 from mercurial import hg
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	10 from mercurial import node
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	11 from mercurial import ui
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	12
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	13 class TestSingleDirPush(test_util.TestBase):
1075 cf325cd90b22 test_single_dir_push: use stupid mode metaclass Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1055 diff changeset	14 stupid_mode_tests = True
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1047 diff changeset	15 obsolete_mode_tests = True
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1047 diff changeset	16
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	17 def test_push_single_dir(self):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	18 # Tests simple pushing from default branch to a single dir repo
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	19 repo, repo_path = self.load_and_fetch('branch_from_tag.svndump',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	20 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	21 subdir='')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	22 def file_callback(repo, memctx, path):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	23 if path == 'adding_file':
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	24 return context.memfilectx(path=path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	25 data='foo',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	26 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	27 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	28 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	29 elif path == 'adding_binary':
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	30 return context.memfilectx(path=path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	31 data='\0binary',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	32 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	33 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	34 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	35 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	36 ctx = context.memctx(repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	37 (repo['tip'].node(), node.nullid),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	38 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	39 ['adding_file', 'adding_binary'],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	40 file_callback,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	41 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	42 '2009-10-19 18:49:30 -0500',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	43 {'branch': 'default', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	44 repo.commitctx(ctx)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	45 hg.update(repo, repo['tip'].node())
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	46 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	47 self.assertTrue('adding_file' in test_util.svnls(repo_path, ''))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	48 self.assertEqual('application/octet-stream',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	49 test_util.svnpropget(repo_path, 'adding_binary',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	50 'svn:mime-type'))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	51 # Now add another commit and test mime-type being reset
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	52 changes = [('adding_binary', 'adding_binary', 'no longer binary')]
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	53 self.commitchanges(changes)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	54 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	55 self.assertEqual('', test_util.svnpropget(repo_path, 'adding_binary',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	56 'svn:mime-type'))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	57
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	58 def test_push_single_dir_at_subdir(self):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	59 repo = self._load_fixture_and_fetch('branch_from_tag.svndump',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	60 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	61 subdir='trunk')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	62 def filectxfn(repo, memctx, path):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	63 return context.memfilectx(path=path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	64 data='contents of %s' % path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	65 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	66 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	67 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	68 ctx = context.memctx(repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	69 (repo['tip'].node(), node.nullid),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	70 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	71 ['bogus'],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	72 filectxfn,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	73 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	74 '2009-10-19 18:49:30 -0500',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	75 {'branch': 'localhacking', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	76 n = repo.commitctx(ctx)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	77 self.assertEqual(self.repo['tip']['bogus'].data(),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	78 'contents of bogus')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	79 before = repo['tip'].hex()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	80 hg.update(repo, self.repo['tip'].hex())
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	81 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	82 self.assertNotEqual(before, self.repo['tip'].hex())
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	83 self.assertEqual(self.repo['tip']['bogus'].data(),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	84 'contents of bogus')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	85
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	86 def test_push_single_dir_one_incoming_and_two_outgoing(self):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	87 # Tests simple pushing from default branch to a single dir repo
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	88 # Pushes two outgoing over one incoming svn rev
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	89 # (used to cause an "unknown revision")
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	90 # This can happen if someone committed to svn since our last pull (race).
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	91 repo, repo_path = self.load_and_fetch('branch_from_tag.svndump',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	92 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	93 subdir='trunk')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	94 self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	95 def file_callback(repo, memctx, path):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	96 return context.memfilectx(path=path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	97 data='data of %s' % path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	98 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	99 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	100 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	101 for fn in ['one', 'two']:
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	102 ctx = context.memctx(repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	103 (repo['tip'].node(), node.nullid),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	104 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	105 [fn],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	106 file_callback,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	107 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	108 '2009-10-19 18:49:30 -0500',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	109 {'branch': 'default', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	110 repo.commitctx(ctx)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	111 hg.update(repo, repo['tip'].node())
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	112 self.pushrevisions(expected_extra_back=1)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	113 self.assertTrue('trunk/one' in test_util.svnls(repo_path, ''))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	114 self.assertTrue('trunk/two' in test_util.svnls(repo_path, ''))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	115
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	116 def test_push_single_dir_branch(self):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	117 # Tests local branches pushing to a single dir repo. Creates a fork at
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	118 # tip. The default branch adds a file called default, while branch foo
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	119 # adds a file called foo, then tries to push the foo branch and default
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	120 # branch in that order.
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	121 repo, repo_path = self.load_and_fetch('branch_from_tag.svndump',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	122 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	123 subdir='')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	124 def file_callback(data):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	125 def cb(repo, memctx, path):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	126 if path == data:
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	127 return context.memfilectx(path=path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	128 data=data,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	129 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	130 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	131 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	132 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	133 return cb
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	134
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	135 def commit_to_branch(name, parent):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	136 repo.commitctx(context.memctx(repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	137 (parent, node.nullid),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	138 'automated test (%s)' % name,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	139 [name],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	140 file_callback(name),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	141 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	142 '2009-10-19 18:49:30 -0500',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	143 {'branch': name, }))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	144
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	145 parent = repo['tip'].node()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	146 commit_to_branch('default', parent)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	147 commit_to_branch('foo', parent)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	148 hg.update(repo, repo['foo'].node())
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	149 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	150 repo = self.repo # repo is outdated after the rebase happens, refresh
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	151 self.assertTrue('foo' in test_util.svnls(repo_path, ''))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	152 self.assertEqual(repo.branchtags().keys(), ['default'])
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	153 # Have to cross to another branch head, so hg.update doesn't work
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	154 commands.update(ui.ui(),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	155 self.repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	156 self.repo.branchheads('default')[1],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	157 clean=True)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	158 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	159 self.assertTrue('default' in test_util.svnls(repo_path, ''))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	160 self.assertEquals(len(self.repo.branchheads('default')), 1)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	161
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	162 @test_util.requiresoption('branch')
1075 cf325cd90b22 test_single_dir_push: use stupid mode metaclass Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1055 diff changeset	163 def test_push_single_dir_renamed_branch(self):
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	164 # Tests pulling and pushing with a renamed branch
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	165 # Based on test_push_single_dir
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	166 repo_path = self.load_svndump('branch_from_tag.svndump')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	167 cmd = ['clone', '--layout=single', '--branch=flaf']
1075 cf325cd90b22 test_single_dir_push: use stupid mode metaclass Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1055 diff changeset	168 if self.stupid:
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	169 cmd.append('--stupid')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	170 cmd += [test_util.fileurl(repo_path), self.wc_path]
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	171 test_util.dispatch(cmd)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	172
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	173 def file_callback(repo, memctx, path):
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	174 if path == 'adding_file':
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	175 return context.memfilectx(path=path,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	176 data='foo',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	177 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	178 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	179 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	180 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	181 ctx = context.memctx(self.repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	182 (self.repo['tip'].node(), node.nullid),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	183 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	184 ['adding_file'],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	185 file_callback,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	186 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	187 '2009-10-19 18:49:30 -0500',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	188 {'branch': 'default', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	189 self.repo.commitctx(ctx)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	190 hg.update(self.repo, self.repo['tip'].node())
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	191 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	192 self.assertTrue('adding_file' in test_util.svnls(repo_path, ''))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	193
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	194 self.assertEquals(set(['flaf']),
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	195 set(self.repo[i].branch() for i in self.repo))

Mercurial > hgsubversion

annotate tests/test_single_dir_push.py @ 1081:c8d0f5983571