Allow insteadof to persist for manifest_version usage.

The sync'ing workflow through here is a fair bit convoluted- at the
very least for a fresh checkout the previous version of PrepForChanges
would sync against http, than force later syncs to hit gerrit directly.

With recent changes (Ic049a8), the pushinsteadof and insteadof url
manipulations were gutted due to changes in the mirror urls used-
thus this code wound up accessing http rather than ssh.

Hack it to allow it's previous insteadof overrides to persist for
the duration of it's operations; this should restore it, and will
ultimately be removed once I've had enough time to fully spelunk the
sucker and refactor it.

(cherry picked from commit 5dea008f81270bae4f2b930719cf8e6b1c1dddbc)
(original CL Icbe20fcab363af0ddda83d8a3385f296c7571d00)

TEST=Run, examine output.

Change-Id: I59e1ad8bb53c977d425390a3d911cc53f96f52c1
Tested-by: Brian Harring <>
Reviewed-by: David McMahon <>
5 files changed