Changeset 3:296778dfdf6d

Timestamp:

10/19/08 22:24:45 (3 years ago)

Author:

Whitney Sorenson <ws@…>

Branch:

default

Message:

0.8.7 - add support for log on repo, dont block ui thread on history

Files:

• com.goldenhammers.merclipse.feature/feature.xml (modified) (1 diff)
• com.goldenhammers.merclipse.update.site/site.xml (modified) (1 diff)
• com.goldenhammers.merclipse/META-INF/MANIFEST.MF (modified) (1 diff)
• com.goldenhammers.merclipse/plugin.xml (modified) (2 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialFileHistory.java (modified) (7 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPage.java (modified) (8 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPageSource.java (modified) (2 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/team/actions/MercurialShowLogAction.java (modified) (2 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/MercurialOperationMonitor.java (modified) (2 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/MercurialUtils.java (modified) (2 diffs)
• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/OutputStreamMercurialOperationMonitor.java (modified) (2 diffs)

com.goldenhammers.merclipse.feature/feature.xml

@@ -3 +3 @@
       id="com.goldenhammers.merclipse.feature"
       label="Merclipse Feature"
-      version="0.8.6"
+      version="0.8.7"
       provider-name="goldenhammers.com">
 

com.goldenhammers.merclipse.update.site/site.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.goldenhammers.merclipse.feature_0.8.6.jar" id="com.goldenhammers.merclipse.feature" version="0.8.6">
+   <feature url="features/com.goldenhammers.merclipse.feature_0.8.7.jar" id="com.goldenhammers.merclipse.feature" version="0.8.7">
       <category name="com.goldenhammers.merclipse.category"/>
    </feature>

com.goldenhammers.merclipse/META-INF/MANIFEST.MF

@@ -3 +3 @@
 Bundle-Name: Merclipse Plug-in
 Bundle-SymbolicName: com.goldenhammers.merclipse;singleton:=true
-Bundle-Version: 0.8.6
+Bundle-Version: 0.8.7
 Bundle-Activator: com.goldenhammers.merclipse.MercurialPlugin
 Require-Bundle: org.eclipse.ui,

com.goldenhammers.merclipse/plugin.xml

@@ -47 +47 @@
             class="com.goldenhammers.merclipse.prefs.MercurialPreferencePage"
             id="com.goldenhammers.merclipse.preferencepage"
-            name="Mercurial">
+            name="Merclipse">
       </page>
    </extension>
@@ -179 +179 @@
                icon="icons/hg16.png"
                id="com.goldenhammers.merclipse.showLog"
-               label="Show Repository Log View"
+               label="Show Repository Log"
                menubarPath="team.main/group8"
                tooltip="Show view for displaying the entire repository&apos;s log">

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialFileHistory.java

@@ -13 +13 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.team.core.history.IFileRevision;
 import org.eclipse.team.core.history.provider.FileHistory;
@@ -31 +33 @@
 
         private IFile file;
+        private MercurialWorkingDir workingDir;
         private IFileRevision[] revisions;
         
         public MercurialFileHistory(IFile file) {
                 this.file = file;
+        }
+        
+        public MercurialFileHistory(MercurialWorkingDir workingDir) {
+                this.workingDir = workingDir;
         }
         
@@ -50 +57 @@
                         
                         try {
-                                revs = MercurialUtils.getRevisions(MercurialUtils.runSync(MercurialConstants.CMD_LOG, 
-                                                new MercurialPath(file), null, MercurialConstants.ARG_FOLLOW, MercurialConstants.ARG_VERBOSE));
+                                InputStream results = null;
+                                if (workingDir == null) {
+                                        results = MercurialUtils.runSyncOnUIThread(Display.getCurrent(), MercurialConstants.CMD_LOG, new MercurialPath(file), null, MercurialConstants.ARG_FOLLOW, MercurialConstants.ARG_VERBOSE);
+                                } else {
+                                        results = MercurialUtils.runSyncOnUIThread(Display.getCurrent(), MercurialUtils.getCommand(MercurialConstants.CMD_LOG), workingDir, null);
+                                }
+                                
+                                revs = MercurialUtils.getRevisions(results);
                                 
                         } catch (MercurialException e) {
@@ -68 +81 @@
                                 revisions = new MercurialFileRevision[revs.size()];
                                 
-                                MercurialWorkingDir workingDir = MercurialUtils.getWorkingDirectory(file);
+                                MercurialWorkingDir dir = null;
+                                String lastFilePath = null;
                                 
-                                String lastFilePath = MercurialPath.getMercurialPath(workingDir, file);
+                                if (workingDir == null) {
+                                        dir = MercurialUtils.getWorkingDirectory(file);
+                                        lastFilePath = MercurialPath.getMercurialPath(dir, file);
+                                } else {
+                                        dir = workingDir;
+                                }
                                 
                                 int i = 0;
@@ -78 +97 @@
                                 for (MercurialRevision rev : revs) {
                                         
-                                        if (!rev.getFiles().contains(lastFilePath)) {
+                                        if (workingDir == null && !rev.getFiles().contains(lastFilePath)) {
                                                 // renamed in previous revision
                                                 
@@ -96 +115 @@
                                                 
                                                 try {
-                                                        BufferedReader br = new BufferedReader(new InputStreamReader(MercurialUtils.runSync(cmd, workingDir, null)));
+                                                        BufferedReader br = new BufferedReader(new InputStreamReader(MercurialUtils.runSync(cmd, dir, null)));
                                                         
                                                         // first line is diff 
@@ -113 +132 @@
                                         previous = rev;
                                         
-                                        revisions[i++] = new MercurialFileRevision(rev, lastFilePath, workingDir);      
+                                        revisions[i++] = new MercurialFileRevision(rev, lastFilePath, dir);     
                                 }
                         }

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPage.java

@@ -14 +14 @@
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
@@ -81 +83 @@
                         @Override
                         public void run() {
-                                IFile file = getCurrentFile();
+                                IFile file = (IFile) getCurrentResource();
                                 
                                 MercurialWorkingDir workingDir = MercurialUtils.getWorkingDirectory(file);
@@ -133 +135 @@
                                 if (newInput != null) {
                                         // TODO what if the files are commited? we need a new pull here.
-                                        mfh = new MercurialFileHistory(getCurrentFile());
+                                        IResource currentResource = getCurrentResource();
+                                        
+                                        if (currentResource.getType() == IResource.FILE) {
+                                                mfh = new MercurialFileHistory((IFile) currentResource);
+                                        } else {
+                                                mfh = new MercurialFileHistory(MercurialUtils.getWorkingDirectory(currentResource));
+                                        }                                       
                                 } else {
                                         mfh = null;
@@ -162 +170 @@
         
         private void fillTableMenu(IMenuManager menuMgr) {
+                if (getCurrentResource().getType() == IResource.PROJECT) {
+                        return;
+                }
+                
                 ISelection sel = tableViewer.getSelection();
                 StructuredSelection structuredSel = (StructuredSelection) sel;
@@ -184 +196 @@
                 return container;
         }
-        
-        protected IFile getCurrentFile() {
-                return (IFile) getInput();
+                
+        protected IResource getCurrentResource() {
+                return (IResource) getInput();
         }
 
@@ -194 +206 @@
 
         public String getDescription() {
+                IPath location = getCurrentResource().getLocation();
+                
+                if (location != null) {
+                        return location.toString();
+                }
+                
                 return getName();
         }
 
         public String getName() {
-                return getCurrentFile().getName();
+                return getCurrentResource().getName();
         }
 
@@ -223 +241 @@
                 
                 if (isValidInput(input)) {
-                        currentRevision = new LocalFileRevision(getCurrentFile());
-                        tableViewer.setInput(getCurrentFile());
+                        if (getCurrentResource().getType() == IResource.FILE) {
+                                currentRevision = new LocalFileRevision((IFile) getCurrentResource());
+                        } else {
+                                currentRevision = null;
+                        }
+                        tableViewer.setInput(getCurrentResource());
                         return true;
                 }
@@ -232 +254 @@
         
         public boolean isValidInput(Object object) {
-                return object instanceof IFile;
+                return object instanceof IFile || object instanceof IProject;
         }
 

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPageSource.java

@@ -11 +11 @@
 package com.goldenhammers.merclipse.history;
 
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.team.core.RepositoryProvider;
@@ -24 +23 @@
         
         public boolean canShowHistoryFor(Object object) {
-                if (object instanceof IResource && ((IResource) object).getType() == IResource.FILE) {
-                        RepositoryProvider provider = RepositoryProvider.getProvider(((IFile) object).getProject());
+                if (object instanceof IResource) {
+                        IResource resource = (IResource) object;
+                        
+                        if (resource.getType() != IResource.PROJECT && resource.getType() != IResource.FILE) {
+                                return false;
+                        }
+                        
+                        RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject());
                         if (provider instanceof MercurialRepositoryProvider) {
                                 return true;

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/team/actions/MercurialShowLogAction.java

@@ -12 +12 @@
 
 import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.team.internal.ui.TeamUIPlugin;
+import org.eclipse.team.ui.TeamUI;
 
 public class MercurialShowLogAction extends MercurialAction {
@@ -18 +20 @@
         @Override
         public void executeMercurialAction(ISelection selection) {
+                TeamUI.showHistoryFor(TeamUIPlugin.getActivePage(), getSelectedResources(selection).get(0).getProject(), 
+                                null);
         }
 
-        @Override
-        public void refreshEnablement() {
-                setEnabled(false);
-        }
         
         

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/MercurialOperationMonitor.java

@@ -18 +18 @@
  */
 public class MercurialOperationMonitor implements IMercurialOperationMonitor {
-                
+        
+        private boolean finished;
+        
+        public MercurialOperationMonitor() {
+                this.finished = false;
+        }
+        
         public void handleLine(String line) throws MercurialException {
                 if (line.startsWith(MercurialUtils.ERROR_INDICATOR)) {
@@ -32 +38 @@
         protected void handleCleanLine(String line) throws MercurialException {}
 
-        public void operationFinished() {}
+        public void operationFinished() {
+                finished = true;
+        }
+        
+        public boolean isFinished() {
+                return finished;
+        }
 
 }

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/MercurialUtils.java

@@ -447 +447 @@
                                 throws MercurialException, MercurialNotFoundException, IOException, InterruptedException {
                 
-                MercurialProcess mp = runAsync(command, workingDirectory, 
-                                 new MercurialProgressOperationMonitor(monitor));
-                
-                while (mp.isRunning()) {
+                MercurialOperationMonitor opMonitor = new MercurialProgressOperationMonitor(monitor);
+                
+                MercurialProcess mp = runAsync(command, workingDirectory, opMonitor);
+                
+                while (!opMonitor.isFinished()) {
                         if (!display.readAndDispatch()) {
                                 display.sleep();
@@ -473 +474 @@
                 List<String> cmdList = getCommand(cmd, workingDir, path, args);
                 return runSync(cmdList, workingDir, monitor);
+        }
+        
+        public static InputStream runSyncOnUIThread(Display display, String cmd, MercurialPath path, IProgressMonitor monitor, String... args) 
+                throws MercurialException, MercurialNotFoundException, IOException, InterruptedException {
+                MercurialWorkingDir workingDir = getWorkingDirectory(path);
+                List<String> cmdList = getCommand(cmd, workingDir, path, args);
+                return runSyncOnUIThread(display, cmdList, workingDir, monitor);
         }
         

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/OutputStreamMercurialOperationMonitor.java

@@ -31 +31 @@
          */
         public OutputStreamMercurialOperationMonitor(OutputStream os) {
+                super();
                 w = new BufferedWriter(new OutputStreamWriter(os));
         }
@@ -65 +66 @@
                 
                 StreamUtils.close(w);
+                
+                super.operationFinished();
         }