facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 17:27:53 +03:00
Code Issues Projects Releases Wiki Activity
344c8edda4
sapling/eden/integration/hg
History
Genevieve Helsel da7b453306 fix AssertionError if a checkout is in the middle of a merge 
Summary:
An assertion error is raised if `eden doctor` is in the middle of a merge. This is because we enter a specific "if" condition in the case that mercurial has two parent commits, and EdenFS only ever tracks `p0`, so EdenFS simply sets `p1` to the null commit in `_select_new_parents()`. Specifically, this is in the case in which both `_old_dirstate_parents` and `_old_snapshot` are not None.

Because `_old_dirstate_parents` has `p1` set to nonnull, and Eden thinks it is null , the check `self._new_parents != self._old_dirstate_parents` would be `True` even though there was actually no error.

Reviewed By: chadaustin

Differential Revision: D22048525

fbshipit-source-id: 9a19cc092e2bd80db0e01fb38533a1007640bee6
2020-06-30 13:58:21 -07:00
..
lib Custom pyre upgrade for eden 2020-05-04 21:19:20 -07:00
absorb_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
add_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
CMakeLists.txt enable all integration test sources in CMake builds 2020-05-04 11:46:09 -07:00
commit_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
copy_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
debug_clear_local_caches_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
debug_get_parents.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
debug_hg_dirstate_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
debug_hg_get_dirstate_tuple_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
diff_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
doctor_test.py fix AssertionError if a checkout is in the middle of a merge 2020-06-30 13:58:21 -07:00
files_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
fold_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
graft_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
grep_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
histedit_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
journal_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
merge_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
move_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
negative_caching_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
non_eden_operation_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
post_clone_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
pull_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
README.md move integration tests to eden/integration 2017-01-31 14:41:14 -08:00
rebase_test.py update one of the rebase tests to explicitly use non-in-memory update 2020-04-28 12:11:51 -07:00
revert_test.py fix hg revert on conflicted file during conflict resolution 2020-03-16 18:35:20 -07:00
rm_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
rollback_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
sparse_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
split_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
status_deadlock_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
status_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
storage_engine_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
symlink_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
undo_test.py replace a bunch of pyre-fixme comments with pyre-ignoree 2020-02-24 18:55:19 -08:00
update_test.py clean up EdenMount destruction process 2020-04-28 12:44:12 -07:00

README.md

Integration tests in this directory are specific to the Eden extension for Mercurial.

Most tests will want to subclass HgExtensionTestBase.