mirror of
https://github.com/facebook/sapling.git
synced 2024-10-05 22:37:37 +03:00
a29d465ee8
Summary: With Facebook having been renamed Meta Platforms, we need to change the license headers. Reviewed By: fanzeyi Differential Revision: D33407812 fbshipit-source-id: b11bfbbf13a48873f0cea75f212cc7b07a68fb2e
46 lines
1.4 KiB
Python
46 lines
1.4 KiB
Python
#!/usr/bin/env python3
|
|
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2.
|
|
|
|
from eden.integration.lib import hgrepo
|
|
|
|
from .lib.hg_extension_test_base import EdenHgTestCase, hg_test
|
|
|
|
|
|
@hg_test
|
|
# pyre-ignore[13]: T62487924
|
|
class FoldTest(EdenHgTestCase):
|
|
def populate_backing_repo(self, repo: hgrepo.HgRepository) -> None:
|
|
repo.write_file("letters", "a\nb\nc\n")
|
|
repo.write_file("numbers", "1\n2\n3\n")
|
|
repo.commit("First commit.")
|
|
|
|
repo.write_file("numbers", "4\n5\n6\n")
|
|
repo.commit("Second commit.")
|
|
|
|
def test_fold_two_commits_into_one(self) -> None:
|
|
commits = self.repo.log(template="{desc}")
|
|
self.assertEqual(["First commit.", "Second commit."], commits)
|
|
files = self.repo.log(template="{files}")
|
|
self.assertEqual(["letters numbers", "numbers"], files)
|
|
|
|
self.hg(
|
|
"fold",
|
|
"--config",
|
|
"ui.interactive=true",
|
|
"--config",
|
|
"ui.interface=text",
|
|
"--from",
|
|
".^",
|
|
"--message",
|
|
"Combined commit.",
|
|
)
|
|
|
|
self.assert_status_empty()
|
|
commits = self.repo.log(template="{desc}")
|
|
self.assertEqual(["Combined commit."], commits)
|
|
files = self.repo.log(template="{files}")
|
|
self.assertEqual(["letters numbers"], files)
|