Skip to content

Commit 98dbf66

Browse files
Péter Takácsfacebook-github-bot
authored andcommitted
S512535 Enable megarepo extension for watchman when we disable autopull
Summary: We disabled this because having megarepo enabled would override autopull behavior, and pulling while in a rebase would lead to a deadlock. As of D73681487 we have decoupled megarepo from autopull, so we're enabling megarepo again which will allow us to short circuit and read translated commits if they are present in the local repo from a previous fetch. Reviewed By: jdelliot Differential Revision: D73684292 fbshipit-source-id: 194dd24d1a4160ed21114d4cb2ae10e31d9d778a
1 parent 4943673 commit 98dbf66

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

watchman/scm/Mercurial.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,7 @@ w_string Mercurial::mergeBaseWith(
180180
"-r",
181181
revset,
182182
"--config",
183-
"ui.autopullcommits=false",
184-
"--config",
185-
"extensions.megarepo=!"}, // disable "megarepo" extension
186-
// because it does not respect the
187-
// ui.autopullcommits flag
183+
"ui.autopullcommits=false"},
188184
makeHgOptions(requestId),
189185
"query for the merge base");
190186
}

0 commit comments

Comments
 (0)