Changeset 3:296778dfdf6d for com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/utils/MercurialUtils.java

Timestamp:

10/19/08 22:24:45 (4 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/src/com/goldenhammers/merclipse/utils/MercurialUtils.java (modified) (2 diffs)

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);
         }