Skip to content

Commit

Permalink
Stop test-git-pushmapping.t blobimport dependency
Browse files Browse the repository at this point in the history
Summary: Stop test-git-pushmapping.t blobimport dependency

Reviewed By: mitrandir77

Differential Revision: D64206932

fbshipit-source-id: a83aad6e7bd0f778d970d514cd7fdd3ee8d41800
  • Loading branch information
Clara Rull authored and facebook-github-bot committed Oct 14, 2024
1 parent eeef785 commit 6416d20
Showing 1 changed file with 15 additions and 22 deletions.
37 changes: 15 additions & 22 deletions eden/mononoke/tests/integration/server/test-push-git-mapping.t
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@
$ . "${TEST_FIXTURES}/library.sh"

$ setconfig push.edenapi=true
$ INFINITEPUSH_NAMESPACE_REGEX='^scratch/.+$' POPULATE_GIT_MAPPING=1 EMIT_OBSMARKERS=1 BLOB_TYPE="blob_files" default_setup
hg repo
o C [draft;rev=2;26805aba1e60]
o B [draft;rev=1;112478962961]
o A [draft;rev=0;426bada5c675]
$
blobimporting
starting Mononoke
cloning repo in hg client 'repo2'
$ INFINITEPUSH_NAMESPACE_REGEX='^scratch/.+$' POPULATE_GIT_MAPPING=1 EMIT_OBSMARKERS=1 BLOB_TYPE="blob_files" NON_GIT_TYPES=1 default_setup_drawdag
A=aa53d24251ff3f54b1b2c29ae02826701b2abeb0079f1bb13b8434b54cd87675
B=f8c75e41a0c4d29281df765f39de47bca1dcadfdc55ada4ccc2f6df567201658
C=e32a1e342cdb1e38e88466b4c1a01ae9f410024017aa21dc0a1c5da6b3963bf2
$ hg up -q master_bookmark
$ cat >> .hg/hgrc <<EOF
> [extensions]
Expand All @@ -44,23 +37,23 @@ Push another commit to master

Check that mappings were populated
$ get_bonsai_git_mapping | sort
3CEE0520D115C5973E538AFDEB6985C1DF2CFC2C8E58CE465B855D73993EFBA1|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
E37E13B17B5C2B37965B2A9591A64CB2C44A68FD10F1362A595DA8C6E4EEFA41|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
7AF229C8F6ED15A7C73DF5F9B2C2DE5CB588122E29F176397A3C52E41AB96791|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
956B4E24CEDD3CBFFA0273C3750F771302699D4136331995B7AC5A68F8B3A73E|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B

Push a commit to infinitepush, then move bookmark to it
$ touch file3
$ hg ci -Aqm commit1 --extra hg-git-rename-source=git --extra convert_revision=3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c
$ hg push -q -r . --to "scratch/123" --create

$ get_bonsai_git_mapping | sort
3CEE0520D115C5973E538AFDEB6985C1DF2CFC2C8E58CE465B855D73993EFBA1|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
E37E13B17B5C2B37965B2A9591A64CB2C44A68FD10F1362A595DA8C6E4EEFA41|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
7AF229C8F6ED15A7C73DF5F9B2C2DE5CB588122E29F176397A3C52E41AB96791|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
956B4E24CEDD3CBFFA0273C3750F771302699D4136331995B7AC5A68F8B3A73E|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B

$ hg push -q -r . --to "master_bookmark"
$ get_bonsai_git_mapping | sort
080A23640726489F849CF85B032DE1C47CBC78CE20A88F07F2DC031EBB8642FC|3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
3CEE0520D115C5973E538AFDEB6985C1DF2CFC2C8E58CE465B855D73993EFBA1|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
E37E13B17B5C2B37965B2A9591A64CB2C44A68FD10F1362A595DA8C6E4EEFA41|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
7AF229C8F6ED15A7C73DF5F9B2C2DE5CB588122E29F176397A3C52E41AB96791|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
956B4E24CEDD3CBFFA0273C3750F771302699D4136331995B7AC5A68F8B3A73E|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
98C538B1514D847B3167A3EDC58891E1DD3753AD63775948AC6199D99D31664E|3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C

Now push a commit to infinitepush, then force it to be public and then move bookmark to it
$ touch file4
Expand All @@ -71,7 +64,7 @@ Now push a commit to infinitepush, then force it to be public and then move book

$ hg push -q -r . --to "master_bookmark"
$ get_bonsai_git_mapping | sort
080A23640726489F849CF85B032DE1C47CBC78CE20A88F07F2DC031EBB8642FC|3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
3CEE0520D115C5973E538AFDEB6985C1DF2CFC2C8E58CE465B855D73993EFBA1|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
905E5F2B0B81809153B545F47E02487B48180303C857B9AF6B0DE0784D8C31DF|4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
E37E13B17B5C2B37965B2A9591A64CB2C44A68FD10F1362A595DA8C6E4EEFA41|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
7AF229C8F6ED15A7C73DF5F9B2C2DE5CB588122E29F176397A3C52E41AB96791|1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
95472EDA8F395F39F6F7E860C0C3CEB75C4F94CB251DD186FBD2E70F96A702B6|4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
956B4E24CEDD3CBFFA0273C3750F771302699D4136331995B7AC5A68F8B3A73E|2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
98C538B1514D847B3167A3EDC58891E1DD3753AD63775948AC6199D99D31664E|3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C

0 comments on commit 6416d20

Please sign in to comment.