@  485:a07c94dc0be7 2008-05-13 21:09 +0200 zingo removed last digit in version so I don't have to do a commit for each release.
|
o  484:d990e5cf2e85 2008-05-12 21:40 +0200 Bastian Removed ResourceChangedListener from DecoratorStatus
|
o  483:0c7bfa51d730 2008-05-12 21:10 +0200 Bastian added fixme to resource decorator
|
o  482:079c0dab39f1 2008-05-12 21:03 +0200 Bastian usings set instead of list of resource changes
|
o  481:d7820d9004ac 2008-05-12 18:50 +0200 Bastian added license information
|
o  480:3401f54300de 2008-05-12 18:47 +0200 Bastian grmpf. didn't commit the message file
|
o  479:beb4fe2e15ca 2008-05-12 18:46 +0200 Bastian refresh decoration after clone
|
o  478:d80b6c2ffdd1 2008-05-12 18:45 +0200 Bastian refresh decorations after clone
|
o  477:bb9dccce8db1 2008-05-12 16:49 +0200 Bastian Improved updates to resource decorations.
|
o  476:15402972e60d 2008-05-12 15:47 +0200 Bastian added RefreshLocalChangesetsJob
|
o  475:5195bd912f24 2008-05-11 22:13 +0200 Bastian Fixed regression.
|
o  474:97d4d4e45fcd 2008-05-11 22:03 +0200 Bastian implemented fetch command
|
o  473:488fad06587d 2008-05-11 16:20 +0200 Bastian Fix for endless loop when trying to get changesets.
|
|  Problem: isSupervised returns true for added resources, but these don't have changesets, yet.
|
|  Solution: added method isAdded() that is used to check this status.
o  472:f0ea78565cc6 2008-05-11 16:10 +0200 Bastian initial commit for Fetch Handler
|
o  471:b53cd30eb822 2008-05-11 16:03 +0200 Bastian Fixed bug in isSupervised()
|
|  When a project had inherited the status "unknown" from one of its members, the project didn't show its version in a decorator, didn't show history and so on. This is fixed now.
o    470:bc85466a76cd 2008-05-11 15:20 +0200 Bastian merge
|\
| o  469:40bad64b5d61 2008-05-11 15:10 +0200 Bastian added compare on double click to Incoming page in PullWizard
| |
o |  468:8afbb2487bfb 2008-05-11 15:00 +0200 zingo Release 468
|/
o  467:38996fb7fff9 2008-05-11 14:50 +0200 Bastian fixed NPE
|
o  466:f4b1fa03adf7 2008-05-11 14:43 +0200 Bastian added configurable timeout to HgCommitClient
|
o  465:9ea95cbe98b2 2008-05-11 14:35 +0200 Bastian Added signature for changeset 464:71fe9774988e
|
o    464:71fe9774988e 2008-05-11 14:34 +0200 Bastian merge
|\
| o  463:6b145d6f996b 2008-05-11 14:27 +0200 Bastian more fixes for changeset caching and resource decoration
| |
| o  462:5ca41232f337 2008-05-11 13:22 +0200 Bastian externalized some strings
| |
| o  461:a5b3be56976e 2008-05-11 12:26 +0200 Bastian small fixes to decoration
| |
o |  460:d2cdb9d83f89 2008-05-11 12:12 +0200 Bastian small changes in version decoration
|/
o  459:8c9f342cf80a 2008-05-11 11:44 +0200 Bastian Some fixed that should improve performance for big projects.
|
|  What would happen if you had, say, 16000 changesets and a huge amount of files (have a look at open solaris or mozlla...)? Getting the whole history won't work. So the plugin now gets only the latest xxx revisions (configurable) of the project and if the file wasn't changed in the last 200 changesets for single files. The result is that there are more calls to hg but the performance shouldn't degrade to badly. The calls for each file only happen, when the label decoration is triggered, so it is lazy loaded.
o  458:0302f23ac054 2008-05-11 09:10 +0200 Bastian changed constant names to abide by the java capitalization rules
|
o  457:49229cb97548 2008-05-10 21:39 +0200 Bastian Customizable timeouts in preferences for some commands.
|
o  456:f12647915d24 2008-05-10 15:35 +0200 Bastian Added signature for changeset 455:a0e8802abf11
|
o  455:a0e8802abf11 2008-05-10 15:33 +0200 Bastian #25: Fixed annotate descriptions and menu entry activation.
|  Fixed RevisionChooserDialog as well - comparing/switching by tag/head now works.
o  454:8f36a1e9ae7c 2008-05-10 07:08 +0200 zingo Betea Release
|
o  453:d00c8dacfe62 2008-05-09 22:11 +0200 Bastian added licensing info to RefreshJob and RefreshStatusJob. Better output of FlagPropertyTester
|
o  452:81d03d10e961 2008-05-09 20:44 +0200 Bastian silenced a warning
|
o  451:cb0153a397c5 2008-05-09 20:32 +0200 Bastian some small changes, e.g. Timeout now 2 min. as it was timing out all the time for me...
|
o    450:77b13ef792fe 2008-05-09 19:45 +0200 Bastian Doetsch merge
|\
| o  449:d0b371e2edb2 2008-05-09 19:06 +0200 Bastian performance fixes for resource change listener
| |
| o    448:703f83a08b44 2008-05-07 21:39 +0200 Bastian merge
| |\
| | o  447:efcadfbfd500 2008-05-07 20:59 +0200 Bastian Big refactoring of MercurialStatusCache
| | |
| | |  As MercurialStatusCache has become quite large (1000 lines or more) a refactoring was needed. I've now split it into 5 classes:
| | |
| | |  - AbstractCache (super class of all caches)
| | |  - LocalChangesetCache (all things about local changesets)
| | |  - IncomingChangesetCache (all things about incoming changesets)
| | |  - OutgoingChangesetCache (all things about outgoing changesets)
| | |  - MercurialStatusCache (status information on resources)
o | |  446:1027fe78b3a1 2008-05-08 17:43 +0200 zingo release time
|/ /
o |  445:52e32a0e0ba6 2008-05-07 21:32 +0200 Bastian #197 Fix to HgIgnore functionality to allow for hg roots outside of workspace.
| |
o |  444:ac8588563630 2008-05-07 00:36 +0200 Bastian #197: Further Refactoring. Still a real bad solution. We need to parse the file name backwards, I think.
|/
o  443:d81efea5251e 2008-05-06 23:48 +0200 Bastian #197: Refactoring.
|
|  - Introduced MercurialUtilities.getIResource(project,file) for getting the correct IResource handle.
|
|  - Implemented HgRootClient which is used to check if a repository is available.
o  442:01479fb97254 2008-05-06 23:15 +0200 Bastian refactored HgIncomingClient
|
|  Introduced new superclass AbstractPareChangesetClient which can parse changesets. HgLogClient, HgIncomingClient and HgOutgoingClient extend this class now instead of calling HgIncomingClient to do the parsing.
o  441:8f220618475c 2008-05-06 20:26 +0200 Bastian removed fixme task.
|
o  440:7e8cbdc7d0b3 2008-05-06 20:23 +0200 Bastian Changes to allow changeset handling with hg repo roots above projects in MercurialStatusCache
|
o    439:af70e8d73e20 2008-05-06 19:55 +0200 Bastian merge
|\
| o  438:ada2df7ff610 2008-05-06 19:55 +0200 Bastian only setting team private member if hg is within project directory.
| |
o |  437:2f6f4105c905 2008-05-06 08:39 +0200 stefan Fixed: supplied timeout were not used, extracted magic number 30 second as a constant
| |
| o    436:c0dda0001d57 2008-05-05 23:27 +0200 Bastian merge
| |\
o---+  435:752fbc6cf04a 2008-05-05 23:36 +0200 zingo pull from Bastian
|/ /
| o  434:23f0c2451406 2008-05-05 23:01 +0200 Bastian Fixed concurrency problem when downloading incoming bundles.
| |
| o    433:cf8c907cc9a8 2008-05-05 22:44 +0200 Bastian merge
| |\
| | o  432:3ab79bfe1765 2008-05-05 22:24 +0200 Bastian Team UI: added "..." to "Revert" as this opens a dialog
| | |
o---+  431:dbb7c700a74b 2008-05-05 22:19 +0200 zingo pull from Bastian
| | |
| | o  430:5297a590ac07 2008-05-05 22:06 +0200 Bastian #200: Fixed merge bug
| | |
| | o  429:f27e327b58d9 2008-05-05 21:03 +0200 Bastian Doetsch Copy&Paste description error.
| | |
| | o  428:9dba2985c17e 2008-05-05 20:52 +0200 Bastian Doetsch added backout to menu portfolio and bugfixes
| | |
| | |  - new backout wizard/handler/plugin.xml entry
| | |  - corrected hg sign. previously it ignored the changeset selection one did
| | |  - refactored the HgWizard/HgWizardPage stuff so its better usable.
| | |  - re-inserted the "..." markers for dialog opening commands.
| | |  - fixed a NPE in Changeset.setParents()
| | |  - added a cache refresh to RollbackHandler
o---+  427:fb332ad3dd68 2008-05-05 22:14 +0200 zingo sync with stefanC
|/ /
o |  426:1922eda960d6 2008-05-05 21:03 +0200 stefan prepared for dbl click behaviour
| |
o |  425:c451fb9f78b5 2008-05-05 18:18 +0200 stefan removed transplant capability. Incoming is still shown as it is. Need double clicking overlay functionality
| |
o |  424:11f0c27c35ef 2008-05-05 18:09 +0200 stefan refactored combo to use ComboViewer, I like JFace better
| |
| o  423:99ed608ea380 2008-05-05 18:25 +0200 Bastian Doetsch Fixed error in debuginstall I produced while trying to test it. Doh.
| |
| o  422:1990f350edd8 2008-05-05 18:22 +0200 Bastian Doetsch worked a bit on testing - but we have a problem with the mercurial console which needs eclipse plug-in platform classes :-(.
| |
| o  421:beae5b36b6e9 2008-05-05 16:07 +0200 Bastian Doetsch enabled automatically adding comments to new files to automatically add license information.
| |
| o  420:522502f2756b 2008-05-05 15:50 +0200 Bastian Doetsch added missing licensing to some files I created.
| |
| o  419:72041a0a8ac0 2008-05-05 14:49 +0200 Bastian Doetsch Disabling timeout for push and making it configurable in wizard.
| |
| |  Default is "no timeout". If checkbox is enabled, timeout is set to 5 min.
| |
| |  Reason: I had an aborted push due to a timeout when pushing a completely new mercurialeclipse to a repo and I definitely didn't want a timeout then.
| |
| |  ToDo: We should make the defaults adjustable at the MercurialPreferencePage.
| o    418:21c25b01c43a 2008-05-05 14:12 +0200 Bastian Doetsch merge
| |\
| | o  417:3048acb5d641 2008-05-05 14:11 +0200 Bastian Doetsch Changes to show the right results when contents are queried.
| | |
| o |  416:cb58d9264932 2008-05-01 21:59 +1000 Charles O'Farrell Fixed glitch with glog and |/|
| | |
| | o  415:8cb8f681b3d0 2008-05-05 13:37 +0200 Bastian Doetsch Refactored ChangeSet.setParents(String[]) to filter null parents.
| | |
| | |  The constructors of Changeset now call setParent(String[]) to set the parents.
| | |
| | |  Reason:
| | |  Hg reports -1:0000000000000000000000000000000000000000 as parent if there is no parent. This is filtered now, as it only clutters the changesets and takes memory we don't need to take. Moreover the filtering prevents that each visualization solution need to implement this filter itself.
| | o  414:c085786dbf41 2008-05-05 12:18 +0200 Bastian Doetsch Added output as return value to HgRollbackClient and HgTransplantClient.
| | |  As rollback has no wizard for handling success/failure messages, its handler now opens an information message box of the hg rollback output.
| | o  413:6935b9f4dd6a 2008-05-05 11:26 +0200 Bastian Doetsch #182: Now enabling transplant extension in HgTransplantClient.transplant().
| | |
| | |  Not everyone has the extension enabled, so it's better to include "--config extensions.transplant=" as parameter.
+---o  412:5b60ab83d1e5 2008-05-05 11:09 +0200 Bastian Doetsch Fixed regression in IStorageMercurialRevision.
| |
o |  411:769bdc6befde 2008-05-05 08:46 +0200 stefanc Basic Transplant, which doesn't work very well :-/
| |
o |  410:56e2f82b6879 2008-05-05 08:45 +0200 stefanc ChangeSet now returns defensive copy of its changed files, and an empty array instead of null
| |
o |  409:bec73e2c90db 2008-05-04 23:09 +0200 Bastian Doetsch fixed exception If no outgoing changes were found.
| |
| |  now interpreting return code = 1 correctly.
o |  408:f84fb210e934 2008-05-04 21:33 +0200 Bastian Doetsch Fixed URL combo now allowing unlimited entries.
| |
| |  Cleanup of known repositories can be done via repo view...
o |  407:8b7972bbd010 2008-05-04 19:54 +0200 Bastian Doetsch Removed overlay from glog
| |
o |  406:c4d3fa719502 2008-05-04 19:15 +0200 Bastian Doetsch Fixed regression.
| |
o |  405:a82cfbbcb3ae 2008-05-04 18:57 +0200 Bastian Doetsch Browse button for location in wizards using ConfigurationMainPage
| |
| |  - NewLocationWizard
| |  - PushRepoWizard
| |  - ParticipantSynchronizeWizard
o |  404:3bf6f3b51a41 2008-05-04 18:27 +0200 Bastian Doetsch Unnecessary variable removed.
| |
o |  403:e0679e02d1cd 2008-05-04 18:12 +0200 Bastian Doetsch Fixed bugs in getIncomingChangesets (see Trac #182)
| |
o |  402:bd9656a365a7 2008-05-04 17:20 +0200 Bastian Doetsch Push now supports all options of hg push.
| |
| |  - authentication
| |  - protocols
| |  - pushing up to a revision
| |  - forcing of a push.
o |  401:49b0f4c50243 2008-05-04 12:05 +0200 Bastian Doetsch Fixed a bug with content parsing in HgIncoming
| |
| |  Incoming always outputs a header like:
| |
| |  comparing with ../mercurialeclipse
| |  searching for changes
| |  examining 9f79bc4b5d05:4ef168a4b321
| |  found incomplete branch 9f79bc4b5d05:4ef168a4b321
| |  narrowing 1:6 a57ce45abc34
| |  found new branch changeset 9f79bc4b5d05
| |  found new changesets starting at 9f79bc4b5d05
| |  1 total queries
| |
| |  Then the content follows. The template is now changed to include a content start marker and the head of the result string is cut up to, but not including this marker.
o |  400:9f79bc4b5d05 2008-05-04 10:51 +0200 Bastian Doetsch Small updates to license information
| |
o |  399:a57ce45abc34 2008-05-02 21:22 +0200 Bastian Doetsch Found a new option in hg log: --debug outputs each parent!
| |
o |  398:4e8fdd859814 2008-05-02 19:26 +0200 Bastian Doetsch Bugfix for NPE occurring when creating new project and then sharing it.
| |
o |  397:b56daee334d2 2008-05-02 19:02 +0200 Bastian Doetsch Bugfixes for synchronize.
| |
| |  - fixed NPE in Sync-Wizard.
| |  - now show outgoing changes that are already committed in sync view.
| |
| |  Unfortunately, Mercurial - AFAIK - doesn't support accessing the contents of remote revisions, so compare only works for uncommitted resources, as it compares against the parent changeset.
o |  396:fb3b48eb9b7e 2008-05-02 13:09 +0200 Bastian Doetsch Added signature for changeset 395:863db0be361e
| |
o |  395:863db0be361e 2008-05-02 13:08 +0200 Bastian Doetsch Fixed NPE if MergeView is not open. HgSign now armors signature.
| |
o |  394:7f0d99450db5 2008-05-02 12:08 +0200 Bastian Doetsch hg sign now uses configured gpg command.
| |
| |  (Forgot to change the hardcoded stuff). Commit message now changes according to selected changeset.
o |  393:3d3ff86907c7 2008-05-02 11:49 +0200 Bastian Doetsch Refactoring of HgCommand (and therefore also most HgXXXClients).
| |
| |  HgCommand now extends AbstractShellCommand, which allows to call other executables than hg. This was necessary to prevent code doubling when calling gpg. Essentially, the only difference is that most HgCommand methods have been pulled up to AbstractShellCommand and a new abstract method was introduced, named getExecutable() which must be implemented by each subclass of AbstractShellCommand.
| |
| |  Note: SignWizard now has an icon in team menu, the GPG Executable can be set in the Preferences).
o |  392:d42c98053ef3 2008-05-02 09:14 +0200 Bastian Doetsch Signed changeset.
| |
o |  391:872769aa557f 2008-05-02 09:06 +0200 Bastian Doetsch forgot to add the sign handler as well
| |
o |  390:9bda5dfbc8d6 2008-05-02 09:04 +0200 Bastian Doetsch Argh. Forgot to add InputStreamConsumer for hg sign.
| |
o |  389:9d3603fb6d9c 2008-05-02 00:06 +0200 Bastian Doetsch Implementation of hg sign.
| |
| |  Signing will only work with an activated gpg agent, as gpg doesn't like my passphrase-file parameter :-(. Currently the gpg command is hardcoded, but could be made configurable in the wizard.
o |  388:e201548e6270 2008-05-01 17:40 +0200 Bastian Doetsch #172. Now pops up Preference Dialog if hg is not usable.
| |
| |  Dunno how to add an error message to the preference page.
o |  387:a623d2ccc002 2008-05-01 15:53 +0200 Bastian Doetsch Fixed #172 "No error if hg is not installed"
| |
| |  now executing hg debuginstall to check if hg is accessable and correctly configured.
o |  386:2b22a651ca50 2008-05-01 14:55 +0200 Bastian Doetsch made HgWizardPage superclass of SyncRepoPage
| |
o |  385:b7666b1fab9d 2008-05-01 14:27 +0200 Bastian Doetsch Cleanup. Now using the same WizardPage for repo choosing in sync + repo view.
| |
| |  - removed SynchronizeWizardPage
| |  - instead using ConfigurationWizardMainPage
| |  - uses (and stores) dialog settings now.
o |  384:3742ac34fecc 2008-05-01 13:23 +0200 Bastian Doetsch belongs to previous changeset :-).
| |
o |  383:8ca530b22f22 2008-05-01 13:21 +0200 Bastian Doetsch History now also shows incoming changesets in tree/table if sync is active.
| |
o |  382:1b858a4be4de 2008-05-01 12:28 +0200 Bastian Doetsch Fixed NPE in MercurialResourceVariantComparator
| |
o |  381:e5a7d6b209a1 2008-05-01 12:03 +0200 Bastian Doetsch cleanup code, correct warnings.
| |
| |  We should get rid of compiler setting "warn if parameter hides field", as this was the majority of warnings and actually most setters do exactly that.
| |
| |  Discouraged Access: I didn't clean up those.
o |  380:322bc478c633 2008-05-01 01:05 +0200 Bastian Doetsch SyncView now shows incoming deletions as deletions, not as change.
| |
| |  Issues: conflict detection only works for non-committed changes. If we enable conflict detection for incoming resources, we need automerge, else we get a lot of auto-mergeable conflicts (basically all incoming files).
| |
| |  Having a look at the parent revisions could be a solution to determining whether we have incoming or conflict, but still leaves the automerge / pseudoconflict issue open.
o |  379:0860f9fd6315 2008-04-30 19:09 +0200 Bastian Doetsch beauty fix for repository view - now the repos have images
| |
o |  378:4d231ea2b62b 2008-04-30 18:50 +0200 Bastian Doetsch Updated license/contributions/comments for repository stuff.
| |
o |  377:1d75cefae024 2008-04-30 17:29 +0200 Bastian Doetsch Implemented (with lots of help from Subclipse) basic repository view.
| |
| |  - create, refresh and remove all work.
| |  - saving user credentials not so far.
o |  376:c3a051612027 2008-04-30 12:08 +0200 Bastian Doetsch changes / cleanup in team menu:
| |
| |  - removed "pull", "pull and update" and "push" actions
| |  - added new handler "Pull/Transplant" (which incorporates pull -u)
| |  - added new handler "Push"
| |  - enabled Add-Handler for unknown resources (bugfix)
o |  375:8052eab83643 2008-04-29 23:50 +0200 Bastian Doetsch Added synchronization to getIncomingChangeSets() to fight ConcurrentModificationException
| |
o |  374:74c27e82e392 2008-04-29 23:43 +0200 Bastian Doetsch Add Handler for Transplant.
| |  UI (pimp my PullRepoWizard) and actual call of HgTransplantClient will be done by Stefan.
o |  373:3f6298f8ed26 2008-04-29 23:12 +0200 Bastian Doetsch --log option and an actual execute in HgTransplantClient
| |
o |  372:a7763e62d3d0 2008-04-29 23:03 +0200 Bastian Doetsch new HgTransplantClient
| |  (untested, but a stub for Stefan)
o |  371:a0fc83acf30a 2008-04-29 21:08 +0200 Bastian Doetsch Another error fixed that was due to merging.
| |
o |  370:09f337bf076c 2008-04-29 21:07 +0200 Bastian Doetsch Fixed errors after merge
| |  (although GLog might be obsolete soon, as History looks quite cooler).
o |    369:4ef168a4b321 2008-04-29 20:31 +0200 Bastian Doetsch merge with jerome
|\ \
| o |  368:d8f9e5fc608d 2008-04-29 20:08 +0200 Bastian Doetsch Fixed bug with null descriptions in changesets.
| | |
o | |  367:6085fe524e51 2008-04-20 17:56 +0200 Jerome Negre Converting GLogAction, ShowAnnotationAction and TagAction to *Handler.
| | |  Fixing the menu to adapt to IResource
| o |  366:3b6197ca5025 2008-04-29 17:06 +0200 Bastian Doetsch new actions for sync view context menu
| | |
| | |  pull, pull+update, show history
| o |  365:a3af47db4ad7 2008-04-29 17:03 +0200 Bastian Doetsch Bug fixes.
| | |
| o |  364:80249efa6c03 2008-04-29 16:57 +0200 Bastian Doetsch added bundle overlay method
| | |
| o |  363:531c05c23a12 2008-04-29 13:15 +0200 Bastian Doetsch Forgot to add the page...
| | |
| o |  362:fccee028c7b0 2008-04-29 13:14 +0200 Bastian Doetsch #24: Added Page to Synchronize Wizard for choosing repository to sync against.
| | |
| | |  - If one wants to monitor several repositories, one needs to add one synchronization per repository.
| | |  - This change lays the groundwork for pulling via the synchronization view.
| | |  - Internally incoming changesets are now stored with the information, from which repository they are.
| | |  - StatusCache now returns unmodifiable SortedSets as we don't want external methods to corrupt the cache.
| | |  - The synchronize participant now uses IMemento to remember state (repository location).
| o |    361:89a3bf07b7ea 2008-04-29 08:30 +0200 Bastian Doetsch merge with zingo
| |\ \
| | o |  360:715cd1f40c31 2008-04-29 08:29 +0200 Bastian Doetsch Some changes on the HistoryPainting side.
| | | |
| | o |  359:5214c2bb087d 2008-04-28 21:33 +0200 Bastian Doetsch Added Eclipse icons to most team actions. Added Rollback action.
| | | |
| | o |  358:2d8c7e2bf074 2008-04-28 20:50 +0200 Bastian Doetsch Fixed permant disablement of items in team menu. New item "Rollback".
| | | |
| | | |  Had broken the menu it with merging.
| | | |  Rollback rolls back the last transaction (see hg help rollback).
| | o |  357:24dc0f4b9c6b 2008-04-28 19:14 +0200 Bastian Doetsch Minor fixes.
| | | |
| | o |  356:325f2134bb69 2008-04-28 15:49 +0200 Bastian Doetsch argh. i hate merges.
| | | |
| | o |  355:e994efc5e0d8 2008-04-28 15:20 +0200 Bastian Doetsch fixes errors in history painter
| | | |
| | o |    354:5400835c4796 2008-04-28 15:19 +0200 Bastian Doetsch merge
| | |\ \
| | | o |  353:576415ffbf4a 2008-04-28 15:03 +0200 Bastian Doetsch Bugfixing determining parents.
| | | | |
| | | o |  352:3165790f7cf2 2008-04-28 15:00 +0200 Bastian Doetsch History Painting with repository graph as base.
| | | |/
| | o |    351:e212dabcb4a6 2008-04-28 09:18 +0200 Bastian Doetsch merge
| | |\ \
| | | o |  350:0c99a6a8ac08 2008-04-28 09:17 +0200 Bastian Doetsch Graph Log, first try...
| | | | |
| | | o |  349:8fccc26280be 2008-04-27 23:50 +0200 Bastian Doetsch using now binary search for finding changesets by index. finding parent.works now.
| | | | |
| | | o |  348:8e4a80b34e44 2008-04-22 16:58 +0200 Bastian Doetsch cleanup in ChangeSet.java: removed private field files (use changedFiles instead)
| | | | |
| o | | |  347:f5bc73235976 2008-04-28 23:29 +0200 zingo credit Bastian
| | | | |
| o | | |  346:2dcefbc7a882 2008-04-28 23:08 +0200 zingo (no commit message)
| | | | |
| o | | |    345:84f074c780a0 2008-04-28 22:44 +0200 zingo Merge Latest from StefanC
| |\ \ \ \
| | o | | |  344:173e93789d0b 2008-04-27 15:53 +0200 stefan re-added default pull location to pull wizard
| | | | | |
| | o---+ |  343:e4f192e199cd 2008-04-27 15:28 +0200 stefan Unify update and update n pull
| |  / / /
| o-----+  342:4d09ff63073c 2008-04-28 22:27 +0200 zingo Fix for empty description
|  / / /
| | | o  341:c4f558e16cea 2008-04-28 20:30 +1000 Charles O'Farrell Fixed a NullPointer in LocationManager when reverting/committing
| | | |
| | | |  I'm assuming that this should never happen in the first place though.
| | | o  340:4ef91d5670f1 2008-04-28 20:14 +1000 Charles O'Farrell Added 'jumps' to the Graph log and removed an extra line for dots.
| | | |
| | | o  339:d17a9745f440 2008-04-28 18:30 +1000 Charles O'Farrell Removed duplicate push/pull actions from previous merge
| | | |
| | | o  338:349252f7a9b0 2008-04-28 18:08 +1000 Charles O'Farrell Removed annoying .orig files when reverting - so sue me
| | | |
| +---o  337:89d1c8bc1c80 2008-04-28 18:06 +1000 Charles O'Farrell More advanced history view with easier viewing file and description.
| | |
| | |    This was taken almost directly from Subclipse (thanks guys). Is still only a subset - missing search, limited length and different layout of affected paths.
| o |  336:2bcba819dde4 2008-04-28 13:45 +1000 Charles O'Farrell Fixed log parsing/escaping
| | |
| o |  335:2f727c581b85 2008-04-28 11:24 +1000 Charles O'Farrell BIG merge with Bastian to include my dodgy GraphLog
| |\|
| o |  334:49a8ca2e78eb 2008-04-26 00:19 +1000 Charles O'Farrell Whoops - removed useless debugging
| | |
| o |  333:ca0642a1bf75 2008-04-25 18:06 +1000 Charles O'Farrell GLog in full technicolour glory!!!
| | |
| o |  332:5aa534f0f70e 2008-04-25 13:57 +1000 Charles O'Farrell First attempt at GLog - not even close
| | |
| o |  331:33113e1c7926 2008-04-24 15:10 +1000 Charles O'Farrell Annotate now has descriptions as well (finally)
| | |
| o |  330:325765df5bdb 2008-04-24 15:09 +1000 Charles O'Farrell Committed missing plugin.xml - whoops
| | |
| o |  329:2fb507ab0390 2008-04-24 13:19 +1000 Charles O'Farrell Fixed a few MergeView issues and removed unused Actions
| | |
| o |  328:0070a8e6b3e5 2008-04-24 10:45 +1000 Charles O'Farrell #173 - Fixed annoying validation of executable path
| | |
| o |  327:f0bb96ec7ed3 2008-04-24 10:29 +1000 Charles O'Farrell Merge from jnegre
|/| |
| o |  326:dc0e693cd0d6 2008-04-09 08:54 +1000 Charles O'Farrell Fixed my own unit tests
| | |
| o |  325:b6cb3bf23f9f 2008-04-08 20:31 +1000 charleso Added very basic unit test for AnnotateCommand just to get the ball rolling
| | |
| | o  324:d06ca2d01220 2008-04-22 13:29 +0200 Bastian Doetsch performance + synchronization fixes for status handling
| | |
| | o  323:1ed0f0aa9fa0 2008-04-22 11:20 +0200 Bastian Doetsch Optimizations for bigger projects in status cache
| | |  - only get top xxx revisions when invoking hg log from status cache. if a resource isn't contained in result, do the call for the resource alone.
| | o  322:d168058ed430 2008-04-22 10:17 +0200 Bastian Doetsch some convenience methods in status cache, new hg commands, cleanups and additions in changeset
| | |
| | o  321:580c3749d779 2008-04-20 19:36 +0200 Bastian Doetsch bugfix for closed project
| | |
| | o  320:20fb3d2b763d 2008-04-19 12:14 +0200 Bastian Doetsch Fix decorator overlay image of folders
| | |
| | |  The clean status didn't come back, when changes were reverted as the status cleaning / refreshing code didn't include folders. After changing that, the overlays are okay.
| | |
| | |  AddToWorkspaceAction now saves repository as project specific repo.
| | o  319:9ff732a9de9b 2008-04-19 00:01 +0200 Bastian Doetsch only getting incoming repo information when syncing (performance)
| | |  only syncing correct, project specific repos
| | o  318:858b1dd3962e 2008-04-18 22:16 +0200 Bastian Doetsch updated hgignore
| | |
| | o  317:0d9524c95e75 2008-04-18 22:08 +0200 Bastian Doetsch Hopefully fixed compare to changeset/tag
| | |
| | |  Additionally:
| | |  - status now proliferates correctly to parent folders
| | |  - new method in dataloader for searching for tags
| | o  316:90c718c246b7 2008-04-18 19:11 +0200 Bastian Doetsch corrected changeset caching to use global hash.
| | |
| | |  - minor change: Using a monitor now to track progress of sync/status
| | o  315:95fa9b6a9b92 2008-04-18 16:28 +0200 Bastian Doetsch Fixes some bugs in status handling
| | |
| | o  314:93196670b60e 2008-04-18 16:26 +0200 Bastian Doetsch Fixes not including incoming revisions.
| | |
| | o  313:dec3137e29dc 2008-04-18 16:23 +0200 Bastian Doetsch Fixes hg cat for revisions in bundles and compare view.
| | |
+---o  312:5579811b2d0e 2008-04-14 22:48 +0200 Bastian Doetsch Merge with Jérôme
| | |
o | |  311:15a7d548ee41 2008-04-14 17:42 +0200 Jerome Negre use IAdaptable instead of casting
| | |
o | |  310:47d33542f7ab 2008-04-13 21:24 +0200 Jerome Negre more Handlers
| | |
o | |  309:e02f47720a42 2008-04-11 20:03 +0200 Jerome Negre starting to link menu entries with the state of the selection
| | |  (work in progress)
o | |  308:e4608bdfcae8 2008-04-10 18:52 +0200 Jerome Negre removing a System.out.println
| | |
o | |  307:960b2709b948 2008-04-10 18:51 +0200 Jerome Negre more UI factorization
| | |
o | |  306:623a901d4572 2008-04-10 12:12 +0200 Jerome Negre starting to merge the flags from "hg status" and "hg imerge" in a single model
| | |
o | |  305:b583430123fe 2008-04-09 23:01 +0200 Jerome Negre HgMoveDeleteHook now uses HgCommand
| | |
o | |  304:5c11a879237c 2008-04-09 22:36 +0200 Jerome Negre continuing migration to HgCommand
| | |
o | |  303:2a27b0f86520 2008-04-09 22:19 +0200 Jerome Negre the merge view is working again
| | |
| | o  302:a561e65dd247 2008-04-13 23:49 +0200 Bastian Doetsch Some fixes for status management.
| | |
| | o  301:e257b8223e39 2008-04-13 22:13 +0200 Bastian Doetsch First steps to remote compare.
| | |
| | |  - using bundle file of incoming changes
| | |  - invoking hg -R bundlefilename.hg car -r revision
| | |  - problem: repository gotta haven parents :-(.
| | o  300:787ec86cca87 2008-04-13 18:30 +0200 Bastian Doetsch synchronize in statusCache.clear()
| | |
| | o    299:ec724c0f5e9f 2008-04-13 17:59 +0200 Bastian Doetsch merge
| | |\
| | | o  298:c3bf5b7f1581 2008-04-10 19:50 -0600 Brandon Use TeamUI.getHistoryView().showHistoryFor(resource); instead of TeamUI.showHistoryFor(activePage, resource, null);
| | | |  This compiles under both eclipse 3.2 and 3.3, but I don't know whether it works under 3.3.
| | | o  297:b379c44adc1a 2008-04-10 19:26 -0600 Brandon Move the anonymous class to an inner private class.  This compiles under both 3.2 and 3.3.
| | | |
| | | o  296:e5328ff804e1 2008-04-10 19:19 -0600 Brandon Move the anonymous class to an inner private class.  This compiles under both 3.2 and 3.3.
| | | |
| | | o  295:1ef466655f20 2008-04-10 18:59 -0600 Brandon Revert to the ResourceSorter, which was deprecated with eclipse 3.3.
| | | |
| +---o  294:c1559cec5441 2008-04-10 18:14 -0600 Brandon Returning instead of potentially throwing a null pointer exception.
| | |
| | o  293:77ebb21539d0 2008-04-13 17:35 +0200 Bastian Doetsch Added myself to Contributors.
| | |
| | o  292:340acb1ddd63 2008-04-13 17:01 +0200 Bastian Doetsch added commit action to sync view
| | |
| | o  291:d073a002d93f 2008-04-13 12:22 +0200 Bastian Doetsch reduced number of unnecessary invocations of hg
| | |
| | o  290:92719d9456a7 2008-04-13 00:29 +0200 Bastian Doetsch Further speedup and stability fixes for sync.
| | |
| | o  289:043d80d2dac4 2008-04-12 21:31 +0200 Bastian Doetsch Performance fixes. Sync was way to slow and blocking the GUI.
| | |
| | o  288:245d128f02ce 2008-04-12 20:17 +0200 Bastian Doetsch sync uses hg incoming for incoming changes. compare doesnt work so far. bug fixes.
| | |
| | o  287:297c4f1c9cb8 2008-04-12 02:37 +0200 Bastian Doetsch Synchronize works now, History and Compare, too. Major refactorings, read on:
| | |  Everything with storing Mercurial revision, changeset and global
| | |  information is now organized and cleaned up. Primitive parameters have
| | |  often been substituted by the ChangeSet class. After cleaning up,
| | |  the history started working as everybody was using the Revision
| | |  classes differently. The version information is now obtained via
| | |  the DataLoaders I found in the RevisionChooser Dialog. Extracted them
| | |  to being able to use them. The DecoratorStatus has changed a bit as
| | |  well - currently, the "+" is now shown anymore, but this could be
| | |  changed again.
| | o  286:c3c901fbb9ad 2008-04-11 01:02 +0200 Bastian Doetsch sync framework now runs. displaying differences open.
| | |
+---o  285:4ebbce751b48 2008-04-10 00:24 +0200 Bastian Doetsch merge
| | |
o | |  284:6f058a1743e6 2008-04-09 21:41 +0200 Jerome Negre Removing helper methods from CompareAction
| | |
| | o  283:f8e669c4174c 2008-04-10 00:08 +0200 Bastian Doetsch fixed NullPointerException when pull fails. Now a msgbox appears with an error message.
| | |
| | o  282:c7d4ca603fec 2008-04-10 00:02 +0200 Bastian Doetsch Extracted status cache from label decorator.
| | |
| | |  Now using singleton class MercurialStatusCache for access to status information. LabelDecorator is notified via Observable/Observer pattern.
| | o  281:75f094fdc1ad 2008-04-09 01:21 +0200 Bastian Doetsch corrected merge error in plugin.xml
| | |
+---o  280:aa90918d3c26 2008-04-09 01:01 +0200 Bastian Doetsch merge
| | |
| | o    279:c1f5e1d78549 2008-04-09 00:58 +0200 Bastian Doetsch merge
| | |\
o | | |  278:773daf41c511 2008-04-08 19:40 +0200 Jerome Negre merge
|\| | |
o | | |  277:204c0c268066 2008-04-08 18:51 +0200 Jerome Negre rewrote findCommonAncestor in a much nicer way
| | | |  hg debugancestor FTW!
o | | |  276:b2c152529f99 2008-04-08 01:55 +0200 Jerome Negre UI factorisation
| | | |
o | | |  275:bbbfe8b25869 2008-04-07 21:43 +0200 Jerome Negre new GLogAction
| | | |
o | | |    274:58bd677c3aa4 2008-04-07 20:07 +0200 Jerome Negre merge
|\ \ \ \
| | | | o  273:f930d1371671 2008-04-09 00:53 +0200 Bastian Doetsch added prefs.orig to ignore
| | | | |
| | | | o  272:ccde5511397c 2008-04-09 00:38 +0200 Bastian Doetsch re-added push and update as it was somehow missing
| | | | |
| | | | o  271:3f962c82bbc9 2008-04-09 00:03 +0200 Bastian Doetsch implemented projectset im-/export
| | | | |
| +-----o  270:989650d5e4a7 2008-04-07 19:32 +0200 Bastian Doetsch sync with jerome negre
| | | |
| | | o  269:86e26db687bf 2008-04-07 19:16 +0200 Bastian Doetsch (no commit message)
| | | |
| | | o  268:3ffb4f5340cd 2008-04-07 19:08 +0200 Bastian Doetsch (no commit message)
| | | |
| | | o  267:ffaea5801d0c 2008-04-07 19:08 +0200 Bastian Doetsch (no commit message)
| | | |
| | | o  266:421245848b2b 2008-04-07 19:07 +0200 Bastian Doetsch (no commit message)
| | | |
| | | o  265:86bfd1cc6558 2008-04-07 19:06 +0200 Bastian Doetsch new version
| | | |
| | | o  264:ca811355ae09 2008-04-07 18:51 +0200 Bastian Doetsch corrected typo
| | | |
| +---o  263:9b0c8430574a 2008-04-07 18:31 +0200 Bastian Doetsch sync with jerome negres repo
| | | |
| o | |  262:c890f1558210 2008-04-06 20:37 +0200 Jerome Negre 30s default timeout
| | | |
| o | |  261:d73730b816f0 2008-04-06 17:18 +0200 Jerome Negre removing HgUpdateClient.rollback
| | | |
| o | |  260:c48c2fa66b20 2008-04-06 17:08 +0200 Jerome Negre adding icons for merge and tag
| | | |
| o | |  259:2956fd5c54d0 2008-04-06 16:53 +0200 Jerome Negre added Switch + Update actions
| | | |
| o | |  258:e4705bf72b3d 2008-04-06 15:59 +0200 Jerome Negre Error pop-up to show Exceptions thrown in Actions
| | | |
| o | |  257:264402d99478 2008-04-06 13:09 +0200 Jerome Negre adding + using ResourceProperties
| | | |
| o | |  256:ff712515f159 2008-04-05 22:08 +0200 Jerome Negre One can now merge with whatever revision
| | | |
| o | |  255:16d49d15f091 2008-04-05 22:02 +0200 Jerome Negre Highlight the current parents in RevisionChooserDialog.
| | | |  Allow fall through in switch/case
| o | |  254:5e060a092110 2008-04-05 17:56 +0200 Jerome Negre Lazy loading for RevisionChooserDialog + showing heads
| | | |
| o | |  253:18901ae350d9 2008-04-05 16:21 +0200 Jerome Negre follow file history across copies and renames
| | | |
| o | |  252:29ece30aa854 2008-04-05 13:55 +0200 Jerome Negre Starting to add merge support
| | | |  still very buggy - GUI not finished
| o | |  251:13a4b123ddc8 2008-04-04 12:24 +0200 Jerome Negre now handles IAdaptable of IResource
| | | |
| o | |  250:1b8dda5b8290 2008-04-04 08:40 +0200 Jerome Negre fix compiler warnings
| | | |
| | | o  249:25d4c4e15a63 2008-04-06 19:00 +0200 Bastian Doetsch Added "Pull and update" to context menu. Using hp pull -u when invoked.
| | | |
| | | o  248:e9c6e18fe7d5 2008-04-06 17:05 +0200 Bastian Doetsch corrected compile error since fall throughs in switch statements aren't allowed in project specific compile settings
| | | |
| +---o  247:437181e131fb 2008-04-06 16:58 +0200 Bastian Doetsch added @Override annotations to comply with the project's compile settings
| | |
| | o  246:0fb60c9f1176 2008-04-07 19:22 +0200 zingo Bastian Doetsch: Improve #18
| | |
| | o  245:ebff68041bc1 2008-04-07 18:47 +0200 zingo l
| | |
+---o  244:4f48319bfabe 2008-04-05 20:12 +1000 Charles O'Farrell Compare between log entries
| |
o |  243:80f951f0bb52 2008-04-05 14:02 +1000 co4222 Apeased the angry compiler gods
| |
o |  242:81fed79f2786 2008-04-05 12:29 +1000 charleso Removed reference to deprecated Eclipse class
| |
o |  241:4771eb554f7c 2008-04-05 11:47 +1000 charleso Removed Java 6 dependency
|/
o  240:40d3a7a626d3 2008-04-01 23:19 +0200 zingo Added tag RELEASE_0.2 for changeset 4b5fcdf8128f