mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
ef04ccf546
Summary: D17135557 added a bunch of `pyre-fixme` comments to the EdenFS integration tests for cases where Pyre cannot detect that some attributes are initialized by the test case `setUp()` method. It looks like Pyre's handling of `setUp()` is somewhat incorrect: it looks like if a class has a `setUp()` method this currently suppresses all uninitialized attribute errors (even if some attributes really are never initialized). However, Pyre does not detect `setUp()` methods inherited from parent classes, and always warns about uninitialized attributes in this case even they are initialized. Lets change these comments from `pyre-fixme` to `pyre-ignore` since this appears to be an issue with Pyre rather than with this code. T62487924 is open to track adding support for annotating custom constructor methods, which might help here. I've also posted in Pyre Q&A about incorrect handling of `setUp()` in derived classes. Reviewed By: grievejia Differential Revision: D19963118 fbshipit-source-id: 9fd13fc8665367e0780f871a5a0d9a8fe50cc687
103 lines
3.7 KiB
Python
103 lines
3.7 KiB
Python
#!/usr/bin/env python3
|
|
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2.
|
|
|
|
import os
|
|
|
|
from eden.integration.lib import hgrepo
|
|
|
|
from .lib.hg_extension_test_base import EdenHgTestCase, hg_test
|
|
|
|
|
|
@hg_test
|
|
# pyre-ignore[13]: T62487924
|
|
class GraftTest(EdenHgTestCase):
|
|
commit1: str
|
|
|
|
def populate_backing_repo(self, repo: hgrepo.HgRepository) -> None:
|
|
repo.write_file("first.txt", "1")
|
|
self.commit1 = repo.commit("Initial commit\n")
|
|
|
|
def test_graft_conflict_free_commit(self) -> None:
|
|
# Create a new head.
|
|
self.write_file("second.txt", "2")
|
|
self.repo.add_file("second.txt")
|
|
commit2 = self.repo.commit("Second commit\n")
|
|
|
|
# Create another new head.
|
|
self.repo.update(self.commit1)
|
|
self.assertFalse(os.path.exists(self.get_path("second.txt")))
|
|
self.write_file("third.txt", "3")
|
|
self.repo.add_file("third.txt")
|
|
commit3 = self.repo.commit("Third commit\n")
|
|
|
|
# Perform graft.
|
|
self.hg("graft", commit2)
|
|
|
|
# Verify we end up with the expected stack of commits.
|
|
self.assert_status_empty()
|
|
commits = self.repo.log()
|
|
self.assertEqual(3, len(commits))
|
|
self.assertEqual([self.commit1, commit3], commits[:2])
|
|
self.assertTrue(os.path.exists(self.get_path("second.txt")))
|
|
|
|
def test_graft_commit_with_conflict(self) -> None:
|
|
# Create a new head.
|
|
self.write_file("first.txt", "2")
|
|
commit2 = self.repo.commit("Updated first.txt.\n")
|
|
|
|
# Create another new head that modifies first.txt in a different way.
|
|
self.repo.update(self.commit1)
|
|
self.write_file("first.txt", "3")
|
|
commit3 = self.repo.commit("Alternative update to first.txt.\n")
|
|
|
|
# Attempt graft.
|
|
with self.assertRaises(hgrepo.HgError) as context:
|
|
self.hg("graft", commit2)
|
|
self.assertIn(
|
|
(
|
|
"warning: 1 conflicts while merging first.txt!"
|
|
" (edit, then use 'hg resolve --mark')\n"
|
|
),
|
|
str(context.exception),
|
|
)
|
|
self.assertIn(
|
|
"abort: unresolved conflicts, can't continue\n", str(context.exception)
|
|
)
|
|
|
|
# Resolve conflict with something completely different.
|
|
self.write_file("first.txt", "23")
|
|
self.hg("resolve", "--mark", self.get_path("first.txt"))
|
|
self.hg("graft", "--continue")
|
|
|
|
# Verify we end up with the expected stack of commits.
|
|
self.assert_status_empty()
|
|
commits = self.repo.log()
|
|
self.assertEqual(3, len(commits))
|
|
self.assertEqual([self.commit1, commit3], commits[:2])
|
|
|
|
def test_graft_that_removes_a_file(self) -> None:
|
|
# Create a new head that adds second.txt and removes first.txt.
|
|
self.write_file("second.txt", "2")
|
|
self.repo.add_file("second.txt")
|
|
self.hg("rm", "first.txt")
|
|
commit2 = self.repo.commit("Add second.txt and remove first.txt.")
|
|
|
|
# Create a separate head that adds third.txt.
|
|
self.repo.update(self.commit1)
|
|
self.write_file("third.txt", "3")
|
|
self.repo.add_file("third.txt")
|
|
commit3 = self.repo.commit("Add third.txt.")
|
|
|
|
# Perform the graft and verify we end up in the right state.
|
|
self.hg("graft", commit2)
|
|
self.assert_status_empty()
|
|
commits = self.repo.log()
|
|
self.assertEqual(3, len(commits))
|
|
self.assertEqual([self.commit1, commit3], commits[:2])
|
|
self.assertFalse(os.path.exists(self.get_path("first.txt")))
|
|
self.assertTrue(os.path.exists(self.get_path("second.txt")))
|
|
self.assertTrue(os.path.exists(self.get_path("third.txt")))
|