In FileBrowser merge menu, do not show heads which are ancestors of WC...

Issue #32 resolved
Jan Vrany
repo owner created an issue

...because they cannot be merged (merge with an ancestor does not make sense)

Comments (2)

  1. Jan Vrany reporter

    Added 'Update To Revision' menu item to file browser and fixed issue #32.

    'Update To Revision' menu item allows user to update for specific revision chosen using dialog. Menu contains shortcut items for current heads, nicely rendered as in HGChangesetList.

    'Merge...' menu has the same structure as 'Update To Revision'.

    The new menu item rendering in these menus gives user much more information about the changeset (head) about to be merged.

    → <<cset 34ca0972c5ba>>

  2. Jan Vrany reporter

    Merged with mercurial revision ad2f5647305 (120 changesets total)

    Merged changesets: - 9da938d1e76a: Jan Vrany, 2014-02-07 10:35 +0100: Added support for hg help command. - af5fea76e6ed: Jan Vrany, 2014-02-07 11:02 +0100: Fix in ProjectDefinition>>hgPostLoad - check for non-existing package directory. - 5acd6d915c77: Jan Vrany, 2014-02-09 19:36 +0000: Added HGRevset to fetch revision log using hg revsets. - 00c2d0fda82b: Jan Vrany, 2014-02-09 20:03 +0000: Minor improvements in debugging support. - cc7b604a456a: Jan Vrany, 2014-02-11 15:08 +0000: Added tests to cover issue #15. - d9ee34a72e4a: Jan Vrany, 2014-02-13 11:46 +0000: Fix in file browser menu - make 'Edit User Config' enabled even if no repository is selected. - f271ddd2b5e0: Jan Vrany, 2014-02-13 16:25 +0000: Added 'Clone...' and 'Create...' menu entries to file browser. - 64da1201fcb0: Jan Vrany, 2014-02-17 14:47 +0000: Fix in filebrowser menus: quote hg command. - 8308c9acdf35: Jan Vrany, 2014-02-18 14:22 +0000: Initial support for bookmarks. - 6ecd3ade39be: Jan Vrany, 2014-02-18 14:25 +0000: More sanity check in HG settings dialog. - e2794b140d5d: Jan Vrany, 2014-02-18 21:41 +0000: Added some tests for nested packages support. - b2123fd2888b: Jan Vrany, 2014-02-18 21:56 +0000: Added simple extension to test HTTP authentication. - 8a13fa172b54: Jan Vrany, 2014-02-20 00:32 +0000: Upon commit, update logical revision of all packages that belongs to the same repository... - 5c36325d6f60: Jan Vrany, 2014-02-21 10:47 +0000: Better hg command configuration handling and validation. - c8b3776ece29: Jan Vrany, 2014-02-21 22:08 +0000: STC bug workaround in SCMAbstractPackageModel>>siblings. - 3dde2b867931: Jan Vrany, 2014-02-23 20:03 +0000: SCMAbstractFileoutLikeTask refactored to support multiple packages. - b661dd389038: Jan Vrany, 2014-02-25 23:35 +0000: Introduced SCMCommonPackageModelGroup. - 8dfd225f50e0: Jan Vrany, 2014-02-26 00:12 +0000: Fix in test HGStXTests>>test_commit_nested_04a - d946e0f0f12a: Jan Vrany, 2014-02-27 10:33 +0000: Two more tests for nested packages. - c0517b3e65e7: Jan Vrany, 2014-02-27 17:09 +0000: Bugfix: added SCMCommonPackageModelGroup>>#species for collect:/select: sort of methods. - 207f07c898fa: Jan Vrany, 2014-02-27 22:38 +0000: Fix in ProjectDefinition>>hgLogicalRevision: - ebec1ef28839: Jan Vrany, 2014-02-28 10:47 +0000: Added notion if 'virtual' package - d093d603292a: Jan Vrany, 2014-03-01 00:22 +0000: Added caching to SCMAbstractPackageModel to speed up certain queries. - 1e2e6ce45878: Jan Vrany, 2014-03-03 10:21 +0000: Added new warning to commit dialog. - 69f0a4078682: Jan Vrany, 2014-03-04 13:19 +0000: Fixed HGCommitTask>>message - f05648d15add: Jan Vrany, 2014-03-05 00:34 +0000: Fix for issue #18 - circular class renames. - be5b0421297e: Jan Vrany, 2014-03-05 09:11 +0000: Added changelog file to track (important) changes. - cf4d7072fdf2: Jan Vrany, 2014-03-05 09:21 +0000: Merged be5b0421297e and f05648d15add - 1f009c523329: Jan Vrany, 2014-03-05 09:55 +0000: Merged cf4d7072fdf2 and 69f0a4078682 - fc0607653d8a: Jan Vrany, 2014-03-05 10:04 +0000: Merged 5acd6d915c77 and 1f009c523329 - 3c9d047e3841: Jan Vrany, 2014-03-05 22:47 +0000: Introduced a SCMAbstractPackageWorkingCopy and SCMAbstractPackageRevision... - 579b4fd3e9a9: Jan Vrany, 2014-03-08 10:29 +0000: Implemented support for hiearchy SCMAbstractPackageRevision/HGPackageRevision. - 65dc8645e496: Jan Vrany, 2014-03-11 22:13 +0000: Added HGChangesetList, a pluggable component to display list of changesets. - 858944cebec4: Jan Vrany, 2014-03-14 22:59 +0000: Added SCMAbstractPackageRevision>>changeSet. - abafe12d47d6: Jan Vrany, 2014-03-17 09:43 +0000: Initial version of HGChangesetBrowser, a tool for browsing commit history. - 66441c7b45bc: Jan Vrany, 2014-03-18 11:56 +0000: More work on HGChangesetBrowser - better changeset detail view. - 218a20c7e54a: Jan Vrany, 2014-03-18 12:16 +0000: Bugfix in file browser menu HG -> Push -> To... - 5cc256ed28a1: Jan Vrany, 2014-03-19 23:19 +0000: Merged 66441c7b45bc and 218a20c7e54a - 237ed0ed6c49: Jan Vrany, 2014-03-21 11:23 +0000: Initial support for Mercurial bookmarks. - d920ee124ca8: Jan Vrany, 2014-03-21 22:05 +0000: Flush all cached repository data after executing a command. - 9906c030ae1d: Jan Vrany, 2014-03-25 09:43 +0000: More work on Mercurial revision log browser and revision selection dialog. - f52fedd27727: Jan Vrany, 2014-03-26 14:48 +0000: Fix for issue #14 - DNU in commit dialog after "show differences" - c3470898ba5f: Jan Vrany, 2014-03-26 15:13 +0000: Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1) - 9b24602affa1: Jan Vrany, 2014-03-26 15:17 +0000: Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 2) - 20e6f5c4f3b2: Jan Vrany, 2014-03-26 15:53 +0000: FIx for issue #11 - Add user feedback when pushing from system browser - 34ca0972c5ba: Jan Vrany, 2014-03-28 00:45 +0000: Added 'Update To Revision' menu item to file browser and fixed issue #32. - 2bff8b2fe2af: Jan Vrany, 2014-03-28 00:47 +0000: Merged 858944cebec4 and 34ca0972c5ba - 5faa5c6eb538: Jan Vrany, 2014-03-28 09:35 +0000: Care for relative pathnames in ProjectDefinition>>hgPostLoad - 8b65e25217e9: Jan Vrany, 2014-04-01 15:19 +0200: Fix for 2bff8b2fe2af - 02e914a86b76: Jan Vrany, 2014-04-02 15:26 +0200: Fixes makefile generation after class rename - 28497a4df430: Jan Vrany, 2014-04-02 15:33 +0200: Merged 02e914a86b76 and 8b65e25217e9 - 63f510479910: Claus Gittinger, 2014-04-13 16:33 +0200: must also set LC_MESSAGES to 'C' - 91d981298a96: Claus Gittinger, 2014-04-13 17:02 +0200: avoid another error when notification is raised - 2f7fa37437e9: Jan Vrany, 2014-04-14 11:44 +0200: Merged 28497a4df430 and 91d981298a96 - 5333985dc917: Jan Vrany, 2014-04-14 11:54 +0200: Fixed menu enablement bug in AbstractFileBrowser. - 0eb725a26851: Jan Vrany, 2014-04-15 22:58 +0200: Renamed Makefile to Makefile.init - 44e2c6a0d23e: Jan Vrany, 2014-04-15 22:59 +0200: Merged 0eb725a26851 and 5333985dc917 - 7b0ade7581d3: Jan Vrany, 2014-04-15 23:08 +0200: Added mock package repository for mocks:hg/p7. - c9dd088e6620: Jan Vrany, 2014-04-17 10:03 +0200: Added 'Browse Revision History' menu item to package menu in browser. - 4ac00477f669: Jan Vrany, 2014-04-27 11:12 +0100: More relaxec parsing of 'hg branches' error output. - 1933163ba3bb: Jan Vrany, 2014-05-01 10:22 +0100: Fixed regression for selective class commit. - 4aa092f73c4e: Claus Gittinger, 2014-04-17 10:44 +0200: duplicate rules eliminated - 21894a5fb51b: Claus Gittinger, 2014-04-30 20:34 +0200: use new asMutator message - 48884c5e208e: Claus Gittinger, 2014-04-30 20:35 +0200: activity notification - f4cc379b8281: Claus Gittinger, 2014-04-30 20:58 +0200: just a setter - 5bc7ac796e5e: Jan Vrany, 2014-05-01 18:11 +0100: Change Class>>revision to return logical revision instead of binary revision. - bc7e495c5f4e: Jan Vrany, 2014-05-01 18:26 +0100: Merged 5bc7ac796e5e and f4cc379b8281 - 173957e3242d: Jan Vrany, 2014-05-02 18:34 +0100: Fixed retrieving a revision info for extensions, returning package's logical revision. - 05d9b60aa613: Jan Vrany, 2014-05-12 17:48 +0100: Fixed bug AbstractFileBrowser class>>hgMenu. - 1cde71f99dec: Jan Vrany, 2014-05-23 13:21 +0100: Fix in HGSourceCodeManager>>revisionInfoFromString:inClass: - care for non-existing project definition. - 58c7b3b23cd2: Jan Vrany, 2014-05-27 16:22 +0100: Fixed commit warning when not all modified packages are about to commit. - fa687128ae25: Jan Vrany, 2014-06-26 01:13 +0200: Allow to use hg.bat as Mercurial executable on Windows. - 5b8836e39cbc: Jan Vrany, 2014-07-06 11:31 +0100: Do not use new lines in command templates, escape them using \n instead. - 7516fdf761f8: Jan Vrany, 2014-07-06 16:56 +0100: Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file. - f532bf76328d: Jan Vrany, 2014-07-06 18:28 +0200: Fix in tests on Windows - try to remove source cache for mocks, but give up if it fails... - 032641fb1e6d: Jan Vrany, 2014-07-06 18:57 +0200: Fix for command debugging code on Windows. - 55aa4858b532: Jan Vrany, 2014-07-06 18:58 +0200: Fix: added lost HGConfig>>userConfigFileTemplate - fe0741025e37: Jan Vrany, 2014-07-09 10:06 +0100: Always use revision hash when updating temporary working copy. - 8987b87a562a: Jan Vrany, 2014-07-17 15:38 +0100: hg command setting refactored to allow command and arguments to be specified. - 69378a5c2a0f: Jan Vrany, 2014-07-17 06:49 +0000: Added Mercurial 3.x to supported versions. - 35a8e7b3ad1e: Jan Vrany, 2014-07-17 06:52 +0000: Print command status code when tracing command execution. - 73e53f58ae31: Jan Vrany, 2014-07-17 08:28 +0000: When debugging, open a debugger on a process that actually raised (propagated:) the exception. - a89dd6b4acc8: Jan Vrany, 2014-07-17 18:47 +0100: Merged 8987b87a562a and 73e53f58ae31 - d55058b5d58d: Jan Vrany, 2014-07-17 20:09 +0000: Try to be fool-proof: when configured command as whole exists as file, use it as it is. - 8fd38c29ee22: Jan Vrany, 2014-07-17 21:40 +0000: Oops, make sure comand in HGCommand class>>hgCommand: is a String - 396c55ca19d6: Jan Vrany, 2014-07-18 11:20 +0000: Fix in HGCommand::version: use default executable and/or arguments of none is specified. - f696a8ea9521: Jan Vrany, 2014-07-19 00:09 +0000: Merged 396c55ca19d6 and a89dd6b4acc8 - 09a9ccac8aba: Jan Vrany, 2014-07-30 16:10 +0000: Fixed timing issues for push/pull commands. - d17370e0936e: Jan Vrany, 2014-07-31 09:46 +0100: Support for Java classes (part 1) - 50899df3e8c1: Jan Vrany, 2014-08-05 23:02 +0100: Initial tests for commiting Java classes. - 53ccffa236ed: Jan Vrany, 2014-08-12 22:15 +0100: More test for commiting Java classes - 232338f718ab: Jan Vrany, 2014-09-29 12:09 +0100: Fixed HGMCVersionInfo (class HGPackageModel renamed to HGPackageWorkingCopy some time ago) - 52063f8ab1db: Jan Vrany, 2014-10-08 21:31 +0100: Fix in command parser: allow for 'invalid brancheads' message in command output. - f46adbbf4138: Jan Vrany, 2014-10-16 01:53 +0000: Fixes for issue #5: Wrong argument quoting on Windows - 8aab3366d378: Jan Vrany, 2014-10-16 03:11 +0100: Merged 52063f8ab1db and f46adbbf4138 - 5101783cff27: Marcel Hlopko, 2014-10-27 17:01 +0100: Fix typo - 071197573c3f: Jan Vrany, 2014-10-28 13:35 +0000: Better #printString for HGChange - 3ba85719b2a3: Jan Vrany, 2014-10-31 14:34 +0000: Workaround for bug in PipeStream on Windows. - 063982ddd678: Jan Vrany, 2014-10-31 15:01 +0000: Merged 071197573c3f and 3ba85719b2a3 - adb48cfb1df7: Jan Vrany, 2014-11-04 16:07 +0000: Test fixes for bookmarks and Mercurial 2.5 and earlier. - ad91a31328a0: Jan Vrany, 2014-11-06 01:06 +0000: More robust error parsing - 0c2c8eb5df33: Jan Vrany, 2014-11-06 11:24 +0000: Fixed date (Timestamp) parsing after changes in Timestamp 1.159 - bef640beaa4b: Jan Vrany, 2014-11-06 11:38 +0000: Fixed bug in error parsing introduced in d91a31328a0 - 31c2d936cd0a: Jan Vrany, 2014-11-07 23:51 +0000: More relaxed error parsing - 9a901e620f0b: Jan Vrany, 2014-11-15 00:12 +0000: Make sure none of the arguments passed to hg command is empty. - 44664f7f71c5: Jan Vrany, 2014-11-15 17:17 +0000: Fixes for #24: Session ChangeSet compression after a commit is broken [1/3] - e037e301b4e5: Jan Vrany, 2014-11-16 08:53 +0000: Fixes for #24: Session ChangeSet compression after a commit is broken [2/3] - eeb6f7e3394d: Jan Vrany, 2014-11-16 13:41 +0000: Fixes for #24: Session ChangeSet compression after a commit is broken [3/3] - f610e64874c8: Jan Vrany, 2014-11-16 23:52 +0000: Fix in commit command: raise HGCommitError when a commit message is empty (or nil) - f94b58d96d03: Jan Vrany, 2014-11-18 04:15 +0100: Fix for Mercurial 2.1: properly handle hg pull exit status. - 9f97cda29c0e: Jan Vrany, 2014-11-22 00:36 +0000: Do not use --debug option when running log and branches command - 594a42a4d8fc: Jan Vrany, 2014-11-28 00:43 +0000: Oops, fixed bug introduced in 9f97cda: care for version < 2.4 - 07913bbab2f7: Jan Vrany, 2014-12-01 00:31 +0000: Keep up with changes in libbasic3. - adf58d1ac45e: Jan Vrany, 2014-12-01 20:30 +0000: Fixed Mercurial version parsing - 24031f33e1e6: Jan Vrany, 2014-12-01 20:46 +0000: Oops, fixed bug introduced in fix 594a42a: - cf0cf5894797: Jan Vrany, 2014-12-28 10:10 +0100: Fix in HGRevistionInfo class>>readFrom:onError: allow for empty '$Id$' style headers. - f92210d4585b: Jan Vrany, 2015-01-15 10:06 +0000: Updated copyright notice. - 9018fb0f1944: convert-repo, 2015-01-15 04:34 +0000: update tags - e2c58b9a066b: Jan Vrany, 2015-01-15 11:53 +0000: Merged f92210d4585b and 9018fb0f1944 - ad2f56473052: Jan Vrany, 2015-01-16 10:40 +0000: Merged e2c58b9a066b and b8cc70ae440b (branch cvs_MAIN)

    → <<cset 61df05330245>>

  3. Log in to comment