Skip to content

Fixes #512 After pull, the obtained revisions are in Draft phase instead of Public phase.

Bitbucket Importer requested to merge bitbucket/merged-pr-62 into branch/default

Created originally on Bitbucket by colin-hurley (Colin Hurley)

Was already merged in Bitbucket before import, marked as merged by the import user

  • Fixes #512 (closed) After pull, the obtained revisions are in Draft phase instead of Public phase.

    This issue occurred in cases where MercurialEclipse had cached the incoming changesets in a temporary bundle file. Apparently, pulling changesets from a bundle file always puts those changesets into Draft phase in the local repo, regardless of whether they are Draft or Public phase in the remote repo.

    This revision alters the behavior of MercurialEclipse's pull operation so the changesets are always pulled directly from the remote repo, even when those changesets have been locally cached in a temporary bundle file. This ensures that Mercurial receives accurate phase information when comparing the local and remote repositories during the pull.

  • Remove obsolete code to pull from a bundle file

    The PullOperation class included support for optionally pulling from a local bundle file. This functionality was removed because it is no longer being used by MercurialEclipse and should not be used by any new code, since pulling from a bundle file tends to put incoming changesets in the wrong phase (see issue #512 (closed)).

Note: I did investigate the option of lazier creation of the temporary bundle, which would ideally have required completion of javahg issue #58. This would help reduce unnecessary double-transmit of the changesets from the remote repo (one transmit by the incoming command that writes the bundle file, the second transmit by the pull command). The lazy content transfer could give a minor performance boost in cases where pull takes nontrivial time to complete, but I think that the cost to implement it (time, amount of ME and javahg code that would need to change, risk of introducing bugs, etc.) probably outweighs the benefit for most normal cases.

Merge request reports