Skip to content

Issue548 pull merge problems

Bitbucket Importer requested to merge bitbucket/merged-pr-79 into branch/issue548-pull-merge-problems

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

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

  • Fixes #548 (closed) When pulling changesets, using the merge option always opens the commit dialog and displays 'Problem Occurred' window containing no details

    There were two sets of merge logic being executed on a pull - one in the PullOperation, and one in the HgPushPullClient. The latter has been removed since there is no need to execute both, and the code that was removed had some issues of its own, anyway (like ignoring the "Edit commit message" option).

  • Persist state for commit dialog checkbox in pull wizard as user preference

    The state for the "Edit commit message before committing merge" checkbox is now saved and loaded as a user preference just like the other checkboxes in the wizard already do.

    In addition, the initial enable state for the checkbox is now correctly determined by the state of the Merge checkbox, instead of defaulting to disabled. As a result, the user no longer needs to double-toggle the Merge checkbox state in order to enable the commit dialog checkbox and change its state. The checkbox is now also disabled when rebase is selected, since this action already deselects merge.

  • Make the Pull dialog Update, Merge, and Rebase options mutually-exclusive to prevent errors

    Selecting more than one of these options at a time already causes errors (at least with their current implementation), but now the Pull dialog prevents the user from triggering the error conditions by deselecting the other two options when one of the three is selected.

    This changeset adjusts the code to use a single shared listener object, rather than three distinct listener objects, for all three checkbox widgets. This groups the related checkbox state management code together for clarity and also facilitates some code reuse.

    Also, the "Clean update" checkbos is now only enabled when the Update checkbox is selected, since the option has no effect otherwise.

Merge request reports