hgsubversion: tests/test_push_command.py annotate

annotate tests/test_push_command.py @ 74:450d5d9d3b80

SubversionRepo: do not use temporary file in get_file() Existing code says swig bindings do not support StringIO objects as output for svn.ra.get_file(). This issue was never reported in the convert extension.

author	Patrick Mezard <pmezard@gmail.com>
date	Sun, 09 Nov 2008 18:08:35 -0600
parents	b33940d54fe2
children	072010a271c6

rev	line source
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	1 import os
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	2 import shutil
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	3 import socket
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	4 import tempfile
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 import unittest
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	6
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import context
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	8 from mercurial import commands
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 from mercurial import hg
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 from mercurial import node
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	11 from mercurial import ui
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	12 from mercurial import revlog
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	13
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	14 import fetch_command
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	15 import push_cmd
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 import test_util
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	17 import time
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	18
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	19
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	20 class PushOverSvnserveTests(unittest.TestCase):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	21 def setUp(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	22 self.oldwd = os.getcwd()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	23 self.tmpdir = tempfile.mkdtemp('svnwrap_test')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	24 self.repo_path = '%s/testrepo' % self.tmpdir
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	25 self.wc_path = '%s/testrepo_wc' % self.tmpdir
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	26 test_util.load_svndump_fixture(self.repo_path, 'simple_branch.svndump')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	27 open(os.path.join(self.repo_path, 'conf', 'svnserve.conf'),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	28 'w').write('[general]\nanon-access=write\n[sasl]\n')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	29 # Paranoia: we try and connect to localhost on 3689 before we start
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	30 # svnserve. If it is running, we force the test to fail early.
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	31 user_has_own_svnserve = False
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	32 try:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	33 s = socket.socket()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	34 s.settimeout(0.3)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	35 s.connect(('localhost', 3690))
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	36 s.close()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	37 user_has_own_svnserve = True
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	38 except:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	39 pass
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	40 if user_has_own_svnserve:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	41 assert False, ('You appear to be running your own svnserve!'
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	42 ' You can probably ignore this test failure.')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	43 args = ['svnserve', '-d', '--foreground', '-r', self.repo_path]
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	44 self.svnserve_pid = os.spawnvp(os.P_NOWAIT, 'svnserve', args)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	45 time.sleep(2)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	46 fetch_command.fetch_revisions(ui.ui(),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	47 svn_url='svn://localhost/',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	48 hg_repo_path=self.wc_path)
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	49
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	50 def tearDown(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	51 shutil.rmtree(self.tmpdir)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	52 os.chdir(self.oldwd)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	53 os.system('kill -9 %d' % self.svnserve_pid)
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	54
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	55 # define this as a property so that it reloads anytime we need it
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	56 @property
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	57 def repo(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	58 return hg.repository(ui.ui(), self.wc_path)
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	59
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	60 def test_push_to_default(self, commit=True):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	61 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	62 old_tip = repo['tip'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	63 expected_parent = repo['default'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	64 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	65 if path == 'adding_file':
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	66 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	67 data='foo',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	68 islink=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	69 isexec=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	70 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	71 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	72 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	73 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	74 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	75 ['adding_file'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	76 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	77 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	78 '2008-10-07 20:59:48 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	79 {'branch': 'default',})
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	80 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	81 if not commit:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	82 return # some tests use this test as an extended setup.
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	83 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	84 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	85 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	86 svn_url='svn://localhost/')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	87 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	88 self.assertNotEqual(tip.node(), old_tip)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	89 self.assertEqual(tip.parents()[0].node(), expected_parent)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	90 self.assertEqual(tip['adding_file'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	91 self.assertEqual(tip.branch(), 'default')
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	92
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	93
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	94 class PushTests(unittest.TestCase):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	95 def setUp(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	96 self.oldwd = os.getcwd()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	97 self.tmpdir = tempfile.mkdtemp('svnwrap_test')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	98 self.repo_path = '%s/testrepo' % self.tmpdir
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	99 self.wc_path = '%s/testrepo_wc' % self.tmpdir
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	100 test_util.load_svndump_fixture(self.repo_path, 'simple_branch.svndump')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	101 fetch_command.fetch_revisions(ui.ui(),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	102 svn_url='file://%s' % self.repo_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	103 hg_repo_path=self.wc_path)
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	104
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	105 # define this as a property so that it reloads anytime we need it
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	106 @property
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	107 def repo(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	108 return hg.repository(ui.ui(), self.wc_path)
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	109
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	110 def tearDown(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	111 shutil.rmtree(self.tmpdir)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	112 os.chdir(self.oldwd)
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	113
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	114 def test_push_to_default(self, commit=True):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	115 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	116 old_tip = repo['tip'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	117 expected_parent = repo['default'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	118 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	119 if path == 'adding_file':
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	120 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	121 data='foo',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	122 islink=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	123 isexec=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	124 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	125 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	126 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	127 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	128 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	129 ['adding_file'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	130 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	131 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	132 '2008-10-07 20:59:48 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	133 {'branch': 'default',})
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	134 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	135 if not commit:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	136 return # some tests use this test as an extended setup.
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	137 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	138 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	139 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	140 svn_url='file://'+self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	141 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	142 self.assertNotEqual(tip.node(), old_tip)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	143 self.assertEqual(tip.parents()[0].node(), expected_parent)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	144 self.assertEqual(tip['adding_file'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	145 self.assertEqual(tip.branch(), 'default')
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	146
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	147 def test_push_two_revs(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	148 # set up some work for us
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	149 self.test_push_to_default(commit=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	150 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	151 old_tip = repo['tip'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	152 expected_parent = repo['tip'].parents()[0].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	153 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	154 if path == 'adding_file2':
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	155 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	156 data='foo2',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	157 islink=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	158 isexec=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	159 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	160 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	161 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	162 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	163 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	164 ['adding_file2'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	165 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	166 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	167 '2008-10-07 20:59:48 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	168 {'branch': 'default',})
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	169 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	170 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	171 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	172 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	173 svn_url='file://'+self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	174 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	175 self.assertNotEqual(tip.node(), old_tip)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	176 self.assertNotEqual(tip.parents()[0].node(), old_tip)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	177 self.assertEqual(tip.parents()[0].parents()[0].node(), expected_parent)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	178 self.assertEqual(tip['adding_file2'].data(), 'foo2')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	179 self.assertEqual(tip['adding_file'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	180 self.assertEqual(tip.parents()[0]['adding_file'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	181 try:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	182 self.assertEqual(tip.parents()[0]['adding_file2'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	183 assert False, "this is impossible, adding_file2 should not be in this manifest."
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	184 except revlog.LookupError, e:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	185 pass
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	186 self.assertEqual(tip.branch(), 'default')
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	187
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	188 def test_push_to_branch(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	189 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	190 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	191 if path == 'adding_file':
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	192 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	193 data='foo',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	194 islink=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	195 isexec=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	196 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	197 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	198 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	199 (repo['the_branch'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	200 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	201 ['adding_file'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	202 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	203 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	204 '2008-10-07 20:59:48 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	205 {'branch': 'the_branch',})
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	206 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	207 #commands.update(ui.ui(), self.repo, node='tip')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	208 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	209 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	210 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	211 svn_url='file://'+self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	212 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	213 self.assertNotEqual(tip.node(), new_hash)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	214 self.assertEqual(tip['adding_file'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	215 self.assertEqual(tip.branch(), 'the_branch')
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	216
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	217 def test_delete_file(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	218 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	219 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	220 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	221 old_files = set(repo['default'].manifest().keys())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	222 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	223 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	224 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	225 ['alpha'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	226 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	227 'an author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	228 '2008-10-29 21:26:00 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	229 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	230 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	231 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	232 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	233 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	234 svn_url='file://' + self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	235 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	236 self.assertEqual(old_files,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	237 set(tip.manifest().keys() + ['alpha']))
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	238 self.assert_('alpha' not in tip.manifest())
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	239
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	240 def test_push_executable_file(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	241 self.test_push_to_default(commit=True)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	242 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	243 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	244 if path == 'gamma':
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	245 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	246 data='foo',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	247 islink=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	248 isexec=True,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	249 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	250 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	251 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	252 (repo['tip'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	253 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	254 ['gamma', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	255 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	256 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	257 '2008-10-29 21:26:00 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	258 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	259 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	260 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	261 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	262 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	263 svn_url='file://' + self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	264 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	265 self.assertNotEqual(tip.node(), new_hash)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	266 self.assert_('@' in tip.user())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	267 self.assertEqual(tip['gamma'].flags(), 'x')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	268 self.assertEqual(tip['gamma'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	269 self.assertEqual([x for x in tip.manifest().keys() if 'x' not in
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	270 tip[x].flags()], ['alpha', 'beta', 'adding_file', ])
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	271
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	272 def test_push_symlink_file(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	273 self.test_push_to_default(commit=True)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	274 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	275 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	276 if path == 'gamma':
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	277 return context.memfilectx(path=path,
2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	278 data='foo',
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	279 islink=True,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	280 isexec=False,
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	281 copied=False)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	282 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	283 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	284 (repo['tip'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	285 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	286 ['gamma', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	287 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	288 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	289 '2008-10-29 21:26:00 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	290 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	291 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	292 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	293 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	294 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	295 svn_url='file://' + self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	296 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	297 self.assertNotEqual(tip.node(), new_hash)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	298 self.assertEqual(tip['gamma'].flags(), 'l')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	299 self.assertEqual(tip['gamma'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	300 self.assertEqual([x for x in tip.manifest().keys() if 'l' not in
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	301 tip[x].flags()], ['alpha', 'beta', 'adding_file', ])
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	302
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	303 def test_push_with_new_dir(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	304 self.test_push_to_default(commit=True)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	305 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	306 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	307 if path == 'newdir/gamma':
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	308 return context.memfilectx(path=path,
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	309 data='foo',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	310 islink=False,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	311 isexec=False,
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	312 copied=False)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	313 raise IOError()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	314 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	315 (repo['tip'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	316 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	317 ['newdir/gamma', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	318 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	319 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	320 '2008-10-29 21:26:00 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	321 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	322 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	323 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	324 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	325 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	326 svn_url='file://' + self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	327 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	328 self.assertNotEqual(tip.node(), new_hash)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	329 self.assertEqual(tip['newdir/gamma'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	330
65 b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	331 def test_push_with_new_subdir(self):
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	332 self.test_push_to_default(commit=True)
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	333 repo = self.repo
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	334 def file_callback(repo, memctx, path):
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	335 if path == 'newdir/subdir/gamma':
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	336 return context.memfilectx(path=path,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	337 data='foo',
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	338 islink=False,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	339 isexec=False,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	340 copied=False)
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	341 raise IOError()
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	342 ctx = context.memctx(repo,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	343 (repo['tip'].node(), node.nullid),
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	344 'message',
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	345 ['newdir/subdir/gamma', ],
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	346 file_callback,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	347 'author',
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	348 '2008-10-29 21:26:00 -0500',
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	349 {'branch': 'default', })
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	350 new_hash = repo.commitctx(ctx)
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	351 hg.update(repo, repo['tip'].node())
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	352 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	353 hg_repo_path=self.wc_path,
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	354 svn_url='file://' + self.repo_path)
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	355 tip = self.repo['tip']
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	356 self.assertNotEqual(tip.node(), new_hash)
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	357 self.assertEqual(tip['newdir/subdir/gamma'].data(), 'foo')
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	358
b33940d54fe2 push: Fix missing directory creation for the case of a new dir inside a new dir. Augie Fackler <durin42@gmail.com> parents: 62 diff changeset	359
60 41dc00c7aef1 Fixed a problem where if you edited an existing symlink by replacing with another symlink, things would get corrupt. Augie Fackler <durin42@gmail.com> parents: 50 diff changeset	360 def test_push_existing_file_newly_symlink(self):
41dc00c7aef1 Fixed a problem where if you edited an existing symlink by replacing with another symlink, things would get corrupt. Augie Fackler <durin42@gmail.com> parents: 50 diff changeset	361 self.test_push_existing_file_newly_execute(execute=False,
41dc00c7aef1 Fixed a problem where if you edited an existing symlink by replacing with another symlink, things would get corrupt. Augie Fackler <durin42@gmail.com> parents: 50 diff changeset	362 link=True,
41dc00c7aef1 Fixed a problem where if you edited an existing symlink by replacing with another symlink, things would get corrupt. Augie Fackler <durin42@gmail.com> parents: 50 diff changeset	363 expected_flags='l')
41dc00c7aef1 Fixed a problem where if you edited an existing symlink by replacing with another symlink, things would get corrupt. Augie Fackler <durin42@gmail.com> parents: 50 diff changeset	364
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	365 def test_push_existing_file_newly_execute(self, execute=True,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	366 link=False, expected_flags='x'):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	367 self.test_push_to_default()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	368 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	369 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	370 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	371 data='foo',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	372 islink=link,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	373 isexec=execute,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	374 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	375 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	376 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	377 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	378 ['alpha', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	379 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	380 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	381 '2008-1-1 00:00:00 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	382 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	383 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	384 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	385 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	386 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	387 svn_url='file://' + self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	388 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	389 self.assertNotEqual(tip.node(), new_hash)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	390 self.assertEqual(tip['alpha'].data(), 'foo')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	391 self.assertEqual(tip.parents()[0]['alpha'].flags(), '')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	392 self.assertEqual(tip['alpha'].flags(), expected_flags)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	393 # while we're here, double check pushing an already-executable file
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	394 # works
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	395 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	396 def file_callback(repo, memctx, path):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	397 return context.memfilectx(path=path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	398 data='bar',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	399 islink=link,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	400 isexec=execute,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	401 copied=False)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	402 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	403 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	404 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	405 ['alpha', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	406 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	407 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	408 '2008-1-1 00:00:00 -0500',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	409 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	410 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	411 hg.update(repo, repo['tip'].node())
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	412 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	413 hg_repo_path=self.wc_path,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	414 svn_url='file://' + self.repo_path)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	415 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	416 self.assertNotEqual(tip.node(), new_hash)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	417 self.assertEqual(tip['alpha'].data(), 'bar')
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	418 self.assertEqual(tip.parents()[0]['alpha'].flags(), expected_flags)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	419 self.assertEqual(tip['alpha'].flags(), expected_flags)
62 cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	420 # now test removing the property entirely
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	421 repo = self.repo
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	422 def file_callback(repo, memctx, path):
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	423 return context.memfilectx(path=path,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	424 data='bar',
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	425 islink=False,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	426 isexec=False,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	427 copied=False)
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	428 ctx = context.memctx(repo,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	429 (repo['default'].node(), node.nullid),
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	430 'message',
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	431 ['alpha', ],
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	432 file_callback,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	433 'author',
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	434 '2008-01-01 00:00:00 -0500',
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	435 {'branch': 'default', })
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	436 new_hash = repo.commitctx(ctx)
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	437 hg.update(repo, repo['tip'].node())
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	438 push_cmd.push_revisions_to_subversion(ui.ui(), repo=self.repo,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	439 hg_repo_path=self.wc_path,
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	440 svn_url='file://' + self.repo_path)
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	441 tip = self.repo['tip']
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	442 self.assertNotEqual(tip.node(), new_hash)
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	443 self.assertEqual(tip['alpha'].data(), 'bar')
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	444 self.assertEqual(tip.parents()[0]['alpha'].flags(), expected_flags)
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	445 self.assertEqual(tip['alpha'].flags(), '')
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	446
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	447
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	448 def suite():
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	449 test_classes = [PushTests, PushOverSvnserveTests]
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	450 tests = []
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	451 # This is the quickest hack I could come up with to load all the tests from
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	452 # both classes. Would love a patch that simplifies this without adding
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	453 # dependencies.
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	454 for tc in test_classes:
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	455 for attr in dir(tc):
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	456 if attr.startswith('test_'):
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	457 tests.append(tc(attr))
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	458 return unittest.TestSuite(tests)

Mercurial > hgsubversion

annotate tests/test_push_command.py @ 74:450d5d9d3b80