hgsubversion: tests/test_push_command.py annotate

annotate tests/test_push_command.py @ 1451:945700dac237

tests: use hostname instead of localhost The test_push_command test was failing on our machines because the machines are ipv6 but expose ipv4 on the 127.0.0.1 loopback interface. This caused the svnserve process to listen via ipv4, but the connecting process would attempt to connect on ipv6 and fail. Using the hostname causes it to listen using the primary network interface, which matches the interface that is used when the connecting client resolves the hostname. So the test now passes.

author	Durham Goode <durham@fb.com>
date	Tue, 07 Jun 2016 14:35:30 -0700
parents	a36e87ae2380
children	6e3f48d8002f

rev	line source
643 d2ef7220a079 tests: import test_util as the first module in all relevant tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 626 diff changeset	1 import test_util
d2ef7220a079 tests: import test_util as the first module in all relevant tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 626 diff changeset	2
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 277 diff changeset	3 import atexit
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	4 import errno
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	5 import os
854 50a09999dce3 tests: push_command: use svnserve.kill() in Python >=2.6 Arne Babenhauserheide <arne.babenhauserheide@fzk.de> parents: 834 diff changeset	6 import sys
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 277 diff changeset	7 import random
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	8 import shutil
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	9 import socket
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	10 import subprocess
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	11 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	12
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 from mercurial import context
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 277 diff changeset	14 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	15 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	16 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	17 from mercurial import revlog
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	18 from mercurial import util as hgutil
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
1040 ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	20 from hgsubversion import util
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	21 from hgsubversion import compathacks
1040 ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	22
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	23 import time
d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	24
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	25
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 80 diff changeset	26 class PushTests(test_util.TestBase):
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1048 diff changeset	27 obsolete_mode_tests = True
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1048 diff changeset	28
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	29 def setUp(self):
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 80 diff changeset	30 test_util.TestBase.setUp(self)
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	31 self.repo_path = self.load_and_fetch('simple_branch.svndump')[1]
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	32
220 06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	33 def test_cant_push_empty_ctx(self):
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	34 repo = self.repo
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	35 def file_callback(repo, memctx, path):
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	36 if path == 'adding_file':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	37 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	38 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	39 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	40 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	41 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	42 copied=False)
220 06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	43 raise IOError()
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	44 ctx = context.memctx(repo,
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	45 (repo['default'].node(), node.nullid),
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	46 'automated test',
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	47 [],
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	48 file_callback,
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	49 'an_author',
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	50 '2008-10-07 20:59:48 -0500',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	51 {'branch': 'default', })
220 06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	52 new_hash = repo.commitctx(ctx)
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	53 hg.update(repo, repo['tip'].node())
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	54 old_tip = repo['tip'].node()
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	55 self.pushrevisions()
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	56 tip = self.repo['tip']
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	57 self.assertEqual(tip.node(), old_tip)
06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	58
1036 e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	59 def test_push_add_of_added_upstream_gives_sane_error(self):
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	60 repo = self.repo
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	61 def file_callback(repo, memctx, path):
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	62 if path == 'adding_file':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	63 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	64 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	65 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	66 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	67 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	68 copied=False)
1036 e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	69 raise IOError()
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	70 p1 = repo['default'].node()
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	71 ctx = context.memctx(repo,
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	72 (p1, node.nullid),
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	73 'automated test',
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	74 ['adding_file'],
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	75 file_callback,
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	76 'an_author',
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	77 '2008-10-07 20:59:48 -0500',
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	78 {'branch': 'default', })
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	79 new_hash = repo.commitctx(ctx)
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	80 hg.update(repo, repo['tip'].node())
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	81 old_tip = repo['tip'].node()
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	82 self.pushrevisions()
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	83 tip = self.repo['tip']
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	84 self.assertNotEqual(tip.node(), old_tip)
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	85
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	86 # This node adds the same file as the first one we added, and
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	87 # will be refused by the server for adding a file that already
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	88 # exists. We should respond with an error suggesting the user
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	89 # rebase.
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	90 ctx = context.memctx(repo,
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	91 (p1, node.nullid),
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	92 'automated test',
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	93 ['adding_file'],
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	94 file_callback,
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	95 'an_author',
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	96 '2008-10-07 20:59:48 -0500',
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	97 {'branch': 'default', })
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	98 new_hash = repo.commitctx(ctx)
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	99 hg.update(repo, repo['tip'].node())
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	100 old_tip = repo['tip'].node()
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	101 try:
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	102 self.pushrevisions()
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	103 except hgutil.Abort, e:
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	104 assert "pull again and rebase" in str(e)
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	105 tip = self.repo['tip']
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	106 self.assertEqual(tip.node(), old_tip)
e775ffbcb359 push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Augie Fackler <raf@durin42.com> parents: 992 diff changeset	107
461 db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	108 def test_cant_push_with_changes(self):
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	109 repo = self.repo
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	110 def file_callback(repo, memctx, path):
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	111 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	112 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	113 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	114 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	115 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	116 copied=False)
461 db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	117 ctx = context.memctx(repo,
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	118 (repo['default'].node(), node.nullid),
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	119 'automated test',
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	120 ['adding_file'],
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	121 file_callback,
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	122 'an_author',
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	123 '2008-10-07 20:59:48 -0500',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	124 {'branch': 'default', })
461 db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	125 new_hash = repo.commitctx(ctx)
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	126 hg.update(repo, repo['tip'].node())
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	127 # Touch an existing file
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	128 repo.wwrite('beta', 'something else', '')
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	129 try:
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	130 self.pushrevisions()
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	131 except hgutil.Abort:
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	132 pass
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	133 tip = self.repo['tip']
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	134 self.assertEqual(new_hash, tip.node())
db3a53a2cd76 wrappers: make push aborts if uncommitted changes Patrick Mezard <pmezard@gmail.com> parents: 356 diff changeset	135
671 e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	136 def internal_push_over_svnserve(self, subdir='', commit=True):
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	137 repo_path = self.load_svndump('simple_branch.svndump')
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	138 open(os.path.join(repo_path, 'conf', 'svnserve.conf'),
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	139 'w').write('[general]\nanon-access=write\n[sasl]\n')
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	140 self.port = random.randint(socket.IPPORT_USERRESERVED, 65535)
1451 945700dac237 tests: use hostname instead of localhost Durham Goode <durham@fb.com> parents: 1321 diff changeset	141 self.host = socket.gethostname()
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	142 args = ['svnserve', '--daemon', '--foreground',
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	143 '--listen-port=%d' % self.port,
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	144 '--listen-host=%s' % self.host,
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	145 '--root=%s' % repo_path]
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	146
340 88ba55ad58c0 Minor tweaks to wrapper documentation. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	147 svnserve = subprocess.Popen(args, stdout=subprocess.PIPE,
88ba55ad58c0 Minor tweaks to wrapper documentation. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	148 stderr=subprocess.STDOUT)
88ba55ad58c0 Minor tweaks to wrapper documentation. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	149 self.svnserve_pid = svnserve.pid
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	150 try:
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	151 time.sleep(2)
337 46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 336 diff changeset	152 import shutil
46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 336 diff changeset	153 shutil.rmtree(self.wc_path)
671 e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	154 commands.clone(self.ui(),
e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	155 'svn://%s:%d/%s' % (self.host, self.port, subdir),
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	156 self.wc_path, noupdate=True)
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	157
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	158 repo = self.repo
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	159 old_tip = repo['tip'].node()
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	160 expected_parent = repo['default'].node()
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	161 def file_callback(repo, memctx, path):
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	162 if path == 'adding_file':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	163 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	164 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	165 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	166 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	167 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	168 copied=False)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	169 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	170 ctx = context.memctx(repo,
348 af1508b7ad54 test_push_command: improve readability a bit. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 340 diff changeset	171 parents=(repo['default'].node(), node.nullid),
af1508b7ad54 test_push_command: improve readability a bit. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 340 diff changeset	172 text='automated test',
af1508b7ad54 test_push_command: improve readability a bit. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 340 diff changeset	173 files=['adding_file'],
af1508b7ad54 test_push_command: improve readability a bit. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 340 diff changeset	174 filectxfn=file_callback,
af1508b7ad54 test_push_command: improve readability a bit. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 340 diff changeset	175 user='an_author',
af1508b7ad54 test_push_command: improve readability a bit. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 340 diff changeset	176 date='2008-10-07 20:59:48 -0500',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	177 extra={'branch': 'default', })
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	178 new_hash = repo.commitctx(ctx)
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	179 if not commit:
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	180 return # some tests use this test as an extended setup.
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	181 hg.update(repo, repo['tip'].node())
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	182 oldauthor = repo['tip'].user()
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	183 commands.push(repo.ui, repo)
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	184 tip = self.repo['tip']
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	185 self.assertNotEqual(oldauthor, tip.user())
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	186 self.assertNotEqual(tip.node(), old_tip)
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	187 self.assertEqual(tip.parents()[0].node(), expected_parent)
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	188 self.assertEqual(tip['adding_file'].data(), 'foo')
c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	189 self.assertEqual(tip.branch(), 'default')
349 5d0d9424913f test_push_command: this test causes an author of None. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 348 diff changeset	190 # unintended behaviour:
5d0d9424913f test_push_command: this test causes an author of None. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 348 diff changeset	191 self.assertNotEqual('an_author', tip.user())
735 c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 690 diff changeset	192 self.assertEqual('(no author)', tip.user().rsplit('@', 1)[0])
336 c0b943cef0c3 Use try/finally in an attempt to stop leaking svnserve processes. Augie Fackler <durin42@gmail.com> parents: 331 diff changeset	193 finally:
854 50a09999dce3 tests: push_command: use svnserve.kill() in Python >=2.6 Arne Babenhauserheide <arne.babenhauserheide@fzk.de> parents: 834 diff changeset	194 if sys.version_info >= (2,6):
50a09999dce3 tests: push_command: use svnserve.kill() in Python >=2.6 Arne Babenhauserheide <arne.babenhauserheide@fzk.de> parents: 834 diff changeset	195 svnserve.kill()
907 173065f9b715 push test: peek inside svn's pending transaction list on abort Augie Fackler <raf@durin42.com> parents: 872 diff changeset	196 else:
854 50a09999dce3 tests: push_command: use svnserve.kill() in Python >=2.6 Arne Babenhauserheide <arne.babenhauserheide@fzk.de> parents: 834 diff changeset	197 test_util.kill_process(svnserve)
220 06eb60f9a026 push: Do not attempt to push empty revisions. Augie Fackler <durin42@gmail.com> parents: 150 diff changeset	198
671 e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	199 def test_push_over_svnserve(self):
e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	200 self.internal_push_over_svnserve()
e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	201
e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	202 def test_push_over_svnserve_with_subdir(self):
e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	203 self.internal_push_over_svnserve(subdir='///branches////the_branch/////')
e910e3ebd23b svnmeta: strip all repeated slashes from subdir Peter Arrenbrecht <peter.arrenbre...@gmail.com> parents: 643 diff changeset	204
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	205 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	206 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	207 old_tip = repo['tip'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	208 expected_parent = repo['default'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	209 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	210 if path == 'adding_file':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	211 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	212 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	213 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	214 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	215 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	216 copied=False)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	217 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	218 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	219 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	220 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	221 ['adding_file'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	222 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	223 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	224 '2008-10-07 20:59:48 -0500',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	225 {'branch': 'default', })
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	226 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	227 if not commit:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	228 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	229 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	230 self.pushrevisions()
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	231 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	232 self.assertNotEqual(tip.node(), old_tip)
150 58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	233 self.assertEqual(node.hex(tip.parents()[0].node()),
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	234 node.hex(expected_parent))
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	235 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	236 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	237
150 58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	238 def test_push_two_revs_different_local_branch(self):
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	239 def filectxfn(repo, memctx, path):
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	240 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	241 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	242 data=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	243 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	244 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	245 copied=False)
150 58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	246 oldtiphash = self.repo['default'].node()
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	247 ctx = context.memctx(self.repo,
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	248 (self.repo[0].node(), revlog.nullid,),
150 58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	249 'automated test',
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	250 ['gamma', ],
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	251 filectxfn,
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	252 'testy',
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	253 '2008-12-21 16:32:00 -0500',
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	254 {'branch': 'localbranch', })
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	255 newhash = self.repo.commitctx(ctx)
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	256 ctx = context.memctx(self.repo,
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	257 (newhash, revlog.nullid),
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	258 'automated test2',
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	259 ['delta', ],
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	260 filectxfn,
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	261 'testy',
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	262 '2008-12-21 16:32:00 -0500',
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	263 {'branch': 'localbranch', })
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	264 newhash = self.repo.commitctx(ctx)
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	265 repo = self.repo
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	266 hg.update(repo, newhash)
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 277 diff changeset	267 commands.push(repo.ui, repo)
150 58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	268 self.assertEqual(self.repo['tip'].parents()[0].parents()[0].node(), oldtiphash)
58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	269 self.assertEqual(self.repo['tip'].files(), ['delta', ])
1321 a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	270 self.assertEqual(sorted(self.repo['tip'].manifest().keys()),
a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	271 ['alpha', 'beta', 'delta', 'gamma'])
150 58ae90a65f41 push: Improved the rebasing logic for push so that it doesn't break with Augie Fackler <durin42@gmail.com> parents: 101 diff changeset	272
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	273 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	274 # 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	275 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	276 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	277 old_tip = repo['tip'].node()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	278 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	279 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	280 if path == 'adding_file2':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	281 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	282 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	283 data='foo2',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	284 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	285 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	286 copied=False)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	287 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	288 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	289 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	290 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	291 ['adding_file2'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	292 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	293 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	294 '2008-10-07 20:59:48 -0500',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	295 {'branch': 'default', })
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	296 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	297 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	298 self.pushrevisions()
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	299 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	300 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	301 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	302 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	303 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	304 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	305 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	306 try:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	307 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	308 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	309 except revlog.LookupError, e:
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	310 pass
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	311 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	312
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	313 def test_push_to_branch(self, push=True):
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	314 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	315 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	316 if path == 'adding_file':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	317 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	318 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	319 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	320 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	321 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	322 copied=False)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	323 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	324 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	325 (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	326 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	327 ['adding_file'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	328 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	329 'an_author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	330 '2008-10-07 20:59:48 -0500',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	331 {'branch': 'the_branch', })
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	332 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	333 hg.update(repo, repo['tip'].node())
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	334 if push:
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	335 self.pushrevisions()
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	336 tip = self.repo['tip']
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	337 self.assertNotEqual(tip.node(), new_hash)
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	338 self.assertEqual(tip['adding_file'].data(), 'foo')
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	339 self.assertEqual(tip.branch(), 'the_branch')
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	340
625 96552e855d7e tests: fix misnamed test caught while hunting unrelated bugs Augie Fackler <durin42@gmail.com> parents: 576 diff changeset	341 def test_push_to_non_tip(self):
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	342 self.test_push_to_branch(push=False)
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	343 wc2path = self.wc_path + '_clone'
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	344 u = self.repo.ui
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 735 diff changeset	345 test_util.hgclone(self.repo.ui, self.wc_path, wc2path, update=False)
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 625 diff changeset	346 res = self.pushrevisions()
8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 625 diff changeset	347 self.assertEqual(0, res)
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	348 oldf = open(os.path.join(self.wc_path, '.hg', 'hgrc'))
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	349 hgrc = oldf.read()
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	350 oldf.close()
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	351 shutil.rmtree(self.wc_path)
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 735 diff changeset	352 test_util.hgclone(u, wc2path, self.wc_path, update=False)
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	353 oldf = open(os.path.join(self.wc_path, '.hg', 'hgrc'), 'w')
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	354 oldf.write(hgrc)
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	355 oldf.close()
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	356
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	357 # do a commit here
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	358 self.commitchanges([('foobaz', 'foobaz', 'This file is added on default.',),
356 62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	359 ],
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	360 parent='default',
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	361 message='commit to default')
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	362 from hgsubversion import svncommands
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	363 svncommands.rebuildmeta(u,
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	364 self.repo,
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	365 args=[test_util.fileurl(self.repo_path)])
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	366
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	367
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	368 hg.update(self.repo, self.repo['tip'].node())
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	369 oldnode = self.repo['tip'].hex()
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	370 self.pushrevisions(expected_extra_back=1)
62f90781eb10 push: don't refuse to push if it looks like we haven't pulled all changes. Augie Fackler <durin42@gmail.com> parents: 349 diff changeset	371 self.assertNotEqual(oldnode, self.repo['tip'].hex(), 'Revision was not pushed.')
48 d87b57c719f0 Add a test that verifies push works to svn:// servers. Augie Fackler <durin42@gmail.com> parents: 27 diff changeset	372
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	373 def test_delete_file(self):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	374 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	375 def file_callback(repo, memctx, path):
1239 f96e2495de39 test_push_command: use compat hack for filectxfn for deleted files Siddharth Agarwal <sid0@fb.com> parents: 1236 diff changeset	376 return compathacks.filectxfn_deleted(memctx, path)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	377 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	378 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	379 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	380 'automated test',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	381 ['alpha'],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	382 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	383 'an author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	384 '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	385 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	386 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	387 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	388 self.pushrevisions()
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	389 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	390 self.assertEqual(old_files,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	391 set(tip.manifest().keys() + ['alpha']))
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	392 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	393
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	394 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	395 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	396 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	397 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	398 if path == 'gamma':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	399 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	400 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	401 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	402 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	403 isexec=True,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	404 copied=False)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	405 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	406 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	407 (repo['tip'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	408 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	409 ['gamma', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	410 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	411 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	412 '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	413 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	414 new_hash = repo.commitctx(ctx)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 242 diff changeset	415 hg.clean(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	416 self.pushrevisions()
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	417 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	418 self.assertNotEqual(tip.node(), new_hash)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 242 diff changeset	419 self.assert_('@' in self.repo['tip'].user())
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	420 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	421 self.assertEqual(tip['gamma'].data(), 'foo')
1321 a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	422 self.assertEqual(sorted([x for x in tip.manifest().keys() if 'x' not in
a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	423 tip[x].flags()]),
a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	424 ['adding_file', 'alpha', 'beta', ])
49 2bc4999a89d3 Add tests for a bunch more cases in pushing to svn. Augie Fackler <durin42@gmail.com> parents: 48 diff changeset	425
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	426 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	427 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	428 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	429 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	430 if path == 'gamma':
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	431 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	432 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	433 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	434 islink=True,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	435 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	436 copied=False)
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 484 diff changeset	437 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	438 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	439 (repo['tip'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	440 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	441 ['gamma', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	442 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	443 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	444 '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	445 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	446 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	447 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	448 self.pushrevisions()
1229 46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	449 # grab a new repo instance (self.repo is an @property functions)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	450 repo = self.repo
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	451 tip = repo['tip']
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	452 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	453 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	454 self.assertEqual(tip['gamma'].data(), 'foo')
1321 a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	455 self.assertEqual(sorted([x for x in tip.manifest().keys() if 'l' not in
a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	456 tip[x].flags()]),
a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	457 ['adding_file', 'alpha', 'beta', ])
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	458
1229 46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	459 def file_callback2(repo, memctx, path):
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	460 if path == 'gamma':
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	461 return compathacks.makememfilectx(repo,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	462 path=path,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	463 data='a' * 129,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	464 islink=True,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	465 isexec=False,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	466 copied=False)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	467 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	468
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	469 ctx = context.memctx(repo,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	470 (repo['tip'].node(), node.nullid),
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	471 'message',
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	472 ['gamma', ],
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	473 file_callback2,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	474 'author',
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	475 '2014-08-08 20:11:41 -0700',
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	476 {'branch': 'default', })
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	477 repo.commitctx(ctx)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	478 hg.update(repo, repo['tip'].node())
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	479 self.pushrevisions()
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	480 # grab a new repo instance (self.repo is an @property functions)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	481 repo = self.repo
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	482 tip = repo['tip']
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	483 self.assertEqual(tip['gamma'].flags(), 'l')
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	484 self.assertEqual(tip['gamma'].data(), 'a'*129)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	485
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	486 def file_callback3(repo, memctx, path):
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	487 if path == 'gamma':
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	488 return compathacks.makememfilectx(repo,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	489 path=path,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	490 data='a' * 64 + 'b' * 65,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	491 islink=True,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	492 isexec=False,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	493 copied=False)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	494 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	495
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	496 ctx = context.memctx(repo,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	497 (repo['tip'].node(), node.nullid),
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	498 'message',
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	499 ['gamma', ],
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	500 file_callback3,
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	501 'author',
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	502 '2014-08-08 20:16:25 -0700',
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	503 {'branch': 'default', })
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	504 repo.commitctx(ctx)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	505 hg.update(repo, repo['tip'].node())
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	506 self.pushrevisions()
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	507 repo = self.repo
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	508 tip = repo['tip']
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	509 self.assertEqual(tip['gamma'].flags(), 'l')
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	510 self.assertEqual(tip['gamma'].data(), 'a' * 64 + 'b' * 65)
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	511
46523cdfd3b0 pushmod: prepend "link " to base text for links David Schleimer <dschleimer@gmail.com> parents: 1202 diff changeset	512
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	513 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	514 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	515 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	516 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	517
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	518 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	519 link=False, expected_flags='x'):
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	520 self.test_push_to_default()
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	521 repo = self.repo
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	522 def file_callback(repo, memctx, path):
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	523 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	524 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	525 data='foo',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	526 islink=link,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	527 isexec=execute,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	528 copied=False)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	529 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	530 (repo['default'].node(), node.nullid),
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	531 'message',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	532 ['alpha', ],
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	533 file_callback,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	534 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	535 '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	536 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	537 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	538 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	539 self.pushrevisions()
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	540 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	541 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	542 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	543 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	544 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	545 # 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	546 # works
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	547 repo = self.repo
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 83 diff changeset	548 def file_callback2(repo, memctx, path):
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	549 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	550 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	551 data='bar',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	552 islink=link,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	553 isexec=execute,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	554 copied=False)
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	555 ctx = context.memctx(repo,
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	556 (repo['default'].node(), node.nullid),
1206 aa8b72bd1320 test_push_command: improve commit messages inside test for diagnostics Augie Fackler <raf@durin42.com> parents: 1202 diff changeset	557 'mutate already-special file alpha',
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	558 ['alpha', ],
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 83 diff changeset	559 file_callback2,
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	560 'author',
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	561 '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	562 {'branch': 'default', })
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	563 new_hash = repo.commitctx(ctx)
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	564 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	565 self.pushrevisions()
50 80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	566 tip = self.repo['tip']
80b923ab242b Drop any pretense of supporting svn 1.4.x. Augie Fackler <durin42@gmail.com> parents: 49 diff changeset	567 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	568 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	569 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	570 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	571 # 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	572 repo = self.repo
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 83 diff changeset	573 def file_callback3(repo, memctx, path):
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	574 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	575 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	576 data='bar',
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	577 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	578 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	579 copied=False)
62 cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	580 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	581 (repo['default'].node(), node.nullid),
1206 aa8b72bd1320 test_push_command: improve commit messages inside test for diagnostics Augie Fackler <raf@durin42.com> parents: 1202 diff changeset	582 'convert alpha back to regular file',
62 cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	583 ['alpha', ],
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 83 diff changeset	584 file_callback3,
62 cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	585 'author',
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	586 '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	587 {'branch': 'default', })
cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	588 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	589 hg.update(repo, repo['tip'].node())
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 65 diff changeset	590 self.pushrevisions()
62 cc5ebdb1e8d4 push_cmd: Further simplified some logic thanks to an improved test. Augie Fackler <durin42@gmail.com> parents: 60 diff changeset	591 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	592 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	593 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	594 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	595 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	596
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	597 def test_push_outdated_base_text(self):
3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	598 self.test_push_two_revs()
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	599 changes = [('adding_file', 'adding_file', 'different_content',),
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	600 ]
690 4b55fb6d6847 tests: remove constant rev no from test script Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 671 diff changeset	601 par = self.repo['tip'].rev()
4b55fb6d6847 tests: remove constant rev no from test script Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 671 diff changeset	602 self.commitchanges(changes, parent=par)
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	603 self.pushrevisions()
3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	604 changes = [('adding_file', 'adding_file',
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	605 'even_more different_content',),
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	606 ]
690 4b55fb6d6847 tests: remove constant rev no from test script Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 671 diff changeset	607 self.commitchanges(changes, parent=par)
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	608 try:
3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	609 self.pushrevisions()
3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	610 assert False, 'This should have aborted!'
3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	611 except hgutil.Abort, e:
3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	612 self.assertEqual(e.args[0],
556 8522f8ef799e pushmod: make outdated parent error message more helpful Patrick Mezard <pmezard@gmail.com> parents: 531 diff changeset	613 'Outgoing changesets parent is not at subversion '
8522f8ef799e pushmod: make outdated parent error message more helpful Patrick Mezard <pmezard@gmail.com> parents: 531 diff changeset	614 'HEAD\n'
8522f8ef799e pushmod: make outdated parent error message more helpful Patrick Mezard <pmezard@gmail.com> parents: 531 diff changeset	615 '(pull again and rebase on a newer revision)')
907 173065f9b715 push test: peek inside svn's pending transaction list on abort Augie Fackler <raf@durin42.com> parents: 872 diff changeset	616 # verify that any pending transactions on the server got cleaned up
173065f9b715 push test: peek inside svn's pending transaction list on abort Augie Fackler <raf@durin42.com> parents: 872 diff changeset	617 self.assertEqual([], os.listdir(
173065f9b715 push test: peek inside svn's pending transaction list on abort Augie Fackler <raf@durin42.com> parents: 872 diff changeset	618 os.path.join(self.tmpdir, 'testrepo-1', 'db', 'transactions')))
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	619
928 d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	620 def test_push_encoding(self):
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	621 self.test_push_two_revs()
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	622 # Writing then rebasing UTF-8 filenames in a cp1252 windows console
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	623 # used to fail because hg internal encoding was being changed during
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	624 # the interactions with subversion, and during the rebase, which
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	625 # confused the dirstate and made it believe the file was deleted.
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	626 fn = 'pi\xc3\xa8ce/test'
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	627 changes = [(fn, fn, 'a')]
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	628 par = self.repo['tip'].rev()
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	629 self.commitchanges(changes, parent=par)
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	630 self.pushrevisions()
d99ed94f4760 wrappers: do not change encoding when pushing Patrick Mezard <patrick@mezard.eu> parents: 907 diff changeset	631
929 8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	632 def test_push_emptying_changeset(self):
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	633 r = self.repo['tip']
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	634 changes = [
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	635 ('alpha', None, None),
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	636 ('beta', None, None),
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	637 ]
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	638 parent = self.repo['tip'].rev()
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	639 self.commitchanges(changes, parent=parent)
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	640 self.pushrevisions()
1321 a36e87ae2380 tests: always compare manifest keys in sorted order Siddharth Agarwal <sid0@fb.com> parents: 1239 diff changeset	641 self.assertEqual(len(self.repo['tip'].manifest()), 0)
929 8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	642
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	643 # Try to re-add a file after emptying the branch
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	644 changes = [
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	645 ('alpha', 'alpha', 'alpha'),
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	646 ]
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	647 self.commitchanges(changes, parent=self.repo['tip'].rev())
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	648 self.pushrevisions()
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	649 self.assertEqual(['alpha'], list(self.repo['tip'].manifest()))
8417be758047 pushmod: keep the root svn dir when emptying the hg repo (issue359) Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	650
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	651 def test_push_without_pushing_children(self):
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	652 '''
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	653 Verify that a push of a nontip node, keeps the tip child
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	654 on top of the pushed commit.
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	655 '''
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	656
1048 903c9c9dfe6a tests: count revisions explicitly Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1044 diff changeset	657 oldlen = test_util.repolen(self.repo)
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	658 oldtiphash = self.repo['default'].node()
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	659
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	660 changes = [('gamma', 'gamma', 'sometext')]
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	661 newhash1 = self.commitchanges(changes)
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	662
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	663 changes = [('delta', 'delta', 'sometext')]
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	664 newhash2 = self.commitchanges(changes)
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	665
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	666 # push only the first commit
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	667 repo = self.repo
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	668 hg.update(repo, newhash1)
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	669 commands.push(repo.ui, repo)
1048 903c9c9dfe6a tests: count revisions explicitly Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1044 diff changeset	670 self.assertEqual(test_util.repolen(self.repo), oldlen + 2)
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	671
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	672 # verify that the first commit is pushed, and the second is not
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	673 commit2 = self.repo['tip']
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	674 self.assertEqual(commit2.files(), ['delta', ])
1040 ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	675 self.assertEqual(util.getsvnrev(commit2), None)
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	676 commit1 = commit2.parents()[0]
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	677 self.assertEqual(commit1.files(), ['gamma', ])
1040 ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	678 prefix = 'svn:' + self.repo.svnmeta().uuid
ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	679 self.assertEqual(util.getsvnrev(commit1),
ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	680 prefix + '/branches/the_branch@5')
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 929 diff changeset	681
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	682 def test_push_two_that_modify_same_file(self):
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	683 '''
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	684 Push performs a rebase if two commits touch the same file.
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	685 This test verifies that code path works.
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	686 '''
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	687
1048 903c9c9dfe6a tests: count revisions explicitly Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1044 diff changeset	688 oldlen = test_util.repolen(self.repo)
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	689 oldtiphash = self.repo['default'].node()
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	690
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	691 changes = [('gamma', 'gamma', 'sometext')]
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	692 newhash = self.commitchanges(changes)
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	693 changes = [('gamma', 'gamma', 'sometext\n moretext'),
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	694 ('delta', 'delta', 'sometext\n moretext'),
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	695 ]
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	696 newhash = self.commitchanges(changes)
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	697
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	698 repo = self.repo
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	699 hg.update(repo, newhash)
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	700 commands.push(repo.ui, repo)
1048 903c9c9dfe6a tests: count revisions explicitly Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1044 diff changeset	701 self.assertEqual(test_util.repolen(self.repo), oldlen + 2)
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	702
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	703 # verify that both commits are pushed
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	704 commit1 = self.repo['tip']
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	705 self.assertEqual(commit1.files(), ['delta', 'gamma'])
1040 ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	706
ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	707 prefix = 'svn:' + self.repo.svnmeta().uuid
ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	708 self.assertEqual(util.getsvnrev(commit1),
ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	709 prefix + '/branches/the_branch@6')
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	710 commit2 = commit1.parents()[0]
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	711 self.assertEqual(commit2.files(), ['gamma'])
1040 ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	712 self.assertEqual(util.getsvnrev(commit2),
ada2400241c4 fixes for running under Mercurial 2.0 Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1036 diff changeset	713 prefix + '/branches/the_branch@5')
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	714
992 110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	715 def test_push_in_subdir(self, commit=True):
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	716 repo = self.repo
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	717 old_tip = repo['tip'].node()
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	718 def file_callback(repo, memctx, path):
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	719 if path == 'adding_file' or path == 'newdir/new_file':
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	720 testData = 'fooFirstFile'
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	721 if path == 'newdir/new_file':
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	722 testData = 'fooNewFile'
1202 cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	723 return compathacks.makememfilectx(repo,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	724 path=path,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	725 data=testData,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	726 islink=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	727 isexec=False,
cccc7a50f66d test_push_command: call makememfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 1055 diff changeset	728 copied=False)
992 110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	729 raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	730 ctx = context.memctx(repo,
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	731 (repo['default'].node(), node.nullid),
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	732 'automated test',
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	733 ['adding_file'],
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	734 file_callback,
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	735 'an_author',
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	736 '2012-12-13 20:59:48 -0500',
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	737 {'branch': 'default', })
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	738 new_hash = repo.commitctx(ctx)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	739 p = os.path.join(repo.root, "newdir")
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	740 os.mkdir(p)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	741 ctx = context.memctx(repo,
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	742 (repo['default'].node(), node.nullid),
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	743 'automated test',
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	744 ['newdir/new_file'],
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	745 file_callback,
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	746 'an_author',
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	747 '2012-12-13 20:59:48 -0500',
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	748 {'branch': 'default', })
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	749 os.chdir(p)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	750 new_hash = repo.commitctx(ctx)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	751 hg.update(repo, repo['tip'].node())
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	752 self.pushrevisions()
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	753 tip = self.repo['tip']
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	754 self.assertNotEqual(tip.node(), old_tip)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	755 self.assertEqual(p, os.getcwd())
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	756 self.assertEqual(tip['adding_file'].data(), 'fooFirstFile')
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	757 self.assertEqual(tip['newdir/new_file'].data(), 'fooNewFile')
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	758 self.assertEqual(tip.branch(), 'default')
1236 f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	759
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	760 def test_update_after_push(self):
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	761 repo = self.repo
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	762 ui = repo.ui
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	763
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	764 ui.setconfig('hooks',
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	765 'debug-hgsubversion-between-push-and-pull-for-tests',
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	766 lambda ui, repo, hooktype: self.add_svn_rev(
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	767 self.repo_path,
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	768 {'trunk/racey_file': 'race conditions suck'}))
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	769
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	770 self.test_push_to_branch(push=False)
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	771 commands.push(ui, repo)
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	772 newctx = self.repo['.']
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	773 self.assertNotEqual(newctx.node(), self.repo['tip'].node())
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	774 self.assertEqual(newctx['adding_file'].data(), 'foo')
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1231 diff changeset	775 self.assertEqual(newctx.branch(), 'the_branch')

Mercurial > hgsubversion

annotate tests/test_push_command.py @ 1451:945700dac237