This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
When Merge menu item is invoked it calls hg heads twice in AWT thread.
Created attachment 56725 [details] proposed patch
Other calls I have noticed in AWT thread: HgCommand.getVersion in checkVersion in Mercurial.java HgCommand.getLastRevision in formatAnnotation in MercurialAnnotator.java HgCommand.doCat in getRevision in VersionsCache.java HgCommand.addAction in ui/add/AddAction.java
Committed merge patch: Mercurial Import ---------------- applying /home/padraigo/main_67309_cfb53eb35ac3.patch patching file mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java INFO: End of Import Mercurial Fetch --------------- INFO: Running Fetch for /export/home/padraigo/netbeansFROMHG/main-out using IDE Options->General Proxy settings: webcache.uk.sun.com:8080 pulling from http://hg.netbeans.org/main searching for changes adding changesets adding manifests adding file changes added 33 changesets with 90 changes to 85 files (+1 heads) merging with new head 67500:03c335e9ef36 85 files updated, 0 files merged, 22 files removed, 0 files unresolved new changeset 67501:c43784fff2b9 merges remote changes with local INFO: End of Mercurial Fetch Mercurial Push -------------- using IDE Options->General Proxy settings: webcache.uk.sun.com:8080 INFO Changesets to push: comparing with https://padraigob:****@hg.netbeans.org/main searching for changes changeset: 67467:cb80daa0683e user: padraigob@netbeans.org date: Thu Feb 14 15:32:42 2008 +0000 files: mercurial/src/org/netbeans/modules/mercurial/ui/diff/ExportDiffPanel.java description: 127409: Use tip as revision if user presses OK before revisions are retrieved changeset: 67501:c43784fff2b9 tag: tip parent: 67467:cb80daa0683e parent: 67500:03c335e9ef36 user: padraigob@netbeans.org date: Thu Feb 14 15:39:44 2008 +0000 files: bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/BPELCatalogModel.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/BpelProjectCatalogReader.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/DependentProjectsFileExtractor.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/ExternalProjectsFileExtractor.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/GenerateJBIDescriptor.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/GenerateJBIDescriptorTask.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/GenerateJBIXMLTest.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/IDEBPELCatalogModel.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/IDEGenerateJBIDescriptor.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/IDEJBIGenerator.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/IDEValidateBPELProject.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/JBIGenerator.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/ModelUtil.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/MyLookup.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/PackageCatalogArtifacts.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/RelativePath.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/Util.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/ValidateBPEL.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/ValidateBPELProject.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/ValidateBPELProjectTask.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/jbi/Consumer.java bpel.project/antsrc/org/netbeans/modules/bpel/project/anttasks/jbi/Provider.java description: Automated merge with http://hg.netbeans.org/main pushing to https://padraigob:****@hg.netbeans.org/main searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files notify: sending 1 subscribers 1 changes INFO Push To: https://padraigob:****@hg.netbeans.org/main INFO From: /export/home/padraigo/netbeansFROMHG/main-out INFO: End of Mercurial Push
AddAction.java has been removed and the other issues have been moved to separate bugs.