mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
f42333f17c
Summary: Formats a subset of opted-in Python files in fbsource. Black formatting was applied first, which is guaranteed safe as the AST will not have changed during formatting. Pyfmt was then run, which also includes import sorting. The changes from isort were manually reviewed, and some potentially dangerous changes were reverted, and the directive was added to those files. A final run of pyfmt shows no more changes to be applied. Reviewed By: zertosh Differential Revision: D24101830 fbshipit-source-id: 0f2616873117a821dbc6cfb6d8e4f64f4420312b
46 lines
1.2 KiB
Python
46 lines
1.2 KiB
Python
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
# Copyright (c) Mercurial Contributors.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from testutil.dott import feature, sh, testtmp # noqa: F401
|
|
|
|
|
|
sh % "setconfig 'extensions.treemanifest=!'"
|
|
sh % "hg init base"
|
|
|
|
sh % "cd base"
|
|
sh % "echo alpha" > "alpha"
|
|
sh % "hg ci -A -m 'add alpha'" == "adding alpha"
|
|
sh % "cd .."
|
|
|
|
sh % "hg clone base work" == r"""
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
|
|
|
|
sh % "cd work"
|
|
sh % "echo beta" > "beta"
|
|
sh % "hg ci -A -m 'add beta'" == "adding beta"
|
|
sh % "cd .."
|
|
|
|
sh % "cd base"
|
|
sh % "echo gamma" > "gamma"
|
|
sh % "hg ci -A -m 'add gamma'" == "adding gamma"
|
|
sh % "cd .."
|
|
|
|
sh % "cd work"
|
|
sh % "hg pull -q"
|
|
sh % "hg merge" == r"""
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)"""
|
|
|
|
# Update --clean to revision 1 to simulate a failed merge:
|
|
|
|
sh % "rm alpha beta gamma"
|
|
sh % "hg update --clean 1" == "2 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
|
|
sh % "cd .."
|