hgsubversion: tests/test_single_dir

annotate tests/test_single_dir_push.py @ 1172:8b20e1bbcd23

push: update push logic to match mercurial upstream Commit e10000369b47 in upstream Mercurial changed the checkpush function signature. So we need to update hgsubversion accordingly. Ran the tests against the tip of the hg repo, against a version of hg from January before the exchange module, and against a version of hg after pushoperations was added but before checkpush used it, and the tests passed in all cases.

author	Durham Goode <durham@fb.com>
date	Wed, 09 Apr 2014 16:17:13 -0700
parents	6e1dbf6cbc92
children	f1dd304be8aa

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
1103 6e1dbf6cbc92 compathacks: new module to collect hacks to work around hg internals changing Augie Fackler <raf@durin42.com> parents: 1075 diff changeset	13 from hgsubversion import compathacks
6e1dbf6cbc92 compathacks: new module to collect hacks to work around hg internals changing Augie Fackler <raf@durin42.com> parents: 1075 diff changeset	14
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	15 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	16 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	17 obsolete_mode_tests = True
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1047 diff changeset	18
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	19 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	20 # 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	21 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	22 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	23 subdir='')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	24 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	25 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	26 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	27 data='foo',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	28 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	29 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	30 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	31 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	32 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	33 data='\0binary',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	34 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	35 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	36 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	37 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	38 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	39 (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	40 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	41 ['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	42 file_callback,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	43 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	44 '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	45 {'branch': 'default', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	46 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	47 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	48 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	49 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	50 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	51 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	52 '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	53 # 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	54 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	55 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	56 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	57 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	58 '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	59
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	60 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	61 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	62 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	63 subdir='trunk')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	64 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	65 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	66 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	67 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	68 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	69 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	70 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	71 (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	72 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	73 ['bogus'],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	74 filectxfn,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	75 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	76 '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	77 {'branch': 'localhacking', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	78 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	79 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	80 '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	81 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	82 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	83 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	84 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	85 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	86 '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	87
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	88 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	89 # 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	90 # 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	91 # (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	92 # 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	93 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	94 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	95 subdir='trunk')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	96 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	97 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	98 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	99 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	100 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	101 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	102 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	103 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	104 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	105 (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	106 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	107 [fn],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	108 file_callback,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	109 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	110 '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	111 {'branch': 'default', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	112 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	113 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	114 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	115 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	116 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	117
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	118 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	119 # 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	120 # 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	121 # 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	122 # 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	123 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	124 layout='single',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	125 subdir='')
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	126 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	127 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	128 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	129 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	130 data=data,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	131 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	132 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	133 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	134 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	135 return cb
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	136
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	137 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	138 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	139 (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	140 '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	141 [name],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	142 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	143 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	144 '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	145 {'branch': name, }))
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	146
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	147 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	148 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	149 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	150 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	151 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	152 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	153 self.assertTrue('foo' in test_util.svnls(repo_path, ''))
1103 6e1dbf6cbc92 compathacks: new module to collect hacks to work around hg internals changing Augie Fackler <raf@durin42.com> parents: 1075 diff changeset	154 self.assertEqual(compathacks.branchset(repo), set(['default']))
1047 3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	155 # 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	156 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	157 self.repo,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	158 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	159 clean=True)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	160 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	161 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	162 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	163
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	164 @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	165 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	166 # 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	167 # 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	168 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	169 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	170 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	171 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	172 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	173 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	174
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	175 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	176 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	177 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	178 data='foo',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	179 islink=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	180 isexec=False,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	181 copied=False)
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	182 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	183 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	184 (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	185 'automated test',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	186 ['adding_file'],
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	187 file_callback,
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	188 'an_author',
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	189 '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	190 {'branch': 'default', })
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	191 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	192 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	193 self.pushrevisions()
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	194 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	195
3092b3c109a8 tests: split single directory tests that push & clone in two modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	196 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	197 set(self.repo[i].branch() for i in self.repo))

Mercurial > hgsubversion

annotate tests/test_single_dir_push.py @ 1172:8b20e1bbcd23