facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 06:47:41 +03:00
Code Issues Projects Releases Wiki Activity

test-rebase-inmemory-nochanges: modernize the test

Browse Source 
Summary: Use obsstore and disable treemanifest flatcompat mode.

Reviewed By: singhsrb

Differential Revision: D17512349

fbshipit-source-id: 8fcca211c024ce65ac2ea649ae5e23cea0200ea6
This commit is contained in:
Jun Wu 2019-09-20 18:19:14 -07:00 committed by Facebook Github Bot
parent 35e4fd4089
commit ffc0c49467
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edenscm/mercurial/smartset.py
View File

@ -7,7 +7,7 @@
from __future__ import absolute_import
from edenscmnative import bindings
import bindings
from . import error, util

10
tests/test-rebase-inmemory-nochanges-t.py
View File

@ -8,9 +8,7 @@ from __future__ import absolute_import
from testutil.dott import feature, sh, testtmp # noqa: F401
# TODO: Make this test compatibile with obsstore enabled.
sh % "setconfig 'experimental.evolution='"
# Test a rebase that doesn't create a commit:
sh % "setconfig treemanifest.flatcompat=0"
sh % "enable amend rebase"
sh % "setconfig 'rebase.singletransaction=True'"
@ -42,8 +40,7 @@ sh % "cp -R . ../without_imm"
sh % "hg rebase -r b -d a" == r"""
rebasing in-memory!
rebasing 2:811ec875201f "b" (b tip)
note: rebase of 2:811ec875201f created no changes to commit
saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/811ec875201f-889e3ef7-rebase.hg"""
note: rebase of 2:811ec875201f created no changes to commit"""
# Without IMM, this behavior is semi-broken: the commit is not rebased out and the
# created commit is empty. (D8676355)
@ -51,8 +48,7 @@ sh % "cd ../without_imm"
sh % "setconfig 'rebase.experimental.inmemory=0'"
sh % "hg rebase -r b -d a" == r"""
rebasing 2:811ec875201f "b" (b tip)
warning: can't find ancestor for 'file_new' copied from 'file'!
saved backup bundle to $TESTTMP/without_imm/.hg/strip-backup/811ec875201f-889e3ef7-rebase.hg"""
warning: can't find ancestor for 'file_new' copied from 'file'!"""
sh % "hg export tip" == r"""
# HG changeset patch
# User test