Skip to content

Commit

Permalink
delete redundant narrow-heads=true flags in tests
Browse files Browse the repository at this point in the history
Summary: with D63995027, narrow-heads=true is now a default config for tests, so this diff just removes explictly setting it to true in some places. I left behind tests where its also set to false for now

Reviewed By: quark-zju

Differential Revision: D64275811

fbshipit-source-id: e2999bba788dbe0ddbdd6fb6f27ef32d99c8c98e
  • Loading branch information
genevievehelsel authored and facebook-github-bot committed Oct 14, 2024
1 parent e7e2243 commit eeef785
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 14 deletions.
1 change: 0 additions & 1 deletion eden/scm/tests/test-amend-restack.t
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@


$ enable amend rebase remotenames
$ setconfig experimental.narrow-heads=True
$ setconfig visibility.enabled=true mutation.record=true mutation.enabled=true experimental.evolution= remotenames.rename.default=remote
$ hg init restack
$ cd restack
Expand Down
1 change: 0 additions & 1 deletion eden/scm/tests/test-commitcloud-sync-race.t
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
$ setconfig commitcloud.hostname=testhost
$ setconfig remotefilelog.reponame=testrepo
$ setconfig mutation.record=true mutation.enabled=true
$ setconfig experimental.narrow-heads=true
$ setconfig visibility.enabled=true

$ newrepo server
Expand Down
2 changes: 1 addition & 1 deletion eden/scm/tests/test-debugmetalog.t
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2.

$ setconfig "visibility.enabled=true" "experimental.narrow-heads=1" "remotenames.selectivepull=1" "metalog.track-config=0"
$ setconfig "visibility.enabled=true" "remotenames.selectivepull=1" "metalog.track-config=0"

$ newrepo
$ enable remotenames amend
Expand Down
2 changes: 1 addition & 1 deletion eden/scm/tests/test-doctor.t
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Test indexedlogdatapack
$ cd $TESTTMP
$ enable remotenames
$ setconfig remotefilelog.debug=false remotefilelog.fetchpacks=true
$ setconfig diff.git=true experimental.narrow-heads=true mutation.record=true mutation.enabled=true visibility.enabled=1
$ setconfig diff.git=true mutation.record=true mutation.enabled=true visibility.enabled=1

# prefer-edenapi-clonedata=false avoids metalog compaction that messes w/ metalog file layout
$ hgcloneshallow ssh://user@dummy/master shallow -q --config clone.prefer-edenapi-clonedata=false
Expand Down
1 change: 0 additions & 1 deletion eden/scm/tests/test-mutation-infinitepush.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

$ enable amend rebase histedit fbhistedit remotenames
$ setconfig experimental.evolution=obsolete
$ setconfig experimental.narrow-heads=true
$ setconfig visibility.enabled=true
$ setconfig mutation.record=true mutation.enabled=true

Expand Down
7 changes: 3 additions & 4 deletions eden/scm/tests/test-mutation-loops.t
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
$ eagerepo
$ enable amend rebase remotenames
$ setconfig experimental.evolution=obsolete
$ setconfig experimental.narrow-heads=true
$ setconfig visibility.enabled=true
$ setconfig mutation.record=true mutation.enabled=true

Expand All @@ -24,7 +23,7 @@
d3c8fd338cf40a496d981b2ada8df4108f575897 amend by test at 1970-01-01T00:00:00 from:
932f02c9fad3fa46e55b62560c88eb67528b02f0 amend by test at 1970-01-01T00:00:00 from:
e6c779c67aa947c951f334f4f312bd2b21d27e55


Loops are not normally possible, but they can sneak in through backfilling complex
obsmarker graphs. Create a fake one to check behaviour.
Expand All @@ -42,7 +41,7 @@ obsmarker graphs. Create a fake one to check behaviour.
x e6c779c67aa9 'commit1' (Rewritten using loop into 932f02c9fad3)
├─╯
o d20a80d4def3 'base'


$ hg unhide e6c779c67aa9

Expand All @@ -66,7 +65,7 @@ continuously cycles round the commit2 to commit4 loop.
x e6c779c67aa9 'commit1' (Rewritten using rewrite into 21c93100b04c)
├─╯
o d20a80d4def3 'base'

Similarly, check that predecessorsset is also safe.

$ hg debugsh -c "ui.write(str([s.node.hex(n) for n in s.mutation.predecessorsset(repo, s.node.bin(\"21c93100b04c543843a7dab4fa0d5bada061b7a0\"))]) + '\n')"
Expand Down
2 changes: 1 addition & 1 deletion eden/scm/tests/test-narrow-heads.t
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

$ configure dummyssh modernclient
$ enable remotenames amend
$ setconfig experimental.narrow-heads=true visibility.enabled=true mutation.record=true mutation.enabled=true experimental.evolution= remotenames.rename.default=remote
$ setconfig visibility.enabled=true mutation.record=true mutation.enabled=true experimental.evolution= remotenames.rename.default=remote
$ setconfig 'infinitepush.branchpattern=re:(^hack/.*)'
$ shorttraceback

Expand Down
2 changes: 1 addition & 1 deletion eden/scm/tests/test-restack-old-stack.t
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

$ eagerepo
$ enable remotenames amend rebase
$ setconfig experimental.narrow-heads=true visibility.enabled=true mutation.record=true mutation.enabled=true experimental.evolution= remotenames.rename.default=remote
$ setconfig visibility.enabled=true mutation.record=true mutation.enabled=true experimental.evolution= remotenames.rename.default=remote

# Test restack behavior with old stacks.

Expand Down
2 changes: 1 addition & 1 deletion eden/scm/tests/test-undo-narrow-heads.t
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$ configure mutation
$ enable undo remotenames
$ setconfig extensions.extralog="$TESTDIR/extralog.py"
$ setconfig experimental.narrow-heads=true ui.interactive=true
$ setconfig ui.interactive=true

$ newrepo
$ drawdag << 'EOS'
Expand Down
1 change: 0 additions & 1 deletion eden/scm/tests/test-visibility-bundle.t
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

$ enable amend rebase remotenames
$ setconfig experimental.evolution=obsolete
$ setconfig experimental.narrow-heads=true
$ setconfig visibility.enabled=true
$ setconfig mutation.record=true mutation.enabled=true

Expand Down
1 change: 0 additions & 1 deletion eden/scm/tests/test-visibility-cloudsync.t
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
$ setconfig commitcloud.hostname=testhost
$ setconfig visibility.enabled=true
$ setconfig experimental.evolution=obsolete
$ setconfig experimental.narrow-heads=true
$ setconfig mutation.record=true mutation.enabled=true mutation.user=test
$ setconfig remotefilelog.reponame=server
$ setconfig hint.ack='*'
Expand Down

0 comments on commit eeef785

Please sign in to comment.