mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
89373467f1
Reverting a branch with a remove followed by a copy results in a branch replacement. By default, branch replacements are handled by closing the replaced branch and committing the new branch on top of it. But we do not really want that when reverting a branch, we only want a linear history with a changeset capturing the revert.
278 lines
12 KiB
Python
278 lines
12 KiB
Python
import test_util
|
|
|
|
import os
|
|
import unittest
|
|
import urllib
|
|
|
|
from mercurial import commands
|
|
from mercurial import hg
|
|
from mercurial import node
|
|
from mercurial import ui
|
|
from mercurial import encoding
|
|
|
|
class TestBasicRepoLayout(test_util.TestBase):
|
|
|
|
def test_no_dates(self):
|
|
repo = self._load_fixture_and_fetch('test_no_dates.svndump')
|
|
local_epoch = repo[0].date()
|
|
self.assertEqual(local_epoch[0], local_epoch[1])
|
|
self.assertEqual(repo[1].date(), repo[2].date())
|
|
|
|
def test_fresh_fetch_single_rev(self):
|
|
repo = self._load_fixture_and_fetch('single_rev.svndump')
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'434ed487136c1b47c1e8f952edb4dc5a8e6328df')
|
|
self.assertEqual(repo['tip'].extra()['convert_revision'],
|
|
'svn:df2126f7-00ab-4d49-b42c-7e981dde0bcf/trunk@2')
|
|
self.assertEqual(repo['tip'], repo[0])
|
|
|
|
def test_fresh_fetch_two_revs(self):
|
|
repo = self._load_fixture_and_fetch('two_revs.svndump')
|
|
self.assertEqual(node.hex(repo[0].node()),
|
|
'434ed487136c1b47c1e8f952edb4dc5a8e6328df')
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'c95251e0dd04697deee99b79cc407d7db76e6a5f')
|
|
self.assertEqual(repo['tip'], repo[1])
|
|
|
|
def test_branches(self):
|
|
repo = self._load_fixture_and_fetch('simple_branch.svndump')
|
|
self.assertEqual(node.hex(repo[0].node()),
|
|
'a1ff9f5d90852ce7f8e607fa144066b0a06bdc57')
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'545e36ed13615e39c5c8fb0c325109d8cb8e00c3')
|
|
self.assertEqual(len(repo['tip'].parents()), 1)
|
|
self.assertEqual(repo['tip'].parents()[0], repo['default'])
|
|
self.assertEqual(repo['tip'].extra()['convert_revision'],
|
|
'svn:3cd547df-371e-4add-bccf-aba732a2baf5/branches/the_branch@4')
|
|
self.assertEqual(repo['default'].extra()['convert_revision'],
|
|
'svn:3cd547df-371e-4add-bccf-aba732a2baf5/trunk@3')
|
|
self.assertEqual(len(repo.heads()), 1)
|
|
|
|
def test_two_branches_with_heads(self):
|
|
repo = self._load_fixture_and_fetch('two_heads.svndump')
|
|
self.assertEqual(node.hex(repo[0].node()),
|
|
'434ed487136c1b47c1e8f952edb4dc5a8e6328df')
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'1083037b18d85cd84fa211c5adbaeff0fea2cd9f')
|
|
self.assertEqual(node.hex(repo['the_branch'].node()),
|
|
'4e256962fc5df545e2e0a51d0d1dc61c469127e6')
|
|
self.assertEqual(node.hex(repo['the_branch'].parents()[0].node()),
|
|
'f1ff5b860f5dbb9a59ad0921a79da77f10f25109')
|
|
self.assertEqual(len(repo['tip'].parents()), 1)
|
|
self.assertEqual(repo['tip'], repo['default'])
|
|
self.assertEqual(len(repo.heads()), 2)
|
|
|
|
def test_many_special_cases_replay(self):
|
|
repo = self._load_fixture_and_fetch('many_special_cases.svndump')
|
|
self._many_special_cases_checks(repo)
|
|
|
|
|
|
def test_many_special_cases_diff(self):
|
|
repo = self._load_fixture_and_fetch('many_special_cases.svndump',
|
|
stupid=True)
|
|
self._many_special_cases_checks(repo)
|
|
|
|
def _many_special_cases_checks(self, repo):
|
|
self.assertEquals(node.hex(repo[0].node()),
|
|
'434ed487136c1b47c1e8f952edb4dc5a8e6328df')
|
|
# two possible hashes for bw compat to hg < 1.5, since hg 1.5
|
|
# sorts entries in extra()
|
|
self.assertTrue(node.hex(repo['tip'].node()) in
|
|
('e92012d8c170a0236c84166167f149c2e28548c6',
|
|
'b7bdc73041b1852563deb1ef3f4153c2fe4484f2'))
|
|
self.assertEqual(node.hex(repo['the_branch'].node()),
|
|
'4e256962fc5df545e2e0a51d0d1dc61c469127e6')
|
|
self.assertEqual(node.hex(repo['the_branch'].parents()[0].node()),
|
|
'f1ff5b860f5dbb9a59ad0921a79da77f10f25109')
|
|
self.assertEqual(len(repo['tip'].parents()), 1)
|
|
self.assertEqual(repo['tip'], repo['default'])
|
|
self.assertEqual(len(repo.heads()), 2)
|
|
|
|
def test_file_mixed_with_branches(self):
|
|
repo = self._load_fixture_and_fetch('file_mixed_with_branches.svndump')
|
|
self.assertEqual(node.hex(repo['default'].node()),
|
|
'434ed487136c1b47c1e8f952edb4dc5a8e6328df')
|
|
assert 'README' not in repo
|
|
assert '../branches' not in repo
|
|
|
|
def test_files_copied_from_outside_btt(self, stupid=False):
|
|
repo = self._load_fixture_and_fetch(
|
|
'test_files_copied_from_outside_btt.svndump', stupid=stupid)
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'3c78170e30ddd35f2c32faa0d8646ab75bba4f73')
|
|
self.assertEqual(len(repo.changelog), 2)
|
|
|
|
def test_files_copied_from_outside_btt_stupid(self):
|
|
self.test_files_copied_from_outside_btt(stupid=True)
|
|
|
|
def test_file_renamed_in_from_outside_btt(self):
|
|
repo = self._load_fixture_and_fetch(
|
|
'file_renamed_in_from_outside_btt.svndump')
|
|
self.assert_('LICENSE.file' in repo['default'])
|
|
|
|
def test_renamed_dir_in_from_outside_btt_not_repo_root(self):
|
|
repo = self._load_fixture_and_fetch(
|
|
'fetch_missing_files_subdir.svndump', subdir='foo')
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'269dcdd4361b2847e9f4288d4500e55d35df1f52')
|
|
self.assert_('bar/alpha' in repo['tip'])
|
|
self.assert_('foo' in repo['tip'])
|
|
self.assert_('bar/alpha' not in repo['tip'].parents()[0])
|
|
self.assert_('foo' in repo['tip'].parents()[0])
|
|
|
|
def test_oldest_not_trunk_and_tag_vendor_branch(self):
|
|
repo = self._load_fixture_and_fetch(
|
|
'tagged_vendor_and_oldest_not_trunk.svndump')
|
|
self.assertEqual(node.hex(repo['oldest'].node()),
|
|
'926671740dec045077ab20f110c1595f935334fa')
|
|
self.assertEqual(repo['tip'].parents()[0].parents()[0],
|
|
repo['oldest'])
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'1a6c3f30911d57abb67c257ec0df3e7bc44786f7')
|
|
|
|
def test_propedit_with_nothing_else(self, stupid=False):
|
|
repo = self._load_fixture_and_fetch('branch_prop_edit.svndump',
|
|
stupid=stupid)
|
|
self.assertEqual(repo['tip'].description(), 'Commit bogus propchange.')
|
|
self.assertEqual(repo['tip'].branch(), 'dev_branch')
|
|
|
|
def test_propedit_with_nothing_else_stupid(self):
|
|
self.test_propedit_with_nothing_else(stupid=True)
|
|
|
|
def test_entry_deletion(self, stupid=False):
|
|
repo = self._load_fixture_and_fetch('delentries.svndump',
|
|
stupid=stupid)
|
|
files = list(sorted(repo['tip'].manifest()))
|
|
self.assertEqual(['aa', 'd1/c', 'd1/d2prefix'], files)
|
|
|
|
def test_entry_deletion_stupid(self):
|
|
self.test_entry_deletion(stupid=True)
|
|
|
|
def test_fetch_when_trunk_has_no_files(self, stupid=False):
|
|
repo = self._load_fixture_and_fetch('file_not_in_trunk_root.svndump', stupid=stupid)
|
|
self.assertEqual(repo['tip'].branch(), 'default')
|
|
|
|
def test_fetch_when_trunk_has_no_files_stupid(self):
|
|
self.test_fetch_when_trunk_has_no_files(stupid=True)
|
|
|
|
def test_path_quoting(self, stupid=False):
|
|
repo_path = self.load_svndump('non_ascii_path_1.svndump')
|
|
subdir = '/b\xC3\xB8b'
|
|
quoted_subdir = urllib.quote(subdir)
|
|
|
|
repo_url = test_util.fileurl(repo_path)
|
|
wc_path = self.wc_path
|
|
wc2_path = wc_path + '-2'
|
|
|
|
ui = self.ui(stupid=stupid)
|
|
|
|
commands.clone(ui, repo_url + subdir, wc_path)
|
|
commands.clone(ui, repo_url + quoted_subdir, wc2_path)
|
|
repo = hg.repository(ui, wc_path)
|
|
repo2 = hg.repository(ui, wc2_path)
|
|
|
|
self.assertEqual(repo['tip'].extra()['convert_revision'],
|
|
repo2['tip'].extra()['convert_revision'])
|
|
self.assertEqual(len(repo), len(repo2))
|
|
|
|
for r in repo:
|
|
self.assertEqual(repo[r].hex(), repo2[r].hex())
|
|
|
|
def test_path_quoting_stupid(self):
|
|
repo = self.test_path_quoting(True)
|
|
|
|
|
|
def test_identical_fixtures(self):
|
|
'''ensure that the non_ascii_path_N fixtures are identical'''
|
|
fixturepaths = [
|
|
os.path.join(test_util.FIXTURES, 'non_ascii_path_1.svndump'),
|
|
os.path.join(test_util.FIXTURES, 'non_ascii_path_2.svndump'),
|
|
]
|
|
self.assertMultiLineEqual(open(fixturepaths[0]).read(),
|
|
open(fixturepaths[1]).read())
|
|
|
|
def test_invalid_message(self):
|
|
repo = self._load_fixture_and_fetch('invalid_utf8.tar.gz')
|
|
# changelog returns descriptions in local encoding
|
|
desc = encoding.fromlocal(repo[0].description())
|
|
self.assertEqual(desc.decode('utf8'),
|
|
u'bl\xe5b\xe6rgr\xf8d')
|
|
|
|
|
|
class TestStupidPull(test_util.TestBase):
|
|
def test_stupid(self):
|
|
repo = self._load_fixture_and_fetch('two_heads.svndump', stupid=True)
|
|
self.assertEqual(node.hex(repo[0].node()),
|
|
'434ed487136c1b47c1e8f952edb4dc5a8e6328df')
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'1083037b18d85cd84fa211c5adbaeff0fea2cd9f')
|
|
self.assertEqual(node.hex(repo['the_branch'].node()),
|
|
'4e256962fc5df545e2e0a51d0d1dc61c469127e6')
|
|
self.assertEqual(repo['the_branch'].extra()['convert_revision'],
|
|
'svn:df2126f7-00ab-4d49-b42c-7e981dde0bcf/branches/the_branch@5')
|
|
self.assertEqual(node.hex(repo['the_branch'].parents()[0].node()),
|
|
'f1ff5b860f5dbb9a59ad0921a79da77f10f25109')
|
|
self.assertEqual(len(repo['tip'].parents()), 1)
|
|
self.assertEqual(repo['default'].extra()['convert_revision'],
|
|
'svn:df2126f7-00ab-4d49-b42c-7e981dde0bcf/trunk@6')
|
|
self.assertEqual(repo['tip'], repo['default'])
|
|
self.assertEqual(len(repo.heads()), 2)
|
|
|
|
def test_oldest_not_trunk_and_tag_vendor_branch(self):
|
|
repo = self._load_fixture_and_fetch(
|
|
'tagged_vendor_and_oldest_not_trunk.svndump',
|
|
stupid=True)
|
|
self.assertEqual(node.hex(repo['oldest'].node()),
|
|
'926671740dec045077ab20f110c1595f935334fa')
|
|
self.assertEqual(repo['tip'].parents()[0].parents()[0],
|
|
repo['oldest'])
|
|
self.assertEqual(node.hex(repo['tip'].node()),
|
|
'1a6c3f30911d57abb67c257ec0df3e7bc44786f7')
|
|
|
|
def test_empty_repo(self, stupid=False):
|
|
# This used to crash HgEditor because it could be closed without
|
|
# having been initialized again.
|
|
self._load_fixture_and_fetch('emptyrepo2.svndump', stupid=stupid)
|
|
|
|
def test_empty_repo_stupid(self):
|
|
self.test_empty_repo(stupid=True)
|
|
|
|
def test_fetch_revert(self, stupid=False):
|
|
repo = self._load_fixture_and_fetch('revert.svndump', stupid=stupid)
|
|
graph = self.getgraph(repo)
|
|
refgraph = """\
|
|
o changeset: 3:937dcd1206d4
|
|
| branch:
|
|
| tags: tip
|
|
| summary: revert2
|
|
| files: a dir/b
|
|
|
|
|
o changeset: 2:9317a748b7c3
|
|
| branch:
|
|
| tags:
|
|
| summary: revert
|
|
| files: a dir/b
|
|
|
|
|
o changeset: 1:243259a4138a
|
|
| branch:
|
|
| tags:
|
|
| summary: changefiles
|
|
| files: a dir/b
|
|
|
|
|
o changeset: 0:ab86791fc857
|
|
branch:
|
|
tags:
|
|
summary: init
|
|
files: a dir/b
|
|
"""
|
|
self.assertEqual(refgraph.strip(), graph.strip())
|
|
|
|
def test_fetch_revert_stupid(self):
|
|
self.test_fetch_revert(stupid=True)
|
|
|
|
def suite():
|
|
all_tests = [unittest.TestLoader().loadTestsFromTestCase(TestBasicRepoLayout),
|
|
unittest.TestLoader().loadTestsFromTestCase(TestStupidPull),
|
|
]
|
|
return unittest.TestSuite(all_tests)
|