Skip to content

General update to branch 2.5.0

Amenel Voglozin requested to merge bitbucket/merged-pr-78 into branch/2.5.0

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

  • Reverted syntax change on HgPath.getAdapter().

  • Set Java level to 1.8.

  • Fixed wrong dependency name.

  • Minor. Formatted source code.

  • Release 2.4.1

  • Added tag RELEASE_2.4.1 for changeset 11192df9ddec

  • Fixes #440 (closed) When switching bookmark, the new current bookmark does not become 'active'.

    Special thanks to Emmanuel Rosa, who provided an explanation of the problem cause and the original fix upon which this changeset is based.

  • Starting 'issue545-specify-branchname-when-pulling' branch.

  • Fixes #545 (closed) Support restricting push and pull to specific branches and/or bookmarks.

  • 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)).

  • Added storing the branch names and bookmark names as persistent properties per project.

  • Added support of branch names in the Incoming and Outgoing pages of Pull and Pull wizards.

  • Fixed clone wizard not initializing properly + added support of branches in the clone command.

  • Update of the MercurialEclipseMaven feature following code changes in the previous commit.

  • Fixed exception of Team > Push when run on a changeset.

  • Added branch names to the Outgoing operation from the Push wizard.

  • Fixes #550 (closed) History view shows wrong file list for root changeset (revision 0).

  • Fix SWT exception when instantiating the AutoresolveRecapDialog after a rebase conflict occurs

  • Fixes #557 (closed) Eclipse hangs when pulling/rebasing

    The AutoresolveRecapDialog is now modal to prevent UI deadlocks. The deadlocks occur because wizards and other modal dialogs are opened (or are already open) during the operation that opens the AutoresolveRecapDialog. The wizard/dialog is unable to close because it is waiting for the AutoresolveRecapDialog to close (this happens down in the SWT UI event loop). Meanwhile the AutoresolveRecapDialog will not accept user input until the wizard/dialog is closed, so the user is unable to close either dialog.

    Changing the AutoresolveRecapDialog to be modal avoids the deadlock by making it possible for the user to interact with that dialog while the other wizard/dialog is still open. After closing the AutoresolveRecapDialog, the other wizard/dialog will then also be able to close.

  • Fixed improper interpreting of null branch names as equivalent to the default branch.

  • Fixed exception in the Pull wizard due to a null array of branch names.

  • Keep the branch and bookmark names consistent from one page to the next page in the Push and Pull wizards.

  • Added maintenance notes.

  • Update versions of JavaHg to 0.13 an Guava to 18.0. Remove dependencies to JavaHg extensions.

  • Fixes #560 (closed) Incorrect perspective name.

  • Edited the maintenance notes.

  • Starting 'issue558-setting-up-dev-envrionment' branch.

  • Fixes issue #558 (closed) - Overhaul of the readme file for easier set up of the development environment.

  • Fixed unqualified reference to a constant.

Merge request reports