facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
6939c33e06
sapling/eden/scm/tests/test-important-remote-names-t.py

57 lines
1.4 KiB
Python
Raw Normal View History

pull: update remote/master unconditionally Summary: This is inteneded to solve multiple problems: - Mitigate issues where our CI system does not enable remotenames in some random code paths, which leads to missing or stale `remote/master`. This further mitigates bad cases with narrow-heads' phase calculation where a stale `remote/master` can cause many commits to become draft incorrectly. - Mitigate issues in `remotenames` where race condition can happen for pushrebase (remotenames does a "listnames" after the push operation). See D18601035 for a hacky workaround. Reviewed By: DurhamG Differential Revision: D19380940 fbshipit-source-id: 4481ff114d35be37c331c72ac561c2a0894206cb
2020-01-17 21:11:25 +03:00
# 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.
from __future__ import absolute_import
from testutil.dott import feature, sh, testtmp # noqa: F401
mark all tests requiring Python 2 Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
2020-01-31 05:40:49 +03:00
feature.require(["py2"])
pull: update remote/master unconditionally Summary: This is inteneded to solve multiple problems: - Mitigate issues where our CI system does not enable remotenames in some random code paths, which leads to missing or stale `remote/master`. This further mitigates bad cases with narrow-heads' phase calculation where a stale `remote/master` can cause many commits to become draft incorrectly. - Mitigate issues in `remotenames` where race condition can happen for pushrebase (remotenames does a "listnames" after the push operation). See D18601035 for a hacky workaround. Reviewed By: DurhamG Differential Revision: D19380940 fbshipit-source-id: 4481ff114d35be37c331c72ac561c2a0894206cb
2020-01-17 21:11:25 +03:00
sh % "newrepo server"
sh % "drawdag" << r"""
pull: automatically pull selective bookmarks unless it's a no-argument pull Summary: This enforces certain selective pull logic in core. Namely, rewrite `pull -r X` to `pull -r X -B master`. Unlike selectivepull in remotenames, `pull` (pulls everything) won't be rewritten to `pull -B master` (which pulls less commits and names). Therefore this change always adds more commits to pull, and therefore should not break existing users. Eventually we want the "not pulling everything" behavior, but right now this just fixes `pull -r X` to also update important remote names. Reviewed By: markbt Differential Revision: D20531121 fbshipit-source-id: af457b5ddb1265b61956eb2ee6afb7b7208293e0
2020-03-26 20:51:20 +03:00
D
|
B C
|/
pull: update remote/master unconditionally Summary: This is inteneded to solve multiple problems: - Mitigate issues where our CI system does not enable remotenames in some random code paths, which leads to missing or stale `remote/master`. This further mitigates bad cases with narrow-heads' phase calculation where a stale `remote/master` can cause many commits to become draft incorrectly. - Mitigate issues in `remotenames` where race condition can happen for pushrebase (remotenames does a "listnames" after the push operation). See D18601035 for a hacky workaround. Reviewed By: DurhamG Differential Revision: D19380940 fbshipit-source-id: 4481ff114d35be37c331c72ac561c2a0894206cb
2020-01-17 21:11:25 +03:00
A
"""
sh % 'hg bookmark -r "desc(B)" master'
# Remote bookmarks should be written even if remotenames is disabled.
sh % "newrepo client"
sh % 'setconfig "paths.default=$TESTTMP/server" "extensions.remotenames=!"'
sh % "hg pull" == r"""
pulling from $TESTTMP/server
requesting all changes
adding changesets
adding manifests
adding file changes
pull: automatically pull selective bookmarks unless it's a no-argument pull Summary: This enforces certain selective pull logic in core. Namely, rewrite `pull -r X` to `pull -r X -B master`. Unlike selectivepull in remotenames, `pull` (pulls everything) won't be rewritten to `pull -B master` (which pulls less commits and names). Therefore this change always adds more commits to pull, and therefore should not break existing users. Eventually we want the "not pulling everything" behavior, but right now this just fixes `pull -r X` to also update important remote names. Reviewed By: markbt Differential Revision: D20531121 fbshipit-source-id: af457b5ddb1265b61956eb2ee6afb7b7208293e0
2020-03-26 20:51:20 +03:00
added 4 changesets with 4 changes to 4 files
pull: update remote/master unconditionally Summary: This is inteneded to solve multiple problems: - Mitigate issues where our CI system does not enable remotenames in some random code paths, which leads to missing or stale `remote/master`. This further mitigates bad cases with narrow-heads' phase calculation where a stale `remote/master` can cause many commits to become draft incorrectly. - Mitigate issues in `remotenames` where race condition can happen for pushrebase (remotenames does a "listnames" after the push operation). See D18601035 for a hacky workaround. Reviewed By: DurhamG Differential Revision: D19380940 fbshipit-source-id: 4481ff114d35be37c331c72ac561c2a0894206cb
2020-01-17 21:11:25 +03:00
adding remote bookmark master"""
sh % 'hg dbsh -c "ui.write(repo.svfs.tryread(\\"remotenames\\") + \\"\\n\\")"' == "112478962961147124edd43549aedd1a335e44bf bookmarks default/master"
pull: automatically pull selective bookmarks unless it's a no-argument pull Summary: This enforces certain selective pull logic in core. Namely, rewrite `pull -r X` to `pull -r X -B master`. Unlike selectivepull in remotenames, `pull` (pulls everything) won't be rewritten to `pull -B master` (which pulls less commits and names). Therefore this change always adds more commits to pull, and therefore should not break existing users. Eventually we want the "not pulling everything" behavior, but right now this just fixes `pull -r X` to also update important remote names. Reviewed By: markbt Differential Revision: D20531121 fbshipit-source-id: af457b5ddb1265b61956eb2ee6afb7b7208293e0
2020-03-26 20:51:20 +03:00
# pull -r should also pull master.
sh % "newrepo client2"
sh % 'setconfig "paths.default=$TESTTMP/server" "extensions.remotenames=!"'
sh % "hg pull -r $C" == r"""
pulling from $TESTTMP/server
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
adding remote bookmark master"""
sh % "hg log -Gr 'all()' -T '{desc} {remotenames}'" == r"""
o C
|
| o B default/master
|/
o A"""
Reference in New Issue Copy Permalink