Attachment #56973 for bug #127182

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.

View | Details | Raw Unified | Return to bug 127182
Collapse All | Expand All




    private ProgressHandle progressHandle = null;    
    private String displayName = ""; // NOI18N
    private String originalDisplayName = ""; // NOI18N
    private OutputLogger logger;
    private String repositoryRoot;
    private RequestProcessor.Task task;
    


    public void setRepositoryRoot(String repositoryRoot) {
        this.repositoryRoot = repositoryRoot;
        logger = null;
    }

    public void run() {        

            Mercurial.LOG.log(Level.FINE, "End - {0}", displayName); // NOI18N
        } finally {            
            finnishProgress();
            if (logger != null) logger.closeLog();
        }
    }


        getProgressHandle().finish();
    }
    
    public OutputLogger getLogger() {
        if (logger == null) {
            logger = Mercurial.getInstance().getLogger(repositoryRoot);
        }
        return logger;
    }

    public void annotate(HgException ex) {        
        ExceptionHandler eh = new ExceptionHandler(ex);
        if(isCanceled()) {




                        NbBundle.getMessage(Mercurial.class, "MSG_VERSION_CONFIRM_QUERY", version), // NOI18N
                        NbBundle.getMessage(Mercurial.class, "MSG_VERSION_CONFIRM"), // NOI18N
                        JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);
                OutputLogger logger = getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
                if (response == JOptionPane.YES_OPTION) {
                    goodVersion = true;
                    prefs.put(HgModuleConfig.PROP_RUN_VERSION, version);
                    logger.outputInRed(NbBundle.getMessage(Mercurial.class, "MSG_USING_VERSION_MSG", version)); // NOI18N);
                } else {
                    prefs.remove(HgModuleConfig.PROP_RUN_VERSION);
                    logger.outputInRed(NbBundle.getMessage(Mercurial.class, "MSG_NOT_USING_VERSION_MSG", version)); // NOI18N);
                }
                logger.closeLog();
            } else {
                goodVersion = true;
            }
        } else if (version == null) {
            Preferences prefs = HgModuleConfig.getDefault().getPreferences();
            prefs.remove(HgModuleConfig.PROP_RUN_VERSION);
            OutputLogger logger = getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed(NbBundle.getMessage(Mercurial.class, "MSG_VERSION_NONE_OUTPUT_MSG")); // NOI18N);
            HgUtils.warningDialog(Mercurial.class, "MSG_VERSION_NONE_TITLE", "MSG_VERSION_NONE_MSG");// NOI18N
            logger.closeLog();
        }
    }


        }
    }

    /**
     *
     * @param repositoryRoot String of Mercurial repository so that logger writes to correct output tab. Can be null
     * in which case the logger will not print anything
     * @return OutputLogger logger to write to
     */
    public OutputLogger getLogger(String repositoryRoot) {
        return OutputLogger.getLogger(repositoryRoot);
    }
}




                HgProgressSupport support = new HgProgressSupport() {
                    public void perform() {
                        try {
                            HgCommand.doRemove(root, file, this.getLogger());
                            // We need to cache the status of all deleted files
                            Map<File, FileInformation> interestingFiles = HgCommand.getInterestingStatus(root, file);
                            if (!interestingFiles.isEmpty()){

                HgProgressSupport support = new HgProgressSupport() {
                    public void perform() {
                        try {
                            HgCommand.doRemove(root, file, this.getLogger());
                            cache.refresh(file, FileStatusCache.REPOSITORY_STATUS_UNKNOWN);
                        } catch (HgException ex) {
                            Mercurial.LOG.log(Level.FINE, "fileDeletedImpl(): File: {0} {1}", new Object[] {file.getAbsolutePath(), ex.toString()}); // NOI18N

        srcFile.renameTo(dstFile);
        Runnable moveImpl = new Runnable() {
            public void run() {
                OutputLogger logger = OutputLogger.getLogger(root.getAbsolutePath());
                try {
                    if (dstFile.isDirectory()) {
                        HgCommand.doRenameAfter(root, srcFile, dstFile, logger);
                        return;
                    }
                    int status = HgCommand.getSingleStatus(root, srcFile.getParent(), srcFile.getName()).getStatus();

                    if (status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY ||
                        status == FileInformation.STATUS_NOTVERSIONED_EXCLUDED) {
                    } else if (status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) {
                        HgCommand.doRemove(root, srcFile, logger);
                        HgCommand.doAdd(root, dstFile, logger);
                    } else {
                        HgCommand.doRenameAfter(root, srcFile, dstFile, logger);
                    }
                } catch (HgException e) {
                    Mercurial.LOG.log(Level.FINE, "Mercurial failed to rename: File: {0} {1}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N
                } finally {
                    logger.closeLog();
                }
            }
        };




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.mercurial;

import java.io.File;
import java.io.IOException;
import java.util.logging.Level;
import java.util.List;
import java.net.URL;
import org.openide.awt.HtmlBrowser;
import org.openide.util.RequestProcessor;
import org.openide.windows.IOProvider;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputEvent;
import org.openide.windows.OutputWriter;
import org.openide.windows.OutputListener;

/**
 *
 * @author Tomas Stupka
 */
public class OutputLogger {

    private InputOutput log;
    private boolean ignoreCommand = false;
    private String repositoryRootString;
    private static final RequestProcessor rp = new RequestProcessor("MercurialOutput", 1);
    public static final int MAX_LINES_TO_PRINT = 500;

    private static final String MSG_TOO_MANY_LINES = "The number of output lines is greater than 500; see message log for complete output";


    public static OutputLogger getLogger(String repositoryRoot) {
        if (repositoryRoot != null) {
            return new OutputLogger(repositoryRoot);
        } else {
            return new NullLogger();
        }
    }
    
    private OutputLogger(String repositoryRoot) {
        repositoryRootString = repositoryRoot;
        log = IOProvider.getDefault().getIO(repositoryRootString, false);
    }

    private OutputLogger() {
    }
    
    public void closeLog() {
        rp.post(new Runnable() {
            public void run() {
                log.getOut().flush();
                log.getOut().close();        
                log.getErr().flush();
                log.getErr().close();        
            }
        });
    }

    public void flushLog() {
        rp.post(new Runnable() {
            public void run() {        
                log.getOut().flush();
                log.getErr().flush();
            }
        });        
    }
    
    /**
     * Print contents of list to OutputLogger's tab
     *
     * @param list to print out
     * 
     */
     public void output(final List<String> list){
        if( list.isEmpty()) return;

        rp.post(new Runnable() {
            public void run() {                
                log.select();
                OutputWriter out = log.getOut();
 
                int lines = list.size();
                if (lines > MAX_LINES_TO_PRINT) {
                    out.println(list.get(1));
                    out.println(list.get(2));
                    out.println(list.get(3));
                    out.println("...");
                    out.println(list.get(list.size() -1));
                    out.println(MSG_TOO_MANY_LINES);
                    for (String s : list){
                        Mercurial.LOG.log(Level.WARNING, s);
                    }
                } else {
                    for (String s : list){
                        out.println(s);
            	    }
            	}
                out.flush();
            }
        });
    }

    /**
     * Print msg to OutputLogger's tab
     *
     * @param String msg to print out
     * 
     */
    public void output(final String msg){
        if( msg == null) return;

        rp.post(new Runnable() {
            public void run() {                
                log.select();

                log.getOut().println(msg);
                log.getOut().flush();
            }
        });
    }

    /**
     * Print msg to OutputLogger's tab in Red
     *
     * @param String msg to print out
     * 
     */
    public void outputInRed(final String msg){
        if( msg == null) return;

        rp.post(new Runnable() {
            public void run() {                
                log.select();
                log.getErr().println(msg);
                log.getErr().flush();
            }
        });
    }

    /**
     * Print URL to OutputLogger's tab as an active Hyperlink
     *
     * @param String sURL to print out
     * 
     */
    public void outputLink(final String sURL){
        if (sURL == null) return;
         
        rp.post(new Runnable() {
            public void run() {                
                log.select();
                try {
                    OutputWriter out = log.getOut();

                    OutputListener listener = new OutputListener() {
                        public void outputLineAction(OutputEvent ev) {
                            try {
                                HtmlBrowser.URLDisplayer.getDefault().showURL(new URL(sURL));
                            } catch (IOException ex) {
                            // Ignore
                            }
                        }
                        public void outputLineSelected(OutputEvent ev) {}
                        public void outputLineCleared(OutputEvent ev) {}
                    };
                    out.println(sURL, listener, true);
                    out.flush();
                } catch (IOException ex) {
                // Ignore
                }
            }
        });
    }

    /**
     * Select and Clear OutputLogger's tab
     *
     * @param list to print out
     * 
     */
    public void clearOutput(){
        rp.post(new Runnable() {
            public void run() {                
                log.select();
                OutputWriter out = log.getOut();
         
                try {
                    out.reset();
                } catch (IOException ex) {
                    // Ignore Exception
                }
                out.flush();
            }
        });
    }
     
    private static class NullLogger extends OutputLogger {

        public void closeLog() {
        }

        public void flushLog() {
        }

        public void output(List<String> list){
        }

        public void output(String msg){
        }
        public void outputInRed(String msg){
        }
        public void outputLink(final String sURL){
        }
        public void clearOutput(){
        }
    }

}




    public File getFileRevision(File base, String revision) throws IOException {
        if(revision.equals("-1")) return null; // NOI18N
        
        File repository = Mercurial.getInstance().getTopmostManagedParent(base);
        OutputLogger logger = OutputLogger.getLogger(repository.getAbsolutePath());
        if (Setup.REVISION_BASE.equals(revision)) {
            try {
                File tempFile = File.createTempFile("tmp", "-" + base.getName()); //NOI18N
                HgCommand.doCat(repository, base, tempFile, logger);
                HgCommand.doCat(repository, base, tempFile);
                if (tempFile.length() == 0) return null;
                return tempFile;
            } catch (HgException e) {
                IOException ioe = new IOException();
                ioe.initCause(e);
                throw ioe;
            } finally {
                logger.closeLog();
            }
        } else if (Setup.REVISION_CURRENT.equals(revision)) {
            return base;
        } else {
            try {
                File tempFile = File.createTempFile("tmp", "-" + base.getName()); //NOI18N
                HgCommand.doCat(repository, base, tempFile, revision, logger);
                HgCommand.doCat(repository, base, tempFile, revision);
                if (tempFile.length() == 0) return null;
                return tempFile;
            } catch (HgException e) {
                IOException ioe = new IOException();
                ioe.initCause(e);
                throw ioe;
            } finally {
                logger.closeLog();
            }
        }
    }




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.FileStatusCache;
import org.netbeans.modules.mercurial.FileInformation;
import org.netbeans.modules.mercurial.util.HgUtils;

            RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);
            HgProgressSupport support = new HgProgressSupport() {
                public void perform() {
                    OutputLogger logger = getLogger();
                    logger.outputInRed(
                            NbBundle.getMessage(AnnotateAction.class,
                            "MSG_ANNOTATE_TITLE")); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(AnnotateAction.class,
                            "MSG_ANNOTATE_TITLE_SEP")); // NOI18N
                    computeAnnotations(repository, file, this, ab);
                    logger.output("\t" + file.getAbsolutePath()); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(AnnotateAction.class,
                            "MSG_ANNOTATE_DONE")); // NOI18N
                }

    private void computeAnnotations(File repository, File file, HgProgressSupport progress, AnnotationBar ab) {
        List<String> list = null;
        try {
             list = HgCommand.doAnnotate(repository, file, progress.getLogger());
        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);

        if (list == null) return;
        AnnotateLine [] lines = toAnnotateLines(list);
        try {
             list = HgCommand.doLogShort(repository, file, progress.getLogger());
        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);

Lines 433-439 final class AnnotationBar extends JCompo Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/AnnotationBar.java (-1 / +1 lines)
433	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);	433	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);
434	HgProgressSupport support = new HgProgressSupport() {	434	HgProgressSupport support = new HgProgressSupport() {
435	public void perform() {	435	public void perform() {
436	RevertModificationsAction.performRevert(root, revStr, file, doBackup);	436	RevertModificationsAction.performRevert(root, revStr, file, doBackup, this.getLogger());
437	}	437	}
438	};	438	};
439	support.start(rp, root.getAbsolutePath(), NbBundle.getMessage(AnnotationBar.class, "MSG_Revert_Progress")); // NOI18N	439	support.start(rp, root.getAbsolutePath(), NbBundle.getMessage(AnnotationBar.class, "MSG_Revert_Progress")); // NOI18N




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.HgModuleConfig;
import org.netbeans.modules.mercurial.config.HgConfigFiles;
import org.netbeans.modules.mercurial.util.HgCommand;

            Runnable doOpenProject = new Runnable () {
                public void run()  {
                    // Open and set focus on the cloned project if possible
                    OutputLogger logger = getLogger();
                    try {
                        FileObject cloneProj = FileUtil.toFileObject(clonePrjFile);
                        Project prj = null;

                            hg.versionedFilesChanged();
                            hg.refreshAllAnnotations();
                        }else{
                            logger.outputInRed( NbBundle.getMessage(CloneAction.class,
                                    "MSG_EXTERNAL_CLONE_PRJ_NOT_FOUND_CANT_SETASMAIN")); // NOI18N
                        }
            

                        NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(new HgException(ex.toString()));
                        DialogDisplayer.getDefault().notifyLater(e);
                    } finally{
                       logger.outputInRed(NbBundle.getMessage(CloneAction.class, "MSG_CLONE_DONE")); // NOI18N
                       logger.output(""); // NOI18N
                    }
                }
            };
            public void perform() {
                OutputLogger logger = getLogger();
                try {
                    // TODO: We need to annotate the cloned project 
                    // See http://qa.netbeans.org/issues/show_bug.cgi?id=112870
                    logger.outputInRed(
                            NbBundle.getMessage(CloneAction.class,
                            "MSG_CLONE_TITLE")); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(CloneAction.class,
                            "MSG_CLONE_TITLE_SEP")); // NOI18N
                    List<String> list = HgCommand.doClone(source, target, logger);
                    if(list != null && !list.isEmpty()){
                        HgUtils.createIgnored(cloneFolder);
                        logger.output(list);
               
                        if (prjName != null) {
                            logger.outputInRed(
                                    NbBundle.getMessage(CloneAction.class,
                                    "MSG_CLONE_FROM", prjName, source)); // NOI18N
                            logger.outputInRed(
                                    NbBundle.getMessage(CloneAction.class,
                                    "MSG_CLONE_TO", prjName, target)); // NOI18N
                        } else {
                            logger.outputInRed(
                                    NbBundle.getMessage(CloneAction.class,
                                    "MSG_EXTERNAL_CLONE_FROM", source)); // NOI18N
                            logger.outputInRed(
                                    NbBundle.getMessage(CloneAction.class,
                                    "MSG_EXTERNAL_CLONE_TO", target)); // NOI18N

                        }
                        logger.output(""); // NOI18N

                        if (isLocalClone){
                            SwingUtilities.invokeLater(doOpenProject);

                        fixLocalPullPushPathsOnWindows(cloneFolder.getAbsolutePath(), defaultPull, defaultPush);
                    }
                    if(!isLocalClone){
                        logger.outputInRed(NbBundle.getMessage(CloneAction.class, "MSG_CLONE_DONE")); // NOI18N
                        logger.output(""); // NOI18N
                    }
                }
            }




import org.netbeans.modules.versioning.spi.VCSContext;
import org.netbeans.modules.versioning.util.Utils;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.FileStatusCache;
import org.netbeans.modules.mercurial.FileInformation;
import org.netbeans.modules.mercurial.HgFileNode;

    public void performAction(ActionEvent e) {
        final File root = HgUtils.getRootFile(context);
        if (root == null) {
            OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed( NbBundle.getMessage(CommitAction.class,"MSG_COMMIT_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(CommitAction.class,"MSG_COMMIT_TITLE_SEP")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
            logger.output(""); // NOI18N
            logger.closeLog();
            JOptionPane.showMessageDialog(null,
                    NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW"),// NOI18N
                    NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N

            RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository.getAbsolutePath());
            HgProgressSupport support = new HgProgressSupport() {
                public void perform() {
                    OutputLogger logger = getLogger();
                    performCommit(message, commitFiles, ctx, this, prjName, logger);
                }
            };
            support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(CommitAction.class, "LBL_Commit_Progress")); // NOI18N

    }
    
    private static void performCommit(String message, Map<HgFileNode, CommitOptions> commitFiles, 
            VCSContext ctx, HgProgressSupport support, String prjName, OutputLogger logger) {
        FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();
        final File repository = HgUtils.getRootFile(ctx);
        List<File> addCandidates = new ArrayList<File>();

        }
        
        try {
            logger.outputInRed(
                    NbBundle.getMessage(CommitAction.class,
                    "MSG_COMMIT_TITLE")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(CommitAction.class,
                    "MSG_COMMIT_TITLE_SEP")); // NOI18N
            logger.output(message); // NOI18N
            if (addCandidates.size() > 0 ) {
                HgCommand.doAdd(repository, addCandidates, logger);
                for (File f : addCandidates) {
                    logger.output("hg add " + f.getName()); //NOI18N
                }
            }
            HgCommand.doCommit(repository, commitCandidates, message, logger);
            HgRepositoryContextCache.setHasHistory(ctx);

            if (commitCandidates.size() == 1) {
                logger.output(
                        NbBundle.getMessage(CommitAction.class,
                        "MSG_COMMIT_INIT_SEP_ONE", commitCandidates.size(), prjName)); // NOI18N
            } else {
                logger.output(
                        NbBundle.getMessage(CommitAction.class,
                        "MSG_COMMIT_INIT_SEP", commitCandidates.size(), prjName)); // NOI18N
            }
            for (File f : commitCandidates) {
                logger.output("\t" + f.getAbsolutePath()); // NOI18N
            }
        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            cache.refreshCached(ctx);
            logger.outputInRed(NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_DONE")); // NOI18N
            logger.output(""); // NOI18N
        }
    }
}




import java.util.logging.Level;
import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.versioning.spi.VCSContext;
import org.netbeans.modules.versioning.util.Utils;

        File projFile = HgUtils.getProjectFile(proj);
        
        if (projFile == null) {
            OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed( NbBundle.getMessage(CreateAction.class,"MSG_CREATE_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(CreateAction.class,"MSG_CREATE_TITLE_SEP")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(CreateAction.class, "MSG_CREATE_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
            logger.output(""); // NOI18N
            JOptionPane.showMessageDialog(null,
                    NbBundle.getMessage(CreateAction.class, "MSG_CREATE_NOT_SUPPORTED_INVIEW"),// NOI18N
                    NbBundle.getMessage(CreateAction.class, "MSG_CREATE_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N
                    JOptionPane.INFORMATION_MESSAGE);
            logger.closeLog();
            return;
        }
        String projName = HgProjectUtils.getProjectName(projFile);

        root = getCommonAncestor(files);
        root = getCommonAncestor(root, projFile);
        if (root == null) return;
        
        HgUtils.outputMercurialTabInRed(
                NbBundle.getMessage(CreateAction.class,
                "MSG_CREATE_TITLE")); // NOI18N
        HgUtils.outputMercurialTabInRed(
                NbBundle.getMessage(CreateAction.class,
                "MSG_CREATE_TITLE_SEP")); // NOI18N
        
        final File rootToManage = root;
        final String prjName = projName;

            public void perform() {
                
                try {
                    OutputLogger logger = getLogger();
                    logger.outputInRed(
                            NbBundle.getMessage(CreateAction.class,
                            "MSG_CREATE_TITLE")); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(CreateAction.class,
                            "MSG_CREATE_TITLE_SEP")); // NOI18N
        
                    logger.output(
                            NbBundle.getMessage(CreateAction.class,
                            "MSG_CREATE_INIT", prjName, rootToManage)); // NOI18N
                    HgCommand.doCreate(rootToManage, logger);
                    hg.versionedFilesChanged();
                    hg.refreshAllAnnotations();      
                } catch (HgException ex) {

        
        HgProgressSupport supportAdd = new HgProgressSupport() {
            public void perform() {
                OutputLogger logger = getLogger();
                try {
                    File[] files = HgUtils.getProjectRootFiles(proj);
                    FileStatusCache cache = hg.getFileStatusCache();

                        repositoryFiles = HgCommand.getUnknownStatus(rootToManage, rootFile);
                        Calendar end = Calendar.getInstance();
                        Mercurial.LOG.log(Level.FINE, "getUnknownStatus took {0} millisecs", end.getTimeInMillis() - start.getTimeInMillis()); // NOI18N
                        logger.output(
                                NbBundle.getMessage(CreateAction.class,
                                "MSG_CREATE_ADD", repositoryFiles.keySet().size(), rootFile.getAbsolutePath())); // NOI18N
                        start = Calendar.getInstance(); cache.addToCache(repositoryFiles.keySet());
                        end = Calendar.getInstance();
                        Mercurial.LOG.log(Level.FINE, "addUnknownsToCache took {0} millisecs", end.getTimeInMillis() - start.getTimeInMillis()); // NOI18N
                        if (repositoryFiles.keySet().size() < OutputLogger.MAX_LINES_TO_PRINT) {
                            for(File f: repositoryFiles.keySet()){
                                logger.output("\t" + f.getAbsolutePath()); // NOI18N
                            }
                        }
                    }
                    HgUtils.createIgnored(rootToManage);
                    logger.output(""); // NOI18N
                    logger.outputInRed(NbBundle.getMessage(CreateAction.class, "MSG_CREATE_DONE_WARNING")); // NOI18N
                } catch (HgException ex) {
                    NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
                    DialogDisplayer.getDefault().notifyLater(e);
                } finally {
                    logger.outputInRed(NbBundle.getMessage(CreateAction.class, "MSG_CREATE_DONE")); // NOI18N
                    logger.output(""); // NOI18N
                }
            }
        };




import org.netbeans.modules.mercurial.FileInformation;
import org.netbeans.modules.mercurial.FileStatusCache;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.ui.actions.ContextAction;
import org.openide.nodes.Node;

        boolean bNotManaged = (root == null) || ( files == null || files.length == 0);

        if (bNotManaged) {
            OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed( NbBundle.getMessage(DiffAction.class,"MSG_DIFF_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(DiffAction.class,"MSG_DIFF_TITLE_SEP")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(DiffAction.class, "MSG_DIFF_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
            logger.output(""); // NOI18N
            logger.closeLog();
            JOptionPane.showMessageDialog(null,
                    NbBundle.getMessage(DiffAction.class, "MSG_DIFF_NOT_SUPPORTED_INVIEW"),// NOI18N
                    NbBundle.getMessage(DiffAction.class, "MSG_DIFF_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.HgModuleConfig;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.util.HgCommand;

        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                OutputLogger logger = getLogger();
                performExport(root, revStr, outputFileName, logger);
            }
        };
        support.start(rp, root.getAbsolutePath(), org.openide.util.NbBundle.getMessage(ExportDiffAction.class, "LBL_ExportDiff_Progress")); // NOI18N
    }

    private static void performExport(File repository, String revStr, String outputFileName, OutputLogger logger) {
    try {
        logger.outputInRed(
                NbBundle.getMessage(ExportDiffAction.class,
                "MSG_EXPORT_TITLE")); // NOI18N
        logger.outputInRed(
                NbBundle.getMessage(ExportDiffAction.class,
                "MSG_EXPORT_TITLE_SEP")); // NOI18N
        
        if (NbBundle.getMessage(ExportDiffAction.class,
                "MSG_Revision_Default").startsWith(revStr)) {
            logger.output(
                    NbBundle.getMessage(ExportDiffAction.class,
                    "MSG_EXPORT_NOTHING")); // NOI18N
        } else {
            List<String> list = HgCommand.doExport(repository, revStr, outputFileName, logger);
            logger.output(list); // NOI18N
            if (!list.isEmpty() && list.size() > 1) {
                File outFile = new File(list.get(1));
                if (outFile != null && outFile.canRead()) {

            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            logger.outputInRed(NbBundle.getMessage(ExportDiffAction.class, "MSG_EXPORT_DONE")); // NOI18N
            logger.output(""); // NOI18N
        }
    }
}




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.HgModuleConfig;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.util.HgRepositoryContextCache;

                RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root.getAbsolutePath());
                HgProgressSupport support = new HgProgressSupport() {
                    public void perform() {
                        OutputLogger logger = getLogger();
                        performImport(root, patchFile, logger);
                    }
                };
                support.start(rp, root.getAbsolutePath(), org.openide.util.NbBundle.getMessage(ImportDiffAction.class, "LBL_ImportDiff_Progress")); // NOI18N

        }
    }

    private static void performImport(File repository, File patchFile, OutputLogger logger) {
    try {
        logger.outputInRed(
                NbBundle.getMessage(ImportDiffAction.class,
                "MSG_IMPORT_TITLE")); // NOI18N
        logger.outputInRed(
                NbBundle.getMessage(ImportDiffAction.class,
                "MSG_IMPORT_TITLE_SEP")); // NOI18N

        List<String> list = HgCommand.doImport(repository, patchFile, logger);
        Mercurial.getInstance().changesetChanged(repository);
        logger.output(list); // NOI18N

        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            logger.outputInRed(NbBundle.getMessage(ImportDiffAction.class, "MSG_IMPORT_DONE")); // NOI18N
            logger.output(""); // NOI18N
        }
    }
}




        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository.getAbsolutePath());
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                OutputLogger logger = getLogger();
                try {
                    mActionStatus = getActionStatus(files);
                    if (mActionStatus == UNDEFINED) {
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class, "MSG_IGNORE_TITLE")); // NOI18N
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class, "MSG_IGNORE_TITLE_SEP")); // NOI18N
                        logger.output(
                                NbBundle.getMessage(IgnoreAction.class, "MSG_IGNORE_ONLY_LOCALLY_NEW")); // NOI18N
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class, "MSG_IGNORE_DONE")); // NOI18N
                        logger.output(""); // NOI18N
                        return;
                    }
        
                    if (mActionStatus == IGNORING) {
                        HgUtils.addIgnored(repository, files);
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class,
                                "MSG_IGNORE_TITLE")); // NOI18N
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class,
                                "MSG_IGNORE_TITLE_SEP")); // NOI18N
                        logger.output(
                                NbBundle.getMessage(IgnoreAction.class,
                                "MSG_IGNORE_INIT_SEP", repository.getName())); // NOI18N                          
                    } else {
                        HgUtils.removeIgnored(repository, files);
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class,
                                "MSG_UNIGNORE_TITLE")); // NOI18N
                        logger.outputInRed(
                                NbBundle.getMessage(IgnoreAction.class,
                                "MSG_UNIGNORE_TITLE_SEP")); // NOI18N
                        logger.output(
                                NbBundle.getMessage(IgnoreAction.class,
                                "MSG_UNIGNORE_INIT_SEP", repository.getName())); // NOI18N
                    }

                // refresh files manually
                for (File file : files) {
                    Mercurial.getInstance().getFileStatusCache().refresh(file, FileStatusCache.REPOSITORY_STATUS_UNKNOWN);
                    logger.output("\t" + file.getAbsolutePath()); // NOI18N
                }
                if (mActionStatus == IGNORING) {
                    logger.outputInRed(
                            NbBundle.getMessage(IgnoreAction.class,
                            "MSG_IGNORE_DONE")); // NOI18N
                } else {
                    logger.outputInRed(
                            NbBundle.getMessage(IgnoreAction.class,
                            "MSG_UNIGNORE_DONE")); // NOI18N
                }
                logger.output(""); // NOI18N
            }
        };
        support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(IgnoreAction.class, "LBL_Ignore_Progress")); // NOI18N

Lines 46-51 import org.netbeans.modules.mercurial.Fi Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/log/HgLogMessage.java (-2 / +5 lines)
46	import org.netbeans.modules.mercurial.FileInformation;	46	import org.netbeans.modules.mercurial.FileInformation;
47	import org.netbeans.modules.mercurial.FileStatus;	47	import org.netbeans.modules.mercurial.FileStatus;
48	import org.netbeans.modules.mercurial.Mercurial;	48	import org.netbeans.modules.mercurial.Mercurial;
		49	import org.netbeans.modules.mercurial.OutputLogger;
49	import org.netbeans.modules.mercurial.util.HgUtils;	50	import org.netbeans.modules.mercurial.util.HgUtils;
50		51
51	/**	52	/**
Lines 120-127 public class HgLogMessage { Link Here
120	FileInformation fi = Mercurial.getInstance().getFileStatusCache().getStatus(file);	121	FileInformation fi = Mercurial.getInstance().getFileStatusCache().getStatus(file);
121	FileStatus fs = fi != null? fi.getStatus(file): null;	122	FileStatus fs = fi != null? fi.getStatus(file): null;
122	if (fs != null && fs.isCopied()) {	123	if (fs != null && fs.isCopied()) {
123	HgUtils.outputMercurialTabInRed("*** Copied: " + s + " : " +	124	OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
124	fs.getFile() != null ? fs.getFile().getAbsolutePath() : "no filepath");	125
		126	logger.outputInRed("*** Copied: " + s + " : " + fs.getFile() != null ? fs.getFile().getAbsolutePath() : "no filepath");
		127	logger.closeLog();
125	}	128	}
126	}	129	}
127		130




import java.io.File;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgCommand;
import org.netbeans.modules.mercurial.util.HgUtils;


        filterUsername = criteria.getUsername() != null;
        filterMessage = criteria.getCommitMessage() != null;
        
        OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
        if (master.isIncomingSearch()) {
            logger.outputInRed( NbBundle.getMessage(SearchHistoryAction.class,
                "MSG_LogIncoming_Title")); // NOI18N
        }else if (master.isOutSearch()) {
            logger.outputInRed( NbBundle.getMessage(SearchHistoryAction.class,
                "MSG_LogOut_Title")); // NOI18N
        } else {
            logger.outputInRed( NbBundle.getMessage(SearchHistoryAction.class,
                "MSG_Log_Title")); // NOI18N
        }
        logger.outputInRed( NbBundle.getMessage(SearchHistoryAction.class,
                "MSG_Log_Title_Sep")); // NOI18N
        logger.output( NbBundle.getMessage(SearchHistoryAction.class,
                "MSG_LOG_EXEC_CONTEXT_SEP")); // NOI18N
        pathToRoot = new HashMap<String, File>(); 
        if (searchingUrl()) {
            String rootPath = Mercurial.getInstance().getTopmostManagedParent(master.getRoots()[0]).toString();
            pathToRoot.put(rootPath, master.getRoots()[0]);
            logger.output(rootPath);
        } else {
             workFiles = new HashMap<String, Set<File>>();
            for (File file : master.getRoots()) {

                    workFiles.put(rootPath, set);
                }
                set.add(file);
                logger.output(file.getAbsolutePath());
            }
        } 
        logger.output(""); // NOI18N

    }    
        




import java.io.File;
import java.util.*;
import org.netbeans.modules.mercurial.FileInformation;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.ui.actions.ContextAction;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.versioning.spi.VCSContext;

        SwingUtilities.invokeLater(new Runnable() {
            public void run() {
                if (context == null) return;
                File root = HgUtils.getRootFile(context);
                OutputLogger logger = OutputLogger.getLogger(root.getAbsolutePath());
                logger.outputInRed(
                        NbBundle.getMessage(SearchHistoryAction.class,
                        "MSG_Log_Title")); // NOI18N
                logger.outputInRed(
                        NbBundle.getMessage(SearchHistoryAction.class,
                        "MSG_Log_Title_Sep")); // NOI18N
                File[] files = context.getFiles().toArray(new File[0]);
                logger.output(
                        NbBundle.getMessage(SearchHistoryAction.class,
                        "MSG_LOG_CONTEXT_SEP")); // NOI18N
                for(File f: files){
                    logger.output(f.getAbsolutePath());
                }
                logger.outputInRed(""); // NOI18N
                logger.closeLog();
                SearchHistoryTopComponent tc = new SearchHistoryTopComponent(context);
                tc.setDisplayName(title);
                tc.open();
                tc.requestActive();

Lines 437-443 class SummaryView implements MouseListen Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/log/SummaryView.java (-2 / +2 lines)
437	revertFiles.add(event.getFile());	437	revertFiles.add(event.getFile());
438	}	438	}
439	RevertModificationsAction.performRevert(	439	RevertModificationsAction.performRevert(
440	root, revision.getLog().getRevision(), revertFiles, doBackup);	440	root, revision.getLog().getRevision(), revertFiles, doBackup, progress.getLogger());
441	revertFiles.clear();	441	revertFiles.clear();
442	}	442	}
443		443
Lines 467-473 class SummaryView implements MouseListen Link Here
467	if(revEvents != null && !revEvents.isEmpty()){	467	if(revEvents != null && !revEvents.isEmpty()){
468	// Assuming all files in a given repository reverting to same revision	468	// Assuming all files in a given repository reverting to same revision
469	RevertModificationsAction.performRevert(	469	RevertModificationsAction.performRevert(
470	root, revEvents.get(0).getLogInfoHeader().getLog().getRevision(), revertFiles, doBackup);	470	root, revEvents.get(0).getLogInfoHeader().getLog().getRevision(), revertFiles, doBackup, progress.getLogger());
471	}	471	}
472	}	472	}
473	}	473	}




import java.util.List;
import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.versioning.spi.VCSContext;
import javax.swing.*;
import java.awt.event.ActionEvent;

    public void performAction(ActionEvent ev) {
        final File root = HgUtils.getRootFile(context);
        if (root == null) {
            OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed( NbBundle.getMessage(MergeAction.class,"MSG_MERGE_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(MergeAction.class,"MSG_MERGE_TITLE_SEP")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(MergeAction.class, "MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
            logger.output(""); // NOI18N
            logger.closeLog();
            JOptionPane.showMessageDialog(null,
                    NbBundle.getMessage(MergeAction.class, "MSG_MERGE_NOT_SUPPORTED_INVIEW"),// NOI18N
                    NbBundle.getMessage(MergeAction.class, "MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N

        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                OutputLogger logger = getLogger();
                try {
                    List<String> headList = HgCommand.getHeadRevisions(root);
                    String revStr = null;
                    if (headList.size() <= 1) {
                        logger.outputInRed( NbBundle.getMessage(MergeAction.class,"MSG_MERGE_TITLE")); // NOI18N
                        logger.outputInRed( NbBundle.getMessage(MergeAction.class,"MSG_MERGE_TITLE_SEP")); // NOI18N
                        logger.output( NbBundle.getMessage(MergeAction.class,"MSG_NOTHING_TO_MERGE")); // NOI18N
                        logger.outputInRed( NbBundle.getMessage(MergeAction.class, "MSG_MERGE_DONE")); // NOI18N
                        logger.output(""); // NOI18N
                        JOptionPane.showMessageDialog(null,
                            NbBundle.getMessage(MergeAction.class,"MSG_NOTHING_TO_MERGE"),// NOI18N
                            NbBundle.getMessage(MergeAction.class,"MSG_MERGE_TITLE"),// NOI18N

                        }
                        revStr = mergeDlg.getSelectionRevision();               
                    }
                    logger.outputInRed(
                            NbBundle.getMessage(MergeAction.class, "MSG_MERGE_TITLE")); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(MergeAction.class, "MSG_MERGE_TITLE_SEP")); // NOI18N
                    doMergeAction(root, revStr, logger);
                    HgUtils.forceStatusRefreshProject(context);
                    logger.output(""); // NOI18N
                } catch (HgException ex) {
                    NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
                    DialogDisplayer.getDefault().notifyLater(e);

        support.start(rp, repository, NbBundle.getMessage(MergeAction.class, "MSG_MERGE_PROGRESS")); // NOI18N
    }

    public static boolean doMergeAction(File root, String revStr, OutputLogger logger) throws HgException {
        List<String> listMerge = HgCommand.doMerge(root, revStr);
        Boolean bConflicts = false;
        Boolean bMergeFailed = false;
        
        if (listMerge != null && !listMerge.isEmpty()) {
            logger.output(listMerge);
            for (String line : listMerge) {
                if (HgCommand.isMergeAbortUncommittedMsg(line)){ 
                    bMergeFailed = true;
                    logger.outputInRed(NbBundle.getMessage(MergeAction.class,
                            "MSG_MERGE_FAILED")); // NOI18N
                    JOptionPane.showMessageDialog(null,
                        NbBundle.getMessage(MergeAction.class,"MSG_MERGE_UNCOMMITTED"), // NOI18N


                if (HgCommand.isMergeAbortMultipleHeadsMsg(line)){ 
                    bMergeFailed = true;
                    logger.outputInRed(NbBundle.getMessage(MergeAction.class,
                            "MSG_MERGE_FAILED")); // NOI18N
                    break;
                }

                    }else{
                        filepath = line.substring(HgCommand.HG_MERGE_CONFLICT_ERR.length());
                    }
                    logger.outputInRed(NbBundle.getMessage(MergeAction.class, "MSG_MERGE_CONFLICT", filepath)); // NOI18N
                    HgCommand.createConflictFile(filepath);
                }
                

                                NbBundle.getMessage(MergeAction.class, "MSG_MERGE_UNAVAILABLE"), // NOI18N
                                NbBundle.getMessage(MergeAction.class, "MSG_MERGE_TITLE"), // NOI18N
                                JOptionPane.WARNING_MESSAGE);
                        logger.outputInRed(
                                NbBundle.getMessage(MergeAction.class, "MSG_MERGE_INFO"));// NOI18N            
                        logger.outputLink(
                                NbBundle.getMessage(MergeAction.class, "MSG_MERGE_INFO_URL")); // NOI18N 
                }            
            }
                  
            if (bConflicts) {
                logger.outputInRed(NbBundle.getMessage(MergeAction.class, 
                        "MSG_MERGE_DONE_CONFLICTS")); // NOI18N
            }
            if (!bMergeFailed && !bConflicts) {
                logger.outputInRed(NbBundle.getMessage(MergeAction.class, 
                        "MSG_MERGE_DONE")); // NOI18N
            }
        }
        return true;
    }
    
    public static void printMergeWarning(List<String> list, OutputLogger logger){
        if(list == null || list.isEmpty() || list.size() <= 1) return;
        
        if (list.size() == 2) {
            logger.outputInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_WARN_NEEDED", list)); // NOI18N
            logger.outputInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_DO_NEEDED")); // NOI18N
        } else {
            logger.outputInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_WARN_MULTIPLE_HEADS", list.size(), list)); // NOI18N
            logger.outputInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_DONE_MULTIPLE_HEADS")); // NOI18N
        }
    }
    
    public static void printMergeWarning(List<String> list){
        if(list == null || list.isEmpty() || list.size() <= 1) return;
        
        if (list.size() == 2) {
            HgUtils.outputMercurialTabInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_WARN_NEEDED", list)); // NOI18N
            HgUtils.outputMercurialTabInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_DO_NEEDED")); // NOI18N
        } else {
            HgUtils.outputMercurialTabInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_WARN_MULTIPLE_HEADS", list.size(), list)); // NOI18N
            HgUtils.outputMercurialTabInRed(NbBundle.getMessage(MergeAction.class, 
                    "MSG_MERGE_DONE_MULTIPLE_HEADS")); // NOI18N
        }
    }




import org.netbeans.modules.mercurial.ui.view.*;
import org.netbeans.modules.versioning.spi.VCSContext;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.util.HgCommand;
import org.netbeans.modules.mercurial.util.HgUtils;

        
        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);
        HgProgressSupport support = new HgProgressSupport() {
            OutputLogger logger = getLogger();
            public void perform() { performFetch(root, logger); } };

        support.start(rp, root.getAbsolutePath(), org.openide.util.NbBundle.getMessage(FetchAction.class, "MSG_FETCH_PROGRESS")); // NOI18N
    }

    static void performFetch(File root, OutputLogger logger) {
        try {
            logger.outputInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_TITLE")); // NOI18N
            logger.outputInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_TITLE_SEP")); // NOI18N
            
            logger.outputInRed(NbBundle.getMessage(FetchAction.class, 
                    "MSG_FETCH_LAUNCH_INFO", root.getAbsolutePath())); // NOI18N
            
            List<String> list;
            list = HgCommand.doFetch(root, logger);
            
            if (list != null && !list.isEmpty()) {
                logger.output(HgUtils.replaceHttpPassword(list));
            }
        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        }finally{
            logger.outputInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_DONE")); // NOI18N
            logger.output(""); // NOI18N
        }
    }





import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.ui.merge.MergeAction;
import org.netbeans.modules.mercurial.ui.actions.ContextAction;
import org.netbeans.modules.mercurial.util.HgCommand;

    public void performAction(ActionEvent e) {
        final File root = HgUtils.getRootFile(context);
        if (root == null) {
            OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed( NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE_SEP")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(PullAction.class, "MSG_PULL_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
            logger.output(""); // NOI18N
            JOptionPane.showMessageDialog(null,
                    NbBundle.getMessage(PullAction.class, "MSG_PULL_NOT_SUPPORTED_INVIEW"),// NOI18N
                    NbBundle.getMessage(PullAction.class, "MSG_PULL_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N
                    JOptionPane.INFORMATION_MESSAGE);
            logger.closeLog();
            return;
        }
        pull(context);
    }

    public static boolean confirmWithLocalChanges(File rootFile, Class bundleLocation, String title, String query, 
            List<String> listIncoming, OutputLogger logger) {
        FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();
        File[] roots = new File[1];
        roots[0] = rootFile;

        }

        if (listIncomingAndLocalMod != null && listIncomingAndLocalMod.size() > 0) {
            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_OVERWRITE_LOCAL")); // NOI18N
            logger.output(listIncomingAndLocalMod);
            int response = JOptionPane.showOptionDialog(null, 
                    NbBundle.getMessage(bundleLocation, query), NbBundle.getMessage(bundleLocation, title), 
                    JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);


        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() { getDefaultAndPerformPull(ctx, root, this.getLogger()); } };

        support.start(rp, repository, org.openide.util.NbBundle.getMessage(PullAction.class, "MSG_PULL_PROGRESS")); // NOI18N
    }

        return HgUtils.getRootFile(context) != null;
    }

    static void getDefaultAndPerformPull(VCSContext ctx, File root, OutputLogger logger) {
        final String pullPath = HgCommand.getPullDefault(root);
        // If the repository has no default pull path then inform user
        if(pullPath == null) {
            logger.outputInRed( NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE_SEP")); // NOI18N
            logger.output(NbBundle.getMessage(PullAction.class, "MSG_NO_DEFAULT_PULL_SET_MSG")); // NOI18N
            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_DONE")); // NOI18N
            logger.output(""); // NOI18N
            JOptionPane.showMessageDialog(null,
                NbBundle.getMessage(PullAction.class,"MSG_NO_DEFAULT_PULL_SET"),
                NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE"),

        final String fromPrjName = HgProjectUtils.getProjectName(new File(pullPath));
        Project proj = HgUtils.getProject(ctx);
        final String toPrjName = HgProjectUtils.getProjectName(proj);
        performPull(fromPrjName != null ? PullType.LOCAL : PullType.OTHER, ctx, root, pullPath, fromPrjName, toPrjName, logger);
    }

    static void performPull(PullType type, VCSContext ctx, File root, String pullPath, String fromPrjName, String toPrjName, OutputLogger logger) {
        if(root == null || pullPath == null) return;
        File bundleFile = null; 
        
        try {
            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_TITLE")); // NOI18N
            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_TITLE_SEP")); // NOI18N
            
            List<String> listIncoming;
            if(type == PullType.LOCAL){
                listIncoming = HgCommand.doIncoming(root, logger);
            }else{
                for (int i = 0; i < 10000; i++) {
                    if (!new File(root.getParentFile(), root.getName() + "_bundle" + i).exists()) { // NOI18N

                        break;
                    }
                }
                listIncoming = HgCommand.doIncoming(root, pullPath, bundleFile, logger);
            }
            if (listIncoming == null || listIncoming.isEmpty()) return;
            
            boolean bNoChanges = HgCommand.isNoChanges(listIncoming.get(listIncoming.size() - 1));

            // Warn User when there are Local Changes present that Pull will overwrite
            if (!bNoChanges && !confirmWithLocalChanges(root, PullAction.class, "MSG_PULL_LOCALMODS_CONFIRM_TITLE", "MSG_PULL_LOCALMODS_CONFIRM_QUERY", listIncoming, logger)) { // NOI18N
                logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_LOCALMODS_CANCEL")); // NOI18N
                logger.output(""); // NOI18N
                return;
            }


                list = listIncoming;
            } else {
                if(type == PullType.LOCAL){
                    list = HgCommand.doPull(root, logger);
                }else{
                    list = HgCommand.doUnbundle(root, bundleFile, logger);
                }
            }            
                       

                    annotateChangeSets(HgUtils.replaceHttpPassword(listIncoming), PullAction.class, "MSG_CHANGESETS_TO_PULL"); // NOI18N
                }

                logger.output(HgUtils.replaceHttpPassword(list));
                if (fromPrjName != null) {
                    logger.outputInRed(NbBundle.getMessage(
                            PullAction.class, "MSG_PULL_FROM", fromPrjName, HgUtils.stripDoubleSlash(HgUtils.replaceHttpPassword(pullPath)))); // NOI18N
                } else {
                    logger.outputInRed(NbBundle.getMessage(
                            PullAction.class, "MSG_PULL_FROM_NONAME", HgUtils.stripDoubleSlash(HgUtils.replaceHttpPassword(pullPath)))); // NOI18N
                }
                if (toPrjName != null) {
                    logger.outputInRed(NbBundle.getMessage(
                            PullAction.class, "MSG_PULL_TO", toPrjName, root)); // NOI18N
                } else {
                    logger.outputInRed(NbBundle.getMessage(
                            PullAction.class, "MSG_PULL_TO_NONAME", root)); // NOI18N
                }


                    }
                }
                if (bConfirmMerge) {
                    logger.output(""); // NOI18N
                    logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_MERGE_DO")); // NOI18N
                    MergeAction.doMergeAction(root, null, logger);
                } else {
                    List<String> headRevList = HgCommand.getHeadRevisions(root);
                    if (headRevList != null && headRevList.size() > 1){
                        MergeAction.printMergeWarning(headRevList, logger);
                    }
                }
            }

            if (bundleFile != null) {
                bundleFile.delete();
            }
            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_DONE")); // NOI18N
            logger.output(""); // NOI18N
        }
    }
}

Lines 126-132 public class PullOtherAction extends Con Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/pull/PullOtherAction.java (-1 / +1 lines)
126	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);	126	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);
127	HgProgressSupport support = new HgProgressSupport() {	127	HgProgressSupport support = new HgProgressSupport() {
128	public void perform() {	128	public void perform() {
129	PullAction.performPull(PullAction.PullType.OTHER, ctx, root, pullPath, fromPrjName, toPrjName); } };	129	PullAction.performPull(PullAction.PullType.OTHER, ctx, root, pullPath, fromPrjName, toPrjName, this.getLogger()); } };
130		130
131	support.start(rp, repository,	131	support.start(rp, repository,
132	org.openide.util.NbBundle.getMessage(PullAction.class, "MSG_PULL_PROGRESS")); // NOI18N	132	org.openide.util.NbBundle.getMessage(PullAction.class, "MSG_PULL_PROGRESS")); // NOI18N




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.ui.merge.MergeAction;
import org.netbeans.modules.mercurial.ui.pull.PullAction;
import org.netbeans.modules.mercurial.ui.actions.ContextAction;

    public void performAction(ActionEvent e) {
        final File root = HgUtils.getRootFile(context);
        if (root == null) {
            OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
            logger.outputInRed( NbBundle.getMessage(PushAction.class,"MSG_PUSH_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(PushAction.class,"MSG_PUSH_TITLE_SEP")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(PushAction.class, "MSG_PUSH_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
            logger.output(""); // NOI18N
            JOptionPane.showMessageDialog(null,
                    NbBundle.getMessage(PushAction.class, "MSG_PUSH_NOT_SUPPORTED_INVIEW"),// NOI18N
                    NbBundle.getMessage(PushAction.class, "MSG_PUSH_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N
                    JOptionPane.INFORMATION_MESSAGE);
            logger.closeLog();
            return;
        }



        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() { getDefaultAndPerformPush(ctx, root, this.getLogger()); } };
        support.start(rp, repository, 
                org.openide.util.NbBundle.getMessage(PushAction.class, "MSG_PUSH_PROGRESS")); // NOI18N
        
    }
                
    static void getDefaultAndPerformPush(VCSContext ctx, File root, OutputLogger logger) {
        // If the repository has no default pull path then inform user
        String tmpPushPath = HgRepositoryContextCache.getPushDefault(ctx);
        if(tmpPushPath == null) {
            tmpPushPath = HgRepositoryContextCache.getPullDefault(ctx);
        }
        if(tmpPushPath == null) {
            logger.outputInRed( NbBundle.getMessage(PushAction.class,"MSG_PUSH_TITLE")); // NOI18N
            logger.outputInRed( NbBundle.getMessage(PushAction.class,"MSG_PUSH_TITLE_SEP")); // NOI18N
            logger.output(NbBundle.getMessage(PushAction.class, "MSG_NO_DEFAULT_PUSH_SET_MSG")); // NOI18N
            logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_PUSH_DONE")); // NOI18N
            logger.output(""); // NOI18N
            JOptionPane.showMessageDialog(null,
                NbBundle.getMessage(PushAction.class,"MSG_NO_DEFAULT_PUSH_SET"),
                NbBundle.getMessage(PushAction.class,"MSG_PUSH_TITLE"),

        final String pushPath = tmpPushPath;
        final String fromPrjName = HgProjectUtils.getProjectName(root);
        final String toPrjName = HgProjectUtils.getProjectName(new File(pushPath));
        performPush(root, pushPath, fromPrjName, toPrjName, logger);

    }
    static void performPush(File root, String pushPath, String fromPrjName, String toPrjName, OutputLogger logger) {
        try {
            logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_PUSH_TITLE")); // NOI18N
            logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_PUSH_TITLE_SEP")); // NOI18N

            List<String> listOutgoing = HgCommand.doOutgoing(root, pushPath, logger);
            if ((listOutgoing == null) || listOutgoing.isEmpty()) {
                return;
            }

            if (bLocalPush) {
                // Warn user if there are local changes which Push will overwrite
                if (!bNoChanges && !PullAction.confirmWithLocalChanges(pushFile, PushAction.class,
                        "MSG_PUSH_LOCALMODS_CONFIRM_TITLE", "MSG_PUSH_LOCALMODS_CONFIRM_QUERY", listOutgoing, logger)) { // NOI18N
                    logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_PUSH_LOCALMODS_CANCEL")); // NOI18N
                    logger.output(""); // NOI18N
                    return;
                }
            }

            if (bNoChanges) {
                list = listOutgoing;
            } else {
                list = HgCommand.doPush(root, pushPath, logger);
            }
            if (!list.isEmpty() &&
                    HgCommand.isErrorAbortPush(list.get(list.size() - 1))) {
                logger.output(list);
                logger.output("");
                HgUtils.warningDialog(PushAction.class,
                        "MSG_PUSH_ERROR_TITLE", "MSG_PUSH_ERROR_QUERY"); // NOI18N 
                logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_PUSH_ERROR_CANCELED")); // NOI18N
                return;
            }

            if (list != null && !list.isEmpty()) {

                if (!HgCommand.isNoChanges(listOutgoing.get(listOutgoing.size() - 1))) {
                    logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_CHANGESETS_TO_PUSH")); // NOI18N
                    io.select();
                    OutputWriter out = io.getOut();
                    OutputWriter outRed = io.getErr();
                    outRed.println(NbBundle.getMessage(PushAction.class, "MSG_CHANGESETS_TO_PUSH")); // NOI18N
                    for (String s : listOutgoing) {
                        if (s.indexOf(Mercurial.CHANGESET_STR) == 0) {
                            logger.outputInRed(s);
                        } else if (!s.equals("")) { // NOI18N
                            logger.output(HgUtils.replaceHttpPassword(s));
                        }
                    }
                    logger.output(""); // NOI18N
                    out.close();
                    outRed.close();
                }

                logger.output(HgUtils.replaceHttpPassword(list));

                if (toPrjName == null) { 
                    logger.outputInRed(
                            NbBundle.getMessage(PushAction.class,
                            "MSG_PUSH_TO_NONAME", bLocalPush ? HgUtils.stripDoubleSlash(pushPath) : HgUtils.replaceHttpPassword(pushPath))); // NOI18N
                } else {
                    logger.outputInRed(
                            NbBundle.getMessage(PushAction.class,
                            "MSG_PUSH_TO", toPrjName, bLocalPush ? HgUtils.stripDoubleSlash(pushPath) : HgUtils.replaceHttpPassword(pushPath))); // NOI18N
                }

                if (fromPrjName == null ){
                    logger.outputInRed(
                            NbBundle.getMessage(PushAction.class,
                            "MSG_PUSH_FROM_NONAME", root)); // NOI18N
                } else {
                    logger.outputInRed(
                            NbBundle.getMessage(PushAction.class,
                            "MSG_PUSH_FROM", fromPrjName, root)); // NOI18N
                }

                    }
                    if (bLocalPush) {
                        list = HgCommand.doUpdateAll(pushFile, false, null, false);
                        logger.output(list);
                        if (toPrjName != null) {
                            logger.outputInRed(
                                    NbBundle.getMessage(PushAction.class,
                                    "MSG_PUSH_UPDATE_DONE", toPrjName, HgUtils.stripDoubleSlash(pushPath))); // NOI18N
                        } else {
                            logger.outputInRed(
                                    NbBundle.getMessage(PushAction.class,
                                    "MSG_PUSH_UPDATE_DONE_NONAME", HgUtils.stripDoubleSlash(pushPath))); // NOI18N
                        }

                }

                if (bConfirmMerge) {
                    logger.output(""); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(PushAction.class,
                            "MSG_PUSH_MERGE_DO")); // NOI18N
                    MergeAction.doMergeAction(pushFile, null, logger);
                } else {
                    List<String> headRevList = HgCommand.getHeadRevisions(pushPath);
                    if (headRevList != null && headRevList.size() > 1) {
                        MergeAction.printMergeWarning(headRevList, logger);
                    }
                }
            }

            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            logger.outputInRed(NbBundle.getMessage(PushAction.class, "MSG_PUSH_DONE")); // NOI18N
            logger.output(""); // NOI18N
        }
    }
    

Lines 127-133 public class PushOtherAction extends Con Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/push/PushOtherAction.java (-1 / +1 lines)
127	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);	127	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);
128	HgProgressSupport support = new HgProgressSupport() {	128	HgProgressSupport support = new HgProgressSupport() {
129	public void perform() {	129	public void perform() {
130	PushAction.performPush(root, pushPath, fromPrjName, toPrjName);	130	PushAction.performPush(root, pushPath, fromPrjName, toPrjName, this.getLogger());
131	}	131	}
132	};	132	};
133		133




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgCommand;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.FileStatusCache;

        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                
                OutputLogger logger = getLogger();
                try {
                    logger.outputInRed(
                                NbBundle.getMessage(BackoutAction.class,
                                "MSG_BACKOUT_TITLE")); // NOI18N
                    logger.outputInRed(
                                NbBundle.getMessage(BackoutAction.class,
                                "MSG_BACKOUT_TITLE_SEP")); // NOI18N
                    logger.output(
                                NbBundle.getMessage(BackoutAction.class,
                                "MSG_BACKOUT_INFO_SEP", revStr, root.getAbsolutePath())); // NOI18N
                    List<String> list = HgCommand.doBackout(root, revStr, doMerge, commitMsgStr, logger);
                    
                    if(list != null && !list.isEmpty()){ 
                        boolean bMergeNeededDueToBackout = HgCommand.isBackoutMergeNeededMsg(list.get(list.size() - 1));

                            list.remove(list.size() - 1);
                            list.remove(list.size() - 1);
                        }
                        logger.output(list);                            
                        
                        if(HgCommand.isUncommittedChangesBackout(list.get(0))){
                            logger.outputInRed(
                                    NbBundle.getMessage(BackoutAction.class,
                                    "MSG_UNCOMMITTED_CHANGES_BACKOUT"));     // NOI18N           
                            return;
                        } else if(HgCommand.isMergeChangesetBackout(list.get(0))){
                            logger.outputInRed(
                                    NbBundle.getMessage(BackoutAction.class,
                                    "MSG_MERGE_CSET_BACKOUT",revStr));     // NOI18N        
                            return;
                        } else if(HgCommand.isNoRevStrip(list.get(0))){
                            logger.outputInRed(
                                    NbBundle.getMessage(BackoutAction.class,
                                    "MSG_NO_REV_BACKOUT",revStr));     // NOI18N        
                            return;

                                    BackoutAction.class, "MSG_BACKOUT_MERGE_CONFIRM_TITLE", "MSG_BACKOUT_MERGE_CONFIRM_QUERY"); // NOI18N
                        }
                        if (bConfirmMerge) {
                            logger.output(""); // NOI18N
                            logger.outputInRed(NbBundle.getMessage(BackoutAction.class, "MSG_BACKOUT_MERGE_DO")); // NOI18N
                            MergeAction.doMergeAction(root, null, logger);
                        } else {
                            List<String> headRevList = HgCommand.getHeadRevisions(root);
                            if (headRevList != null && headRevList.size() > 1) {
                                MergeAction.printMergeWarning(headRevList, logger);
                            }
                        }  
                        HgUtils.forceStatusRefreshProject(ctx);

                    NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
                    DialogDisplayer.getDefault().notifyLater(e);
                } finally {
                    logger.outputInRed(
                                NbBundle.getMessage(BackoutAction.class,
                                "MSG_BACKOUT_DONE")); // NOI18N
                    logger.output(""); // NOI18N
                }
            }
        };




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgCommand;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.FileStatusCache;

        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                
                OutputLogger logger = getLogger();
                try {
                    logger.outputInRed(
                                NbBundle.getMessage(RollbackAction.class,
                                "MSG_ROLLBACK_TITLE")); // NOI18N
                    logger.outputInRed(
                                NbBundle.getMessage(RollbackAction.class,
                                "MSG_ROLLBACK_TITLE_SEP")); // NOI18N
                    logger.output(
                                NbBundle.getMessage(StripAction.class,
                                "MSG_ROLLBACK_INFO_SEP", root.getAbsolutePath())); // NOI18N
                    int response = JOptionPane.showOptionDialog(null,

                            JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);

                    if (response == JOptionPane.NO_OPTION) {
                        logger.outputInRed(
                                NbBundle.getMessage(RollbackAction.class,
                                "MSG_ROLLBACK_CANCELED", root.getAbsolutePath())); // NOI18N
                        return;
                    }
                    List<String> list = HgCommand.doRollback(root, logger);
                    
                    
                    if(list != null && !list.isEmpty()){                      
                        //logger.clearOutput();
                        
                        if(HgCommand.isNoRollbackPossible(list.get(0))){
                            logger.output(
                                    NbBundle.getMessage(RollbackAction.class,
                                    "MSG_NO_ROLLBACK"));     // NOI18N                       
                        }else{
                            logger.output(list.get(0));
                            if (HgCommand.hasHistory(root)) {
                                response = JOptionPane.showOptionDialog(null,
                                        NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE_QUERY") ,  // NOI18N

                                        JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,null, null, null);
                            
                                if( response == JOptionPane.YES_OPTION){
                                    logger.output(
                                            NbBundle.getMessage(RollbackAction.class,
                                            "MSG_ROLLBACK_FORCE_UPDATE", root.getAbsolutePath())); // NOI18N
                                    list = HgCommand.doUpdateAll(root, true, null);

                                    Mercurial.getInstance().changesetChanged(root);

                                    if (list != null && !list.isEmpty()){
                                        logger.output(list);
                                    }
                                } else {
                                    HgUtils.forceStatusRefreshProject(ctx);

                            
                            }
                        }
                        logger.outputInRed(
                                    NbBundle.getMessage(RollbackAction.class,
                                    "MSG_ROLLBACK_INFO")); // NOI18N
                    }

                    NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
                    DialogDisplayer.getDefault().notifyLater(e);
                } finally {
                    logger.outputInRed(
                                NbBundle.getMessage(RollbackAction.class,
                                "MSG_ROLLBACK_DONE")); // NOI18N
                    logger.output(""); // NOI18N
                }
            }
        };




import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgCommand;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.FileStatusCache;

        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                
                OutputLogger logger = getLogger();
                try {
                    logger.outputInRed(
                                NbBundle.getMessage(StripAction.class,
                                "MSG_STRIP_TITLE")); // NOI18N
                    logger.outputInRed(
                                NbBundle.getMessage(StripAction.class,
                                "MSG_STRIP_TITLE_SEP")); // NOI18N
                    logger.output(
                                NbBundle.getMessage(StripAction.class,
                                "MSG_STRIP_INFO_SEP", revStr, root.getAbsolutePath())); // NOI18N
                    List<String> list = HgCommand.doStrip(root, revStr, false, doBackup, logger);
                    
                    if(list != null && !list.isEmpty()){                      
                        logger.output(list);
                        
                        if(HgCommand.isNoRevStrip(list.get(0))){
                            logger.outputInRed(
                                    NbBundle.getMessage(StripAction.class,
                                    "MSG_NO_REV_STRIP",revStr));     // NOI18N                       
                        }else if(HgCommand.isLocalChangesStrip(list.get(0))){
                            logger.outputInRed(
                                    NbBundle.getMessage(StripAction.class,
                                    "MSG_LOCAL_CHANGES_STRIP"));     // NOI18N                       
                        }else if(HgCommand.isMultipleHeadsStrip(list.get(0))){
                            logger.outputInRed(
                                    NbBundle.getMessage(StripAction.class,
                                    "MSG_MULTI_HEADS_STRIP"));     // NOI18N                       
                        }else{

                            savingTo = savingTo != null? savingTo.substring(HG_STIP_SAVE_BUNDLE.length()): null;
                            File savingFile = new File(savingTo);
                            if(savingFile != null && savingFile.exists() && savingFile.canRead()){
                                logger.outputInRed(
                                        NbBundle.getMessage(StripAction.class,
                                        "MSG_STRIP_RESTORE_INFO")); // NOI18N                                
                                logger.output(
                                        NbBundle.getMessage(StripAction.class,
                                        "MSG_STRIP_RESTORE_INFO2", savingFile.getAbsoluteFile())); // NOI18N                                
                            }

                    NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
                    DialogDisplayer.getDefault().notifyLater(e);
                } finally {
                    logger.outputInRed(
                                NbBundle.getMessage(StripAction.class,
                                "MSG_STRIP_DONE")); // NOI18N
                    logger.output(""); // NOI18N
                }
            }
        };




import java.awt.event.ActionEvent;
import org.netbeans.modules.versioning.spi.VCSContext;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.FileStatusCache;
import org.netbeans.modules.mercurial.FileInformation;
import org.netbeans.modules.mercurial.util.HgUtils;

        RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);
        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                performRevert(repository, revStr, files, doBackup, this.getLogger());
            }
        };
        support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(UpdateAction.class, "MSG_Revert_Progress")); // NOI18N

        return;
    }

    public static void performRevert(File repository, String revStr, File file, boolean doBackup, OutputLogger logger) {
        List<File> revertFiles = new ArrayList<File>();
        revertFiles.add(file);        

        performRevert(repository, revStr, revertFiles, doBackup, logger);
    }
    
    public static void performRevert(File repository, String revStr, File[] files, boolean doBackup, OutputLogger logger) {
        List<File> revertFiles = new ArrayList<File>();
        for (File file : files) {
            revertFiles.add(file);
        }
        performRevert(repository, revStr, revertFiles, doBackup, logger);
    }
    
    public static void performRevert(File repository, String revStr, List<File> revertFiles, boolean doBackup, OutputLogger logger) {
        try{
            logger.outputInRed(
                    NbBundle.getMessage(RevertModificationsAction.class,
                    "MSG_REVERT_TITLE")); // NOI18N
            logger.outputInRed(
                    NbBundle.getMessage(RevertModificationsAction.class,
                    "MSG_REVERT_TITLE_SEP")); // NOI18N
            
            // No revisions to revert too
            if (NbBundle.getMessage(RevertModificationsAction.class,
                    "MSG_Revision_Default").startsWith(revStr)) {
                logger.output(
                        NbBundle.getMessage(RevertModificationsAction.class,
                        "MSG_REVERT_NOTHING")); // NOI18N
                logger.outputInRed(
                        NbBundle.getMessage(RevertModificationsAction.class,
                        "MSG_REVERT_DONE")); // NOI18N
                logger.outputInRed(""); // NOI18N
                return;
            }
            
            logger.output(
                    NbBundle.getMessage(RevertModificationsAction.class,
                    "MSG_REVERT_REVISION_STR", revStr)); // NOI18N
            for (File file : revertFiles) {
                logger.output(file.getAbsolutePath());
            }
            logger.output(""); // NOI18N

            HgCommand.doRevert(repository, revertFiles, revStr, doBackup, logger);
            FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();
            File[] conflictFiles = cache.listFiles(revertFiles.toArray(new File[0]), FileInformation.STATUS_VERSIONED_CONFLICT);
            if (conflictFiles.length != 0) {

            rootObj.getFileSystem().refresh(true);
        } catch (java.lang.Exception exc) {
        }
        logger.outputInRed(
                NbBundle.getMessage(RevertModificationsAction.class,
                "MSG_REVERT_DONE")); // NOI18N
        logger.outputInRed(""); // NOI18N
 
    }





import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.util.HgUtils;
import org.netbeans.modules.mercurial.ui.actions.ContextAction;
import org.netbeans.modules.versioning.spi.VCSContext;

        HgProgressSupport support = new HgProgressSupport() {
            public void perform() {
                boolean bNoUpdates = true;
                OutputLogger logger = getLogger();
                try {
                    logger.outputInRed(
                            NbBundle.getMessage(UpdateAction.class,
                            "MSG_UPDATE_TITLE")); // NOI18N
                    logger.outputInRed(
                            NbBundle.getMessage(UpdateAction.class,
                            "MSG_UPDATE_TITLE_SEP")); // NOI18N
                    logger.output(
                                NbBundle.getMessage(UpdateAction.class,
                                "MSG_UPDATE_INFO_SEP", revStr, root.getAbsolutePath())); // NOI18N
                    List<String> list = HgCommand.doUpdateAll(root, doForcedUpdate, revStr);
                    
                    if (list != null && !list.isEmpty()){
                        bNoUpdates = HgCommand.isNoUpdates(list.get(0));
                        //logger.clearOutput();
                        logger.output(list);
                        logger.output(""); // NOI18N
                    }  
                    // refresh filesystem to take account of changes
                    FileObject rootObj = FileUtil.toFileObject(root);

                if(!bNoUpdates)
                    HgUtils.forceStatusRefreshProject(ctx);

                logger.outputInRed(
                        NbBundle.getMessage(UpdateAction.class,
                        "MSG_UPDATE_DONE")); // NOI18N
                logger.output(""); // NOI18N
            }
        };
        support.start(rp, repository, org.openide.util.NbBundle.getMessage(UpdateAction.class, "MSG_Update_Progress")); // NOI18N





import org.netbeans.modules.versioning.spi.VCSContext;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.util.HgCommand;
import org.netbeans.modules.mercurial.util.HgUtils;

    }

    static void performView(File root) {
        OutputLogger logger = OutputLogger.getLogger(root.getAbsolutePath());
        try {
            logger.outputInRed(NbBundle.getMessage(ViewAction.class, "MSG_VIEW_TITLE")); // NOI18N
            logger.outputInRed(NbBundle.getMessage(ViewAction.class, "MSG_VIEW_TITLE_SEP")); // NOI18N

            String hgkCommand = HgCommand.HGK_COMMAND;
            if(Utilities.isWindows()){ 

                            HgConfigFiles.HG_EXTENSIONS, HgConfigFiles.HG_EXTENSIONS_HGK);
            
            if(!bHgkFound){
                logger.outputInRed(
                            NbBundle.getMessage(ViewAction.class, "MSG_VIEW_HGK_NOT_FOUND_INFO")); // NOI18N
                logger.output(""); // NOI18N
                JOptionPane.showMessageDialog(null,
                        NbBundle.getMessage(ViewAction.class, "MSG_VIEW_HGK_NOT_FOUND"),// NOI18N
                        NbBundle.getMessage(ViewAction.class, "MSG_VIEW_HGK_NOT_FOUND_TITLE"),// NOI18N
                        JOptionPane.INFORMATION_MESSAGE);
                logger.closeLog();
                return;
            }
            if(!bHgkPropExists){

                        ViewAction.class, "MSG_VIEW_SETHGK_PROP_CONFIRM_TITLE", // NOI18N
                        "MSG_VIEW_SETHGK_PROP_CONFIRM_QUERY"); // NOI18N                
                if (bConfirmSetHgkProp) {
                    logger.outputInRed(
                            NbBundle.getMessage(ViewAction.class, "MSG_VIEW_SETHGK_PROP_DO_INFO")); // NOI18N
                    HgConfigFiles.getInstance().setProperty(HgConfigFiles.HG_EXTENSIONS_HGK, ""); // NOI18N
                }else{
                    logger.outputInRed(
                            NbBundle.getMessage(ViewAction.class, "MSG_VIEW_NOTSETHGK_PROP_INFO")); // NOI18N
                    logger.output(""); // NOI18N
                    logger.closeLog();
                    return;
                }
            }
            
            logger.outputInRed(NbBundle.getMessage(ViewAction.class, 
                    "MSG_VIEW_LAUNCH_INFO", root.getAbsolutePath())); // NOI18N
            logger.output(""); // NOI18N
            HgCommand.doView(root, logger);
            logger.closeLog();
        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);




import org.netbeans.modules.mercurial.FileStatus;
import org.netbeans.modules.mercurial.HgException;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.OutputLogger;
import org.netbeans.api.queries.SharabilityQuery;
import org.netbeans.modules.mercurial.HgModuleConfig;
import org.netbeans.modules.mercurial.config.HgConfigFiles;

     * @return hg update output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doRollback(File repository, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> command = new ArrayList<String>();



        List<String> list = exec(command);
        if (list.isEmpty())
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_ROLLBACK_FAILED"), logger);
        
        return list;
    }
    public static List<String> doBackout(File repository, String revision, 
            boolean doMerge, String commitMsg, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> env = new ArrayList<String>();
        List<String> command = new ArrayList<String>();

            list = exec(command);            
        }
        if (list.isEmpty())
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_BACKOUT_FAILED"), logger);
        
        return list;
    }
    
    public static List<String> doStrip(File repository, String revision, 
            boolean doForceMultiHead, boolean doBackup, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> command = new ArrayList<String>();



        List<String> list = exec(command);
        if (list.isEmpty())
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_STRIP_FAILED"), logger);
        
        return list;
    }

     * @return hg pull output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doPull(File repository, OutputLogger logger) throws HgException {
        return doPull(repository, null, logger);
    }

    /**

     * @return hg pull output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doPull(File repository, String from, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> command = new ArrayList<String>();



        List<String> list;
        String defaultPull = new HgConfigFiles(repository).getDefaultPull(false);
        String proxy = getGlobalProxyIfNeeded(defaultPull, true, logger);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);


        if (!list.isEmpty() && 
             isErrorAbort(list.get(list.size() -1))) {
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
        }
        return list;
    }

     * @return hg unbundle output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doUnbundle(File repository, File bundle, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> command = new ArrayList<String>();


        List<String> list = exec(command);
        if (!list.isEmpty() && 
             isErrorAbort(list.get(list.size() -1))) {
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
        }
        return list;
    }

     * @return hg incoming output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doIncoming(File repository, OutputLogger logger) throws HgException {
        return doIncoming(repository, null, null, logger);
    }

    /**

     * @return hg incoming output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doIncoming(File repository, String from, File bundle, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> command = new ArrayList<String>();



        List<String> list;
        String defaultPull = new HgConfigFiles(repository).getDefaultPull(false);
        String proxy = getGlobalProxyIfNeeded(defaultPull, false, null);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);


        if (!list.isEmpty() && 
             isErrorAbort(list.get(list.size() -1))) {
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
        }
        return list;
    }

     * @return hg outgoing output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doOutgoing(File repository, String to, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        List<String> command = new ArrayList<String>();



        List<String> list;
        String defaultPush = new HgConfigFiles(repository).getDefaultPush(false);
        String proxy = getGlobalProxyIfNeeded(defaultPush, false, null);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);

        }
        if (!list.isEmpty() && 
             isErrorAbort(list.get(list.size() -1))) {
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
        }
        return list;
    }

     * @return hg push output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doPush(File repository, String to, OutputLogger logger) throws HgException {
        if (repository == null || to == null ) return null;
        List<String> command = new ArrayList<String>();



        List<String> list;
        String defaultPush = new HgConfigFiles(repository).getDefaultPush(false);
        String proxy = getGlobalProxyIfNeeded(defaultPush, true, logger);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);

        if (!list.isEmpty() && 
            !isErrorAbortPush(list.get(list.size() -1)) &&
            isErrorAbort(list.get(list.size() -1))) {
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
        }
        return list;
    }

     * @param File repository of the mercurial repository's root directory
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doView(File repository, OutputLogger logger) throws HgException {
        if (repository == null) return null;
        List<String> command = new ArrayList<String>();
        List<String> env = new ArrayList<String>();

            else if (isErrorHgkNotFound(list.get(0))) {
                throw new HgException(NbBundle.getMessage(HgCommand.class, "MSG_WARN_HGK_NOT_FOUND_TEXT"));
            } else if (isErrorAbort(list.get(list.size() -1))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
            }
        } 
        return list;
    }
    
    private static String getGlobalProxyIfNeeded(String defaultPath, boolean bOutputDetails, OutputLogger logger){
        String proxy = null;
        if(defaultPath != null && 
                (defaultPath.startsWith("http:") || defaultPath.startsWith("https:"))){ // NOI18N

            }
        }
        if(proxy != null && bOutputDetails){
            logger.output(NbBundle.getMessage(HgCommand.class, "MSG_USING_PROXY_INFO", proxy)); // NOI18N
        }
        return proxy;
    }

     * @param File repository of the mercurial repository's root directory
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doFetch(File repository, OutputLogger logger) throws HgException {
        if (repository == null) return null;
        List<String> command = new ArrayList<String>();
        

        
        List<String> list;
        String defaultPull = new HgConfigFiles(repository).getDefaultPull(false);
        String proxy = getGlobalProxyIfNeeded(defaultPull, true, logger);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);


        if (!list.isEmpty()) {
            if (isErrorAbort(list.get(list.size() -1))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
            }
        } 
        return list;

        final List<HgLogMessage> messages = new ArrayList<HgLogMessage>(0);  
        final File root = new File(rootUrl);
        
        OutputLogger logger = OutputLogger.getLogger(rootUrl);
        try {

            List<String> list = new LinkedList<String>();
            list = HgCommand.doIncomingForSearch(root, logger);
            processLogMessages(list, messages);

        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            logger.closeLog();
        }
        
        return messages.toArray(new HgLogMessage[0]);

        final List<HgLogMessage> messages = new ArrayList<HgLogMessage>(0);  
        final File root = new File(rootUrl);
        
        OutputLogger logger = OutputLogger.getLogger(rootUrl);
        try {

            List<String> list = new LinkedList<String>();
            list = HgCommand.doOut(root, logger);
            processLogMessages(list, messages);

        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            logger.closeLog();
        }
        
        return messages.toArray(new HgLogMessage[0]);

        final List<HgLogMessage> messages = new ArrayList<HgLogMessage>(0);  
        final File root = new File(rootUrl);
        
        OutputLogger logger = OutputLogger.getLogger(rootUrl);
        try {
            String headRev = HgCommand.getLastRevision(root, null);
            if (headRev == null) {

            List<String> list = new LinkedList<String>();
            list = HgCommand.doLogForHistory(root, 
                    files != null ? new ArrayList<File>(files) : null,
                    fromRevision, toRevision, headRev, logger);
            processLogMessages(list, messages);
            
        } catch (HgException ex) {
            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
            DialogDisplayer.getDefault().notifyLater(e);
        } finally {
            logger.closeLog();
        }
        
        return messages.toArray(new HgLogMessage[0]);

     * @return List<String> list of the log entries for the specified file.
     * @throws org.netbeans.modules.mercurial.HgException
     */
     public static List<String> doLogShort(File repository, File file, OutputLogger logger) throws HgException {
        return doLog(repository, file, HG_LOG_TEMPLATE_SHORT_CMD, false, logger);
     }
     
     /**

     * @return List<String> list of the log entries for the specified file.
     * @throws org.netbeans.modules.mercurial.HgException
     */
     public static List<String> doLogLong(File repository, File file, OutputLogger logger) throws HgException {
        return doLog(repository, file, HG_LOG_TEMPLATE_LONG_CMD, false, logger);
     }

     /**

     * @return List<String> list of the log entries for the specified file.
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doLog(File repository, File file, String LOG_TEMPLATE, boolean bDebug, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        
        List<String> command = new ArrayList<String>();

        List<String> list = exec(command);
        if (!list.isEmpty()) {
            if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
             } else if (isErrorAbort(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
             }
        }
        return list;

     * @return List<String> list of the log entries for the specified file.
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doLog(File repository, List<File> files, String LOG_TEMPLATE, boolean bDebug, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        if (files != null && files.isEmpty()) return null;
        

        List<String> list = exec(command);
        if (!list.isEmpty()) {
            if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
             } else if (isErrorAbort(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
             }
        }
        return list;

     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doLogForHistory(File repository, List<File> files, 
            String from, String to, String headRev, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        if (files != null && files.isEmpty()) return null;
        

        List<String> list = exec(command);
        if (!list.isEmpty()) {
            if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
             } else if (isErrorAbort(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
             }
        }
        return list;

     * @return List<String> list of the out entries for the specified repo.
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doOut(File repository, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        
        List<String> command = new ArrayList<String>();


        List<String> list;
        String defaultPush = new HgConfigFiles(repository).getDefaultPush(false);
        String proxy = getGlobalProxyIfNeeded(defaultPush, false, null);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);

            if(isErrorNoDefaultPush(list.get(0))){
                // Ignore
            }else if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
             } else if (isErrorAbort(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
             }
        }
        return list;

     * @return List<String> list of the out entries for the specified repo.
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doIncomingForSearch(File repository, OutputLogger logger) throws HgException {
        if (repository == null ) return null;
        
        List<String> command = new ArrayList<String>();


        List<String> list = exec(command);
        String defaultPull = new HgConfigFiles(repository).getDefaultPull(false);
        String proxy = getGlobalProxyIfNeeded(defaultPull, false, null);
        if(proxy != null){
            List<String> env = new ArrayList<String>(); 
            env.add(HG_PROXY_ENV + proxy);

            if (isErrorNoDefaultPath(list.get(0))) {
            // Ignore
            } else if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
            } else if (isErrorAbort(list.get(0)) || isErrorAbort(list.get(list.size() - 1))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
            }
        }
        return list;

     * @param File outFile to contain the contents of the file
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doCat(File repository, File file, File outFile, OutputLogger logger) throws HgException {
        doCat(repository, file, outFile, "tip", false, logger); //NOI18N
    }
    
    /**

     * @return List<String> list of all the log entries
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doCat(File repository, File file, File outFile, String revision, OutputLogger logger) throws HgException {
        doCat(repository, file, outFile, revision, true, logger); //NOI18N
    }

    public static void doCat(File repository, File file, File outFile, String revision, boolean retry, OutputLogger logger) throws HgException {
        if (repository == null) return;
        if (file == null) return;
        

        
        if (!list.isEmpty()) {
            if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
             } else if (isErrorAbort(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
             }
        }
        if (outFile.length() == 0 && retry) {

            String newRevision = Integer.toString(Integer.parseInt(revision)+1);
            File prevFile = getPreviousName(repository, file, newRevision); 
            if (prevFile != null) {
                doCat(repository, prevFile, outFile, revision, false, logger); //NOI18N
            }
        }
    }

     * @return void
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doCreate(File root, OutputLogger logger) throws HgException {
        if (root == null ) return;
        List<String> command = new ArrayList<String>();
        


        List<String> list = exec(command);
        if (!list.isEmpty())
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_CREATE_FAILED"), logger);
    }
    
    /**

     * @return clone output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doClone(File repository, String target, OutputLogger logger) throws HgException {
        if (repository == null) return null;
        return doClone(repository.getAbsolutePath(), target, logger);
    }
    
    /**

     * @return clone output
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doClone(String repository, String target, OutputLogger logger) throws HgException {
        if (repository == null || target == null) return null;
        
        // Ensure that parent directory of target exists, creating if necessary

        List<String> list = exec(command);
        if (!list.isEmpty()) {
            if (isErrorNoRepository(list.get(0))){
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
            }else if (isErrorNoResponse(list.get(list.size() -1))){
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_RESPONSE_ERR"), logger);
            }else if (isErrorAbort(list.get(list.size() -1))){
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ABORTED"), logger);
            }
        }
        return list;

     * @return void
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doCommit(File repository, List<File> commitFiles, String commitMessage, OutputLogger logger)  throws HgException {
        List<String> command = new ArrayList<String>();

        command.add(getHgCommand());

            
            if (!list.isEmpty()
                    && (isErrorNotTracked(list.get(0)) || isErrorCannotReadCommitMsg(list.get(0))))
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMIT_FAILED"), logger);
            
        }catch (IOException ex){
            throw new HgException(NbBundle.getMessage(HgCommand.class, "MSG_FAILED_TO_READ_COMMIT_MESSAGE"));

     * @return void
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doRename(File repository, File sourceFile, File destFile, OutputLogger logger)  throws HgException {
        doRename(repository, sourceFile, destFile, false, logger);
    }

    private static void doRename(File repository, File sourceFile, File destFile, boolean bAfter, OutputLogger logger)  throws HgException {
        if (repository == null) return;
        
        List<String> command = new ArrayList<String>();

        if (!list.isEmpty() &&
             isErrorAbort(list.get(list.size() -1))) {
            if (!bAfter || !isErrorAbortNoFilesToCopy(list.get(list.size() -1))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_RENAME_FAILED"), logger);
            }
        }
    }

     * @return void
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doRenameAfter(File repository, File sourceFile, File destFile, OutputLogger logger)  throws HgException {
       doRename(repository, sourceFile, destFile, true, logger);
    }
    
    /**

     * @return void
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doAdd(File repository, List<File> addFiles, OutputLogger logger)  throws HgException {
        if (repository == null) return;
        if (addFiles.size() == 0) return;
        List<String> command = new ArrayList<String>();

        }
        List<String> list = exec(command);
        if (!list.isEmpty() && isErrorAlreadyTracked(list.get(0)))
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_ALREADY_TRACKED"), logger);
    }

    /**

     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doRevert(File repository, List<File> revertFiles, 
            String revision, boolean doBackup, OutputLogger logger)  throws HgException {
        if (repository == null) return;
        if (revertFiles.size() == 0) return;
        

        }
        List<String> list = exec(command);
        if (!list.isEmpty() && isErrorNoChangeNeeded(list.get(0)))
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_REVERT_FAILED"), logger);
    }

    /**

     * @return void
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doAdd(File repository, File file, OutputLogger logger)  throws HgException {
        if (repository == null) return;
        if (file == null) return;
        if (file.isDirectory()) return;

        command.add(file.getAbsolutePath());
        List<String> list = exec(command);
        if (!list.isEmpty() && isErrorAlreadyTracked(list.get(0)))
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_ALREADY_TRACKED"), logger);
    }
    
    /**

     * @return List<String> list of the annotated lines of the file
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doAnnotate(File repository, File file, String revision, OutputLogger logger) throws HgException {
        if (repository == null) return null;
        List<String> command = new ArrayList<String>();


        List<String> list = exec(command);
        if (!list.isEmpty()) {
            if (isErrorNoRepository(list.get(0))) {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
            } else if (isErrorNoSuchFile(list.get(0))) {
                // This can happen if we have multiple heads and the wrong
                // one was picked by default hg annotation 
                if (revision == null) {
                    String rev = getLastRevision(repository, file);
                    if (rev != null) {
                        list = doAnnotate(repository, file, rev, logger);
                    } else {
                        list = null;
                    }

        return list;
    }
  
    public static List<String> doAnnotate(File repository, File file, OutputLogger logger) throws HgException {
        return doAnnotate(repository, file, null, logger);
    }

    /**

     * @param f path to be removed from the repository
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static void doRemove(File repository, File f, OutputLogger logger)  throws HgException {
        List<String> command = new ArrayList<String>();

        command.add(getHgCommand());


        List<String> list = exec(command);
        if (!list.isEmpty() && isErrorAlreadyTracked(list.get(0)))
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_ALREADY_TRACKED"), logger);
    }
    
    /**

     * @param outputFileName path of the output file
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doExport(File repository, String revStr, String outputFileName, OutputLogger logger)  throws HgException {
        // Ensure that parent directory of target exists, creating if necessary
        File fileTarget = new File (outputFileName);
        File parentTarget = fileTarget.getParentFile();

        List<String> list = exec(command);
        if (!list.isEmpty() &&
             isErrorAbort(list.get(list.size() -1))) {
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_EXPORT_FAILED"), logger);
        }
        return list;
    }

     * @param File patchFile of the patch file
     * @throws org.netbeans.modules.mercurial.HgException
     */
    public static List<String> doImport(File repository, File patchFile, OutputLogger logger)  throws HgException {
        List<String> command = new ArrayList<String>();

        command.add(getHgCommand());

        List<String> list = exec(command);
        if (!list.isEmpty() &&
             isErrorAbort(list.get(list.size() -1))) {
            logger.output(list); // need the failure info from import
            handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_IMPORT_FAILED"), logger);
        }
        return list;
    }

        }
        
        List<String> list =  exec(command);
        if (!list.isEmpty() && isErrorNoRepository(list.get(0))) {
            OutputLogger logger = OutputLogger.getLogger(repository.getAbsolutePath());
            try {
                handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_NO_REPOSITORY_ERR"), logger);
            } finally {
                logger.closeLog();
            }
        }
        return list;
    }
    /**

            return defaultPath + File.separatorChar + HG_COMMAND;
    }

    private static void handleError(List<String> command, List<String> list, String message, OutputLogger logger) throws HgException{
        if (command != null && list != null){
            Mercurial.LOG.log(Level.WARNING, "command: " + HgUtils.replaceHttpPassword(command)); // NOI18N        
            Mercurial.LOG.log(Level.WARNING, "output: " + HgUtils.replaceHttpPassword(list)); // NOI18N
            logger.outputInRed(NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_ERR")); // NOI18N
            logger.output(NbBundle.getMessage(HgCommand.class, "MSG_COMMAND_INFO_ERR",
                    HgUtils.replaceHttpPassword(command), HgUtils.replaceHttpPassword(list))); // NOI18N
        }





import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Arrays;

import org.openide.windows.OutputEvent;
import org.openide.windows.TopComponent;
import org.netbeans.modules.versioning.spi.VCSContext;
import org.openide.windows.IOProvider;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputWriter;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;

import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.SharabilityQuery;
import org.netbeans.modules.mercurial.HgProgressSupport;
import org.openide.awt.HtmlBrowser;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;
import org.openide.windows.OutputListener;


    private static final String HG_IGNORE_CONFLICT_ANY_FILES = "\\.conflict\\~$"; // NOI18N
    
    private static final String FILENAME_HGIGNORE = ".hgignore"; // NOI18N

    public static final int MAX_LINES_TO_PRINT = 500;

    private static final String MSG_TOO_MANY_LINES = "The number of output lines is greater than 500; see message log for complete output";

    private static HashMap<String, Set<Pattern>> ignorePatterns;


        }
    }


    /**
     * Print contents of list to Mercurial Output Tab
     *
     * @param list to print out
     * 
     */
     public static void outputMercurialTab(List<String> list){
        if( list.isEmpty()) return;

        InputOutput io = IOProvider.getDefault().getIO(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE, false);
        io.select();
        OutputWriter out = io.getOut();
        
        int lines = list.size();
        if (lines > MAX_LINES_TO_PRINT) {
            out.println(list.get(1));
            out.println(list.get(2));
            out.println(list.get(3));
            out.println("...");
            out.println(list.get(list.size() -1));
            out.println(MSG_TOO_MANY_LINES);
            for (String s : list){
                Mercurial.LOG.log(Level.WARNING, s);
            }
        } else {
            for (String s : list){
                out.println(s);

            }
        }
        out.close();
    }

     /**
     * Print msg to Mercurial Output Tab
     *
     * @param String msg to print out
     * 
     */
     public static void outputMercurialTab(String msg){
        if( msg == null) return;

        InputOutput io = IOProvider.getDefault().getIO(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE, false);
        io.select();
        OutputWriter out = io.getOut();
        
        out.println(msg);
        out.close();
    }

    /**
     * Print msg to Mercurial Output Tab in Red
     *
     * @param String msg to print out
     * 
     */
     public static void outputMercurialTabInRed(String msg){
        if( msg == null) return;

        InputOutput io = IOProvider.getDefault().getIO(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE, false);
        io.select();
        OutputWriter out = io.getErr();
        
        out.println(msg);
        out.close();
    }

    /**
     * Print URL to Mercurial Output Tab as an active Hyperlink
     *
     * @param String sURL to print out
     * 
     */
     public static void outputMercurialTabLink(final String sURL){
         if (sURL == null) return;
         
         try {
             InputOutput io = IOProvider.getDefault().getIO(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE, false);
             io.select();
             OutputWriter out = io.getOut();

             OutputListener listener = new OutputListener() {
                         public void outputLineAction(OutputEvent ev) {
                             try {
                                 HtmlBrowser.URLDisplayer.getDefault().showURL(new URL(sURL));
                             } catch (IOException ex) {
                             // Ignore
                             }
                         }
                         public void outputLineSelected(OutputEvent ev) {}
                         public void outputLineCleared(OutputEvent ev) {}
                     };
             out.println(sURL, listener, true);
             out.close();
         } catch (IOException ex) {
         // Ignore
         }
     }

    /**
     * Select and Clear Mercurial Output Tab
     *
     * @param list to print out
     * 
     */
     public static void clearOutputMercurialTab(){
         InputOutput io = IOProvider.getDefault().getIO(
                 Mercurial.MERCURIAL_OUTPUT_TAB_TITLE, false);
         
         io.select();
         OutputWriter out = io.getOut();
         
         try {
             out.reset();
         } catch (IOException ex) {
             // Ignore Exception
         }
         out.close();
    }
     
    /**
     * This utility class should not be instantiated anywhere.
     */

Return to bug 127182

Lines 63-68 public abstract class HgProgressSupport Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/HgProgressSupport.java (-1 / +10 lines)
63	private ProgressHandle progressHandle = null;	63	private ProgressHandle progressHandle = null;
64	private String displayName = ""; // NOI18N	64	private String displayName = ""; // NOI18N
65	private String originalDisplayName = ""; // NOI18N	65	private String originalDisplayName = ""; // NOI18N
		66	private OutputLogger logger;
66	private String repositoryRoot;	67	private String repositoryRoot;
67	private RequestProcessor.Task task;	68	private RequestProcessor.Task task;
68		69
Lines 82-87 public abstract class HgProgressSupport Link Here
82		83
83	public void setRepositoryRoot(String repositoryRoot) {	84	public void setRepositoryRoot(String repositoryRoot) {
84	this.repositoryRoot = repositoryRoot;	85	this.repositoryRoot = repositoryRoot;
		86	logger = null;
85	}	87	}
86		88
87	public void run() {	89	public void run() {
Lines 98-103 public abstract class HgProgressSupport Link Here
98	Mercurial.LOG.log(Level.FINE, "End - {0}", displayName); // NOI18N	100	Mercurial.LOG.log(Level.FINE, "End - {0}", displayName); // NOI18N
99	} finally {	101	} finally {
100	finnishProgress();	102	finnishProgress();
		103	if (logger != null) logger.closeLog();
101	}	104	}
102	}	105	}
103		106
Lines 166-172 public abstract class HgProgressSupport Link Here
166	getProgressHandle().finish();	169	getProgressHandle().finish();
167	}	170	}
168		171
169		172	public OutputLogger getLogger() {
		173	if (logger == null) {
		174	logger = Mercurial.getInstance().getLogger(repositoryRoot);
		175	}
		176	return logger;
		177	}
		178
170	public void annotate(HgException ex) {	179	public void annotate(HgException ex) {
171	ExceptionHandler eh = new ExceptionHandler(ex);	180	ExceptionHandler eh = new ExceptionHandler(ex);
172	if(isCanceled()) {	181	if(isCanceled()) {

Lines 163-184 public class Mercurial { Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/Mercurial.java (-3 / +16 lines)
163	NbBundle.getMessage(Mercurial.class, "MSG_VERSION_CONFIRM_QUERY", version), // NOI18N	163	NbBundle.getMessage(Mercurial.class, "MSG_VERSION_CONFIRM_QUERY", version), // NOI18N
164	NbBundle.getMessage(Mercurial.class, "MSG_VERSION_CONFIRM"), // NOI18N	164	NbBundle.getMessage(Mercurial.class, "MSG_VERSION_CONFIRM"), // NOI18N
165	JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);	165	JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);
		166	OutputLogger logger = getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
166	if (response == JOptionPane.YES_OPTION) {	167	if (response == JOptionPane.YES_OPTION) {
167	goodVersion = true;	168	goodVersion = true;
168	prefs.put(HgModuleConfig.PROP_RUN_VERSION, version);	169	prefs.put(HgModuleConfig.PROP_RUN_VERSION, version);
169	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(Mercurial.class, "MSG_USING_VERSION_MSG", version)); // NOI18N);	170	logger.outputInRed(NbBundle.getMessage(Mercurial.class, "MSG_USING_VERSION_MSG", version)); // NOI18N);
170	} else {	171	} else {
171	prefs.remove(HgModuleConfig.PROP_RUN_VERSION);	172	prefs.remove(HgModuleConfig.PROP_RUN_VERSION);
172	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(Mercurial.class, "MSG_NOT_USING_VERSION_MSG", version)); // NOI18N);	173	logger.outputInRed(NbBundle.getMessage(Mercurial.class, "MSG_NOT_USING_VERSION_MSG", version)); // NOI18N);
173	}	174	}
		175	logger.closeLog();
174	} else {	176	} else {
175	goodVersion = true;	177	goodVersion = true;
176	}	178	}
177	} else if (version == null) {	179	} else if (version == null) {
178	Preferences prefs = HgModuleConfig.getDefault().getPreferences();	180	Preferences prefs = HgModuleConfig.getDefault().getPreferences();
179	prefs.remove(HgModuleConfig.PROP_RUN_VERSION);	181	prefs.remove(HgModuleConfig.PROP_RUN_VERSION);
180	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(Mercurial.class, "MSG_VERSION_NONE_OUTPUT_MSG")); // NOI18N);	182	OutputLogger logger = getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
		183	logger.outputInRed(NbBundle.getMessage(Mercurial.class, "MSG_VERSION_NONE_OUTPUT_MSG")); // NOI18N);
181	HgUtils.warningDialog(Mercurial.class, "MSG_VERSION_NONE_TITLE", "MSG_VERSION_NONE_MSG");// NOI18N	184	HgUtils.warningDialog(Mercurial.class, "MSG_VERSION_NONE_TITLE", "MSG_VERSION_NONE_MSG");// NOI18N
		185	logger.closeLog();
182	}	186	}
183	}	187	}
184		188
Lines 362-365 public class Mercurial { Link Here
362	}	366	}
363	}	367	}
364		368
		369	/**
		370	*
		371	* @param repositoryRoot String of Mercurial repository so that logger writes to correct output tab. Can be null
		372	* in which case the logger will not print anything
		373	* @return OutputLogger logger to write to
		374	*/
		375	public OutputLogger getLogger(String repositoryRoot) {
		376	return OutputLogger.getLogger(repositoryRoot);
		377	}
365	}	378	}

Lines 129-135 public class MercurialInterceptor extend Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/MercurialInterceptor.java (-6 / +9 lines)
129	HgProgressSupport support = new HgProgressSupport() {	129	HgProgressSupport support = new HgProgressSupport() {
130	public void perform() {	130	public void perform() {
131	try {	131	try {
132	HgCommand.doRemove(root, file);	132	HgCommand.doRemove(root, file, this.getLogger());
133	// We need to cache the status of all deleted files	133	// We need to cache the status of all deleted files
134	Map<File, FileInformation> interestingFiles = HgCommand.getInterestingStatus(root, file);	134	Map<File, FileInformation> interestingFiles = HgCommand.getInterestingStatus(root, file);
135	if (!interestingFiles.isEmpty()){	135	if (!interestingFiles.isEmpty()){
Lines 173-179 public class MercurialInterceptor extend Link Here
173	HgProgressSupport support = new HgProgressSupport() {	173	HgProgressSupport support = new HgProgressSupport() {
174	public void perform() {	174	public void perform() {
175	try {	175	try {
176	HgCommand.doRemove(root, file);	176	HgCommand.doRemove(root, file, this.getLogger());
177	cache.refresh(file, FileStatusCache.REPOSITORY_STATUS_UNKNOWN);	177	cache.refresh(file, FileStatusCache.REPOSITORY_STATUS_UNKNOWN);
178	} catch (HgException ex) {	178	} catch (HgException ex) {
179	Mercurial.LOG.log(Level.FINE, "fileDeletedImpl(): File: {0} {1}", new Object[] {file.getAbsolutePath(), ex.toString()}); // NOI18N	179	Mercurial.LOG.log(Level.FINE, "fileDeletedImpl(): File: {0} {1}", new Object[] {file.getAbsolutePath(), ex.toString()}); // NOI18N
Lines 245-253 public class MercurialInterceptor extend Link Here
245	srcFile.renameTo(dstFile);	245	srcFile.renameTo(dstFile);
246	Runnable moveImpl = new Runnable() {	246	Runnable moveImpl = new Runnable() {
247	public void run() {	247	public void run() {
		248	OutputLogger logger = OutputLogger.getLogger(root.getAbsolutePath());
248	try {	249	try {
249	if (dstFile.isDirectory()) {	250	if (dstFile.isDirectory()) {
250	HgCommand.doRenameAfter(root, srcFile, dstFile);	251	HgCommand.doRenameAfter(root, srcFile, dstFile, logger);
251	return;	252	return;
252	}	253	}
253	int status = HgCommand.getSingleStatus(root, srcFile.getParent(), srcFile.getName()).getStatus();	254	int status = HgCommand.getSingleStatus(root, srcFile.getParent(), srcFile.getName()).getStatus();
Lines 255-267 public class MercurialInterceptor extend Link Here
255	if (status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY \|\|	256	if (status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY \|\|
256	status == FileInformation.STATUS_NOTVERSIONED_EXCLUDED) {	257	status == FileInformation.STATUS_NOTVERSIONED_EXCLUDED) {
257	} else if (status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) {	258	} else if (status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) {
258	HgCommand.doRemove(root, srcFile);	259	HgCommand.doRemove(root, srcFile, logger);
259	HgCommand.doAdd(root, dstFile);	260	HgCommand.doAdd(root, dstFile, logger);
260	} else {	261	} else {
261	HgCommand.doRenameAfter(root, srcFile, dstFile);	262	HgCommand.doRenameAfter(root, srcFile, dstFile, logger);
262	}	263	}
263	} catch (HgException e) {	264	} catch (HgException e) {
264	Mercurial.LOG.log(Level.FINE, "Mercurial failed to rename: File: {0} {1}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N	265	Mercurial.LOG.log(Level.FINE, "Mercurial failed to rename: File: {0} {1}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N
		266	} finally {
		267	logger.closeLog();
265	}	268	}
266	}	269	}
267	};	270	};

Lines 55-60 import org.netbeans.modules.mercurial.Hg Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/clone/CloneAction.java (-14 / +17 lines)
55	import org.netbeans.modules.mercurial.HgException;	55	import org.netbeans.modules.mercurial.HgException;
56	import org.netbeans.modules.mercurial.HgProgressSupport;	56	import org.netbeans.modules.mercurial.HgProgressSupport;
57	import org.netbeans.modules.mercurial.Mercurial;	57	import org.netbeans.modules.mercurial.Mercurial;
		58	import org.netbeans.modules.mercurial.OutputLogger;
58	import org.netbeans.modules.mercurial.HgModuleConfig;	59	import org.netbeans.modules.mercurial.HgModuleConfig;
59	import org.netbeans.modules.mercurial.config.HgConfigFiles;	60	import org.netbeans.modules.mercurial.config.HgConfigFiles;
60	import org.netbeans.modules.mercurial.util.HgCommand;	61	import org.netbeans.modules.mercurial.util.HgCommand;
Lines 144-149 public class CloneAction extends Context Link Here
144	Runnable doOpenProject = new Runnable () {	145	Runnable doOpenProject = new Runnable () {
145	public void run() {	146	public void run() {
146	// Open and set focus on the cloned project if possible	147	// Open and set focus on the cloned project if possible
		148	OutputLogger logger = getLogger();
147	try {	149	try {
148	FileObject cloneProj = FileUtil.toFileObject(clonePrjFile);	150	FileObject cloneProj = FileUtil.toFileObject(clonePrjFile);
149	Project prj = null;	151	Project prj = null;
Lines 154-160 public class CloneAction extends Context Link Here
154	hg.versionedFilesChanged();	156	hg.versionedFilesChanged();
155	hg.refreshAllAnnotations();	157	hg.refreshAllAnnotations();
156	}else{	158	}else{
157	HgUtils.outputMercurialTabInRed( NbBundle.getMessage(CloneAction.class,	159	logger.outputInRed( NbBundle.getMessage(CloneAction.class,
158	"MSG_EXTERNAL_CLONE_PRJ_NOT_FOUND_CANT_SETASMAIN")); // NOI18N	160	"MSG_EXTERNAL_CLONE_PRJ_NOT_FOUND_CANT_SETASMAIN")); // NOI18N
159	}	161	}
160		162
Lines 162-204 public class CloneAction extends Context Link Here
162	NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(new HgException(ex.toString()));	164	NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(new HgException(ex.toString()));
163	DialogDisplayer.getDefault().notifyLater(e);	165	DialogDisplayer.getDefault().notifyLater(e);
164	} finally{	166	} finally{
165	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(CloneAction.class, "MSG_CLONE_DONE")); // NOI18N	167	logger.outputInRed(NbBundle.getMessage(CloneAction.class, "MSG_CLONE_DONE")); // NOI18N
166	HgUtils.outputMercurialTab(""); // NOI18N	168	logger.output(""); // NOI18N
167	}	169	}
168	}	170	}
169	};	171	};
170	public void perform() {	172	public void perform() {
		173	OutputLogger logger = getLogger();
171	try {	174	try {
172	// TODO: We need to annotate the cloned project	175	// TODO: We need to annotate the cloned project
173	// See http://qa.netbeans.org/issues/show_bug.cgi?id=112870	176	// See http://qa.netbeans.org/issues/show_bug.cgi?id=112870
174	HgUtils.outputMercurialTabInRed(	177	logger.outputInRed(
175	NbBundle.getMessage(CloneAction.class,	178	NbBundle.getMessage(CloneAction.class,
176	"MSG_CLONE_TITLE")); // NOI18N	179	"MSG_CLONE_TITLE")); // NOI18N
177	HgUtils.outputMercurialTabInRed(	180	logger.outputInRed(
178	NbBundle.getMessage(CloneAction.class,	181	NbBundle.getMessage(CloneAction.class,
179	"MSG_CLONE_TITLE_SEP")); // NOI18N	182	"MSG_CLONE_TITLE_SEP")); // NOI18N
180	List<String> list = HgCommand.doClone(source, target);	183	List<String> list = HgCommand.doClone(source, target, logger);
181	if(list != null && !list.isEmpty()){	184	if(list != null && !list.isEmpty()){
182	HgUtils.createIgnored(cloneFolder);	185	HgUtils.createIgnored(cloneFolder);
183	HgUtils.outputMercurialTab(list);	186	logger.output(list);
184		187
185	if (prjName != null) {	188	if (prjName != null) {
186	HgUtils.outputMercurialTabInRed(	189	logger.outputInRed(
187	NbBundle.getMessage(CloneAction.class,	190	NbBundle.getMessage(CloneAction.class,
188	"MSG_CLONE_FROM", prjName, source)); // NOI18N	191	"MSG_CLONE_FROM", prjName, source)); // NOI18N
189	HgUtils.outputMercurialTabInRed(	192	logger.outputInRed(
190	NbBundle.getMessage(CloneAction.class,	193	NbBundle.getMessage(CloneAction.class,
191	"MSG_CLONE_TO", prjName, target)); // NOI18N	194	"MSG_CLONE_TO", prjName, target)); // NOI18N
192	} else {	195	} else {
193	HgUtils.outputMercurialTabInRed(	196	logger.outputInRed(
194	NbBundle.getMessage(CloneAction.class,	197	NbBundle.getMessage(CloneAction.class,
195	"MSG_EXTERNAL_CLONE_FROM", source)); // NOI18N	198	"MSG_EXTERNAL_CLONE_FROM", source)); // NOI18N
196	HgUtils.outputMercurialTabInRed(	199	logger.outputInRed(
197	NbBundle.getMessage(CloneAction.class,	200	NbBundle.getMessage(CloneAction.class,
198	"MSG_EXTERNAL_CLONE_TO", target)); // NOI18N	201	"MSG_EXTERNAL_CLONE_TO", target)); // NOI18N
199		202
200	}	203	}
201	HgUtils.outputMercurialTab(""); // NOI18N	204	logger.output(""); // NOI18N
202		205
203	if (isLocalClone){	206	if (isLocalClone){
204	SwingUtilities.invokeLater(doOpenProject);	207	SwingUtilities.invokeLater(doOpenProject);
Lines 231-238 public class CloneAction extends Context Link Here
231	fixLocalPullPushPathsOnWindows(cloneFolder.getAbsolutePath(), defaultPull, defaultPush);	234	fixLocalPullPushPathsOnWindows(cloneFolder.getAbsolutePath(), defaultPull, defaultPush);
232	}	235	}
233	if(!isLocalClone){	236	if(!isLocalClone){
234	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(CloneAction.class, "MSG_CLONE_DONE")); // NOI18N	237	logger.outputInRed(NbBundle.getMessage(CloneAction.class, "MSG_CLONE_DONE")); // NOI18N
235	HgUtils.outputMercurialTab(""); // NOI18N	238	logger.output(""); // NOI18N
236	}	239	}
237	}	240	}
238	}	241	}

Added Link Here

(-)c174e5a9390d (+258 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* Contributor(s):
25	*
26	* The Original Software is NetBeans. The Initial Developer of the Original
27	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28	* Microsystems, Inc. All Rights Reserved.
29	*
30	* If you wish your version of this file to be governed by only the CDDL
31	* or only the GPL Version 2, indicate your decision by adding
32	* "[Contributor] elects to include this software in this distribution
33	* under the [CDDL or GPL Version 2] license." If you do not indicate a
34	* single choice of license, a recipient has the option to distribute
35	* your version of this file under either the CDDL, the GPL Version 2 or
36	* to extend the choice of license to its licensees as provided above.
37	* However, if you add GPL Version 2 code and therefore, elected the GPL
38	* Version 2 license, then the option applies only if the new code is
39	* made subject to such option by the copyright holder.
40	*/
41
42	package org.netbeans.modules.mercurial;
43
44	import java.io.File;
45	import java.io.IOException;
46	import java.util.logging.Level;
47	import java.util.List;
48	import java.net.URL;
49	import org.openide.awt.HtmlBrowser;
50	import org.openide.util.RequestProcessor;
51	import org.openide.windows.IOProvider;
52	import org.openide.windows.InputOutput;
53	import org.openide.windows.OutputEvent;
54	import org.openide.windows.OutputWriter;
55	import org.openide.windows.OutputListener;
56
57	/**
58	*
59	* @author Tomas Stupka
60	*/
61	public class OutputLogger {
62
63	private InputOutput log;
64	private boolean ignoreCommand = false;
65	private String repositoryRootString;
66	private static final RequestProcessor rp = new RequestProcessor("MercurialOutput", 1);
67	public static final int MAX_LINES_TO_PRINT = 500;
68
69	private static final String MSG_TOO_MANY_LINES = "The number of output lines is greater than 500; see message log for complete output";
70
71
72	public static OutputLogger getLogger(String repositoryRoot) {
73	if (repositoryRoot != null) {
74	return new OutputLogger(repositoryRoot);
75	} else {
76	return new NullLogger();
77	}
78	}
79
80	private OutputLogger(String repositoryRoot) {
81	repositoryRootString = repositoryRoot;
82	log = IOProvider.getDefault().getIO(repositoryRootString, false);
83	}
84
85	private OutputLogger() {
86	}
87
88	public void closeLog() {
89	rp.post(new Runnable() {
90	public void run() {
91	log.getOut().flush();
92	log.getOut().close();
93	log.getErr().flush();
94	log.getErr().close();
95	}
96	});
97	}
98
99	public void flushLog() {
100	rp.post(new Runnable() {
101	public void run() {
102	log.getOut().flush();
103	log.getErr().flush();
104	}
105	});
106	}
107
108	/**
109	* Print contents of list to OutputLogger's tab
110	*
111	* @param list to print out
112	*
113	*/
114	public void output(final List<String> list){
115	if( list.isEmpty()) return;
116
117	rp.post(new Runnable() {
118	public void run() {
119	log.select();
120	OutputWriter out = log.getOut();
121
122	int lines = list.size();
123	if (lines > MAX_LINES_TO_PRINT) {
124	out.println(list.get(1));
125	out.println(list.get(2));
126	out.println(list.get(3));
127	out.println("...");
128	out.println(list.get(list.size() -1));
129	out.println(MSG_TOO_MANY_LINES);
130	for (String s : list){
131	Mercurial.LOG.log(Level.WARNING, s);
132	}
133	} else {
134	for (String s : list){
135	out.println(s);
136	}
137	}
138	out.flush();
139	}
140	});
141	}
142
143	/**
144	* Print msg to OutputLogger's tab
145	*
146	* @param String msg to print out
147	*
148	*/
149	public void output(final String msg){
150	if( msg == null) return;
151
152	rp.post(new Runnable() {
153	public void run() {
154	log.select();
155
156	log.getOut().println(msg);
157	log.getOut().flush();
158	}
159	});
160	}
161
162	/**
163	* Print msg to OutputLogger's tab in Red
164	*
165	* @param String msg to print out
166	*
167	*/
168	public void outputInRed(final String msg){
169	if( msg == null) return;
170
171	rp.post(new Runnable() {
172	public void run() {
173	log.select();
174	log.getErr().println(msg);
175	log.getErr().flush();
176	}
177	});
178	}
179
180	/**
181	* Print URL to OutputLogger's tab as an active Hyperlink
182	*
183	* @param String sURL to print out
184	*
185	*/
186	public void outputLink(final String sURL){
187	if (sURL == null) return;
188
189	rp.post(new Runnable() {
190	public void run() {
191	log.select();
192	try {
193	OutputWriter out = log.getOut();
194
195	OutputListener listener = new OutputListener() {
196	public void outputLineAction(OutputEvent ev) {
197	try {
198	HtmlBrowser.URLDisplayer.getDefault().showURL(new URL(sURL));
199	} catch (IOException ex) {
200	// Ignore
201	}
202	}
203	public void outputLineSelected(OutputEvent ev) {}
204	public void outputLineCleared(OutputEvent ev) {}
205	};
206	out.println(sURL, listener, true);
207	out.flush();
208	} catch (IOException ex) {
209	// Ignore
210	}
211	}
212	});
213	}
214
215	/**
216	* Select and Clear OutputLogger's tab
217	*
218	* @param list to print out
219	*
220	*/
221	public void clearOutput(){
222	rp.post(new Runnable() {
223	public void run() {
224	log.select();
225	OutputWriter out = log.getOut();
226
227	try {
228	out.reset();
229	} catch (IOException ex) {
230	// Ignore Exception
231	}
232	out.flush();
233	}
234	});
235	}
236
237	private static class NullLogger extends OutputLogger {
238
239	public void closeLog() {
240	}
241
242	public void flushLog() {
243	}
244
245	public void output(List<String> list){
246	}
247
248	public void output(String msg){
249	}
250	public void outputInRed(String msg){
251	}
252	public void outputLink(final String sURL){
253	}
254	public void clearOutput(){
255	}
256	}
257
258	}

Lines 75-105 public class VersionsCache { Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/VersionsCache.java (-4 / +8 lines)
75	public File getFileRevision(File base, String revision) throws IOException {	75	public File getFileRevision(File base, String revision) throws IOException {
76	if(revision.equals("-1")) return null; // NOI18N	76	if(revision.equals("-1")) return null; // NOI18N
77		77
		78	File repository = Mercurial.getInstance().getTopmostManagedParent(base);
		79	OutputLogger logger = OutputLogger.getLogger(repository.getAbsolutePath());
78	if (Setup.REVISION_BASE.equals(revision)) {	80	if (Setup.REVISION_BASE.equals(revision)) {
79	try {	81	try {
80	File tempFile = File.createTempFile("tmp", "-" + base.getName()); //NOI18N	82	File tempFile = File.createTempFile("tmp", "-" + base.getName()); //NOI18N
81	File repository = Mercurial.getInstance().getTopmostManagedParent(base);	83	HgCommand.doCat(repository, base, tempFile, logger);
82	HgCommand.doCat(repository, base, tempFile);
83	if (tempFile.length() == 0) return null;	84	if (tempFile.length() == 0) return null;
84	return tempFile;	85	return tempFile;
85	} catch (HgException e) {	86	} catch (HgException e) {
86	IOException ioe = new IOException();	87	IOException ioe = new IOException();
87	ioe.initCause(e);	88	ioe.initCause(e);
88	throw ioe;	89	throw ioe;
		90	} finally {
		91	logger.closeLog();
89	}	92	}
90	} else if (Setup.REVISION_CURRENT.equals(revision)) {	93	} else if (Setup.REVISION_CURRENT.equals(revision)) {
91	return base;	94	return base;
92	} else {	95	} else {
93	try {	96	try {
94	File tempFile = File.createTempFile("tmp", "-" + base.getName()); //NOI18N	97	File tempFile = File.createTempFile("tmp", "-" + base.getName()); //NOI18N
95	File repository = Mercurial.getInstance().getTopmostManagedParent(base);	98	HgCommand.doCat(repository, base, tempFile, revision, logger);
96	HgCommand.doCat(repository, base, tempFile, revision);
97	if (tempFile.length() == 0) return null;	99	if (tempFile.length() == 0) return null;
98	return tempFile;	100	return tempFile;
99	} catch (HgException e) {	101	} catch (HgException e) {
100	IOException ioe = new IOException();	102	IOException ioe = new IOException();
101	ioe.initCause(e);	103	ioe.initCause(e);
102	throw ioe;	104	throw ioe;
		105	} finally {
		106	logger.closeLog();
103	}	107	}
104	}	108	}
105	}	109	}

Lines 46-51 import org.netbeans.modules.versioning.s Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/commit/CommitAction.java (-17 / +21 lines)
46	import org.netbeans.modules.versioning.spi.VCSContext;	46	import org.netbeans.modules.versioning.spi.VCSContext;
47	import org.netbeans.modules.versioning.util.Utils;	47	import org.netbeans.modules.versioning.util.Utils;
48	import org.netbeans.modules.mercurial.Mercurial;	48	import org.netbeans.modules.mercurial.Mercurial;
		49	import org.netbeans.modules.mercurial.OutputLogger;
49	import org.netbeans.modules.mercurial.FileStatusCache;	50	import org.netbeans.modules.mercurial.FileStatusCache;
50	import org.netbeans.modules.mercurial.FileInformation;	51	import org.netbeans.modules.mercurial.FileInformation;
51	import org.netbeans.modules.mercurial.HgFileNode;	52	import org.netbeans.modules.mercurial.HgFileNode;
Lines 105-115 public class CommitAction extends Contex Link Here
105	public void performAction(ActionEvent e) {	106	public void performAction(ActionEvent e) {
106	final File root = HgUtils.getRootFile(context);	107	final File root = HgUtils.getRootFile(context);
107	if (root == null) {	108	if (root == null) {
108	HgUtils.outputMercurialTabInRed( NbBundle.getMessage(CommitAction.class,"MSG_COMMIT_TITLE")); // NOI18N	109	OutputLogger logger = OutputLogger.getLogger(Mercurial.MERCURIAL_OUTPUT_TAB_TITLE);
109	HgUtils.outputMercurialTabInRed( NbBundle.getMessage(CommitAction.class,"MSG_COMMIT_TITLE_SEP")); // NOI18N	110	logger.outputInRed( NbBundle.getMessage(CommitAction.class,"MSG_COMMIT_TITLE")); // NOI18N
110	HgUtils.outputMercurialTabInRed(	111	logger.outputInRed( NbBundle.getMessage(CommitAction.class,"MSG_COMMIT_TITLE_SEP")); // NOI18N
		112	logger.outputInRed(
111	NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N	113	NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW_INFO")); // NOI18N
112	HgUtils.outputMercurialTab(""); // NOI18N	114	logger.output(""); // NOI18N
		115	logger.closeLog();
113	JOptionPane.showMessageDialog(null,	116	JOptionPane.showMessageDialog(null,
114	NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW"),// NOI18N	117	NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW"),// NOI18N
115	NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N	118	NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_NOT_SUPPORTED_INVIEW_TITLE"),// NOI18N
Lines 230-236 public class CommitAction extends Contex Link Here
230	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository.getAbsolutePath());	233	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository.getAbsolutePath());
231	HgProgressSupport support = new HgProgressSupport() {	234	HgProgressSupport support = new HgProgressSupport() {
232	public void perform() {	235	public void perform() {
233	performCommit(message, commitFiles, ctx, this, prjName);	236	OutputLogger logger = getLogger();
		237	performCommit(message, commitFiles, ctx, this, prjName, logger);
234	}	238	}
235	};	239	};
236	support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(CommitAction.class, "LBL_Commit_Progress")); // NOI18N	240	support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(CommitAction.class, "LBL_Commit_Progress")); // NOI18N
Lines 314-320 public class CommitAction extends Contex Link Here
314	}	318	}
315		319
316	private static void performCommit(String message, Map<HgFileNode, CommitOptions> commitFiles,	320	private static void performCommit(String message, Map<HgFileNode, CommitOptions> commitFiles,
317	VCSContext ctx, HgProgressSupport support, String prjName) {	321	VCSContext ctx, HgProgressSupport support, String prjName, OutputLogger logger) {
318	FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();	322	FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();
319	final File repository = HgUtils.getRootFile(ctx);	323	final File repository = HgUtils.getRootFile(ctx);
320	List<File> addCandidates = new ArrayList<File>();	324	List<File> addCandidates = new ArrayList<File>();
Lines 351-391 public class CommitAction extends Contex Link Here
351	}	355	}
352		356
353	try {	357	try {
354	HgUtils.outputMercurialTabInRed(	358	logger.outputInRed(
355	NbBundle.getMessage(CommitAction.class,	359	NbBundle.getMessage(CommitAction.class,
356	"MSG_COMMIT_TITLE")); // NOI18N	360	"MSG_COMMIT_TITLE")); // NOI18N
357	HgUtils.outputMercurialTabInRed(	361	logger.outputInRed(
358	NbBundle.getMessage(CommitAction.class,	362	NbBundle.getMessage(CommitAction.class,
359	"MSG_COMMIT_TITLE_SEP")); // NOI18N	363	"MSG_COMMIT_TITLE_SEP")); // NOI18N
360	HgUtils.outputMercurialTab(message); // NOI18N	364	logger.output(message); // NOI18N
361	if (addCandidates.size() > 0 ) {	365	if (addCandidates.size() > 0 ) {
362	HgCommand.doAdd(repository, addCandidates);	366	HgCommand.doAdd(repository, addCandidates, logger);
363	for (File f : addCandidates) {	367	for (File f : addCandidates) {
364	HgUtils.outputMercurialTab("hg add " + f.getName()); //NOI18N	368	logger.output("hg add " + f.getName()); //NOI18N
365	}	369	}
366	}	370	}
367	HgCommand.doCommit(repository, commitCandidates, message);	371	HgCommand.doCommit(repository, commitCandidates, message, logger);
368	HgRepositoryContextCache.setHasHistory(ctx);	372	HgRepositoryContextCache.setHasHistory(ctx);
369		373
370	if (commitCandidates.size() == 1) {	374	if (commitCandidates.size() == 1) {
371	HgUtils.outputMercurialTab(	375	logger.output(
372	NbBundle.getMessage(CommitAction.class,	376	NbBundle.getMessage(CommitAction.class,
373	"MSG_COMMIT_INIT_SEP_ONE", commitCandidates.size(), prjName)); // NOI18N	377	"MSG_COMMIT_INIT_SEP_ONE", commitCandidates.size(), prjName)); // NOI18N
374	} else {	378	} else {
375	HgUtils.outputMercurialTab(	379	logger.output(
376	NbBundle.getMessage(CommitAction.class,	380	NbBundle.getMessage(CommitAction.class,
377	"MSG_COMMIT_INIT_SEP", commitCandidates.size(), prjName)); // NOI18N	381	"MSG_COMMIT_INIT_SEP", commitCandidates.size(), prjName)); // NOI18N
378	}	382	}
379	for (File f : commitCandidates) {	383	for (File f : commitCandidates) {
380	HgUtils.outputMercurialTab("\t" + f.getAbsolutePath()); // NOI18N	384	logger.output("\t" + f.getAbsolutePath()); // NOI18N
381	}	385	}
382	} catch (HgException ex) {	386	} catch (HgException ex) {
383	NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);	387	NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
384	DialogDisplayer.getDefault().notifyLater(e);	388	DialogDisplayer.getDefault().notifyLater(e);
385	} finally {	389	} finally {
386	cache.refreshCached(ctx);	390	cache.refreshCached(ctx);
387	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_DONE")); // NOI18N	391	logger.outputInRed(NbBundle.getMessage(CommitAction.class, "MSG_COMMIT_DONE")); // NOI18N
388	HgUtils.outputMercurialTab(""); // NOI18N	392	logger.output(""); // NOI18N
389	}	393	}
390	}	394	}
391	}	395	}

Lines 43-48 import org.netbeans.modules.mercurial.ui Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/pull/FetchAction.java (-9 / +11 lines)
43	import org.netbeans.modules.mercurial.ui.view.*;	43	import org.netbeans.modules.mercurial.ui.view.*;
44	import org.netbeans.modules.versioning.spi.VCSContext;	44	import org.netbeans.modules.versioning.spi.VCSContext;
45	import org.netbeans.modules.mercurial.Mercurial;	45	import org.netbeans.modules.mercurial.Mercurial;
		46	import org.netbeans.modules.mercurial.OutputLogger;
46	import org.netbeans.modules.mercurial.HgException;	47	import org.netbeans.modules.mercurial.HgException;
47	import org.netbeans.modules.mercurial.util.HgCommand;	48	import org.netbeans.modules.mercurial.util.HgCommand;
48	import org.netbeans.modules.mercurial.util.HgUtils;	49	import org.netbeans.modules.mercurial.util.HgUtils;
Lines 87-117 public class FetchAction extends Context Link Here
87		88
88	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);	89	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(root);
89	HgProgressSupport support = new HgProgressSupport() {	90	HgProgressSupport support = new HgProgressSupport() {
90	public void perform() { performFetch(root); } };	91	OutputLogger logger = getLogger();
		92	public void perform() { performFetch(root, logger); } };
91		93
92	support.start(rp, root.getAbsolutePath(), org.openide.util.NbBundle.getMessage(FetchAction.class, "MSG_FETCH_PROGRESS")); // NOI18N	94	support.start(rp, root.getAbsolutePath(), org.openide.util.NbBundle.getMessage(FetchAction.class, "MSG_FETCH_PROGRESS")); // NOI18N
93	}	95	}
94		96
95	static void performFetch(File root) {	97	static void performFetch(File root, OutputLogger logger) {
96	try {	98	try {
97	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_TITLE")); // NOI18N	99	logger.outputInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_TITLE")); // NOI18N
98	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_TITLE_SEP")); // NOI18N	100	logger.outputInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_TITLE_SEP")); // NOI18N
99		101
100	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(FetchAction.class,	102	logger.outputInRed(NbBundle.getMessage(FetchAction.class,
101	"MSG_FETCH_LAUNCH_INFO", root.getAbsolutePath())); // NOI18N	103	"MSG_FETCH_LAUNCH_INFO", root.getAbsolutePath())); // NOI18N
102		104
103	List<String> list;	105	List<String> list;
104	list = HgCommand.doFetch(root);	106	list = HgCommand.doFetch(root, logger);
105		107
106	if (list != null && !list.isEmpty()) {	108	if (list != null && !list.isEmpty()) {
107	HgUtils.outputMercurialTab(HgUtils.replaceHttpPassword(list));	109	logger.output(HgUtils.replaceHttpPassword(list));
108	}	110	}
109	} catch (HgException ex) {	111	} catch (HgException ex) {
110	NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);	112	NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);
111	DialogDisplayer.getDefault().notifyLater(e);	113	DialogDisplayer.getDefault().notifyLater(e);
112	}finally{	114	}finally{
113	HgUtils.outputMercurialTabInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_DONE")); // NOI18N	115	logger.outputInRed(NbBundle.getMessage(FetchAction.class, "MSG_FETCH_DONE")); // NOI18N
114	HgUtils.outputMercurialTab(""); // NOI18N	116	logger.output(""); // NOI18N
115	}	117	}
116	}	118	}
117		119

Lines 47-52 import java.awt.event.ActionEvent; Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsAction.java (-17 / +18 lines)
47	import java.awt.event.ActionEvent;	47	import java.awt.event.ActionEvent;
48	import org.netbeans.modules.versioning.spi.VCSContext;	48	import org.netbeans.modules.versioning.spi.VCSContext;
49	import org.netbeans.modules.mercurial.Mercurial;	49	import org.netbeans.modules.mercurial.Mercurial;
		50	import org.netbeans.modules.mercurial.OutputLogger;
50	import org.netbeans.modules.mercurial.FileStatusCache;	51	import org.netbeans.modules.mercurial.FileStatusCache;
51	import org.netbeans.modules.mercurial.FileInformation;	52	import org.netbeans.modules.mercurial.FileInformation;
52	import org.netbeans.modules.mercurial.util.HgUtils;	53	import org.netbeans.modules.mercurial.util.HgUtils;
Lines 96-102 public class RevertModificationsAction e Link Here
96	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);	97	RequestProcessor rp = Mercurial.getInstance().getRequestProcessor(repository);
97	HgProgressSupport support = new HgProgressSupport() {	98	HgProgressSupport support = new HgProgressSupport() {
98	public void perform() {	99	public void perform() {
99	performRevert(repository, revStr, files, doBackup);	100	performRevert(repository, revStr, files, doBackup, this.getLogger());
100	}	101	}
101	};	102	};
102	support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(UpdateAction.class, "MSG_Revert_Progress")); // NOI18N	103	support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(UpdateAction.class, "MSG_Revert_Progress")); // NOI18N
Lines 104-155 public class RevertModificationsAction e Link Here
104	return;	105	return;
105	}	106	}
106		107
107	public static void performRevert(File repository, String revStr, File file, boolean doBackup) {	108	public static void performRevert(File repository, String revStr, File file, boolean doBackup, OutputLogger logger) {
108	List<File> revertFiles = new ArrayList<File>();	109	List<File> revertFiles = new ArrayList<File>();
109	revertFiles.add(file);	110	revertFiles.add(file);
110		111
111	performRevert(repository, revStr, revertFiles, doBackup);	112	performRevert(repository, revStr, revertFiles, doBackup, logger);
112	}	113	}
113		114
114	public static void performRevert(File repository, String revStr, File[] files, boolean doBackup) {	115	public static void performRevert(File repository, String revStr, File[] files, boolean doBackup, OutputLogger logger) {
115	List<File> revertFiles = new ArrayList<File>();	116	List<File> revertFiles = new ArrayList<File>();
116	for (File file : files) {	117	for (File file : files) {
117	revertFiles.add(file);	118	revertFiles.add(file);
118	}	119	}
119	performRevert(repository, revStr, revertFiles, doBackup);	120	performRevert(repository, revStr, revertFiles, doBackup, logger);
120	}	121	}
121		122
122	public static void performRevert(File repository, String revStr, List<File> revertFiles, boolean doBackup) {	123	public static void performRevert(File repository, String revStr, List<File> revertFiles, boolean doBackup, OutputLogger logger) {
123	try{	124	try{
124	HgUtils.outputMercurialTabInRed(	125	logger.outputInRed(
125	NbBundle.getMessage(RevertModificationsAction.class,	126	NbBundle.getMessage(RevertModificationsAction.class,
126	"MSG_REVERT_TITLE")); // NOI18N	127	"MSG_REVERT_TITLE")); // NOI18N
127	HgUtils.outputMercurialTabInRed(	128	logger.outputInRed(
128	NbBundle.getMessage(RevertModificationsAction.class,	129	NbBundle.getMessage(RevertModificationsAction.class,
129	"MSG_REVERT_TITLE_SEP")); // NOI18N	130	"MSG_REVERT_TITLE_SEP")); // NOI18N
130		131
131	// No revisions to revert too	132	// No revisions to revert too
132	if (NbBundle.getMessage(RevertModificationsAction.class,	133	if (NbBundle.getMessage(RevertModificationsAction.class,
133	"MSG_Revision_Default").startsWith(revStr)) {	134	"MSG_Revision_Default").startsWith(revStr)) {
134	HgUtils.outputMercurialTab(	135	logger.output(
135	NbBundle.getMessage(RevertModificationsAction.class,	136	NbBundle.getMessage(RevertModificationsAction.class,
136	"MSG_REVERT_NOTHING")); // NOI18N	137	"MSG_REVERT_NOTHING")); // NOI18N
137	HgUtils.outputMercurialTabInRed(	138	logger.outputInRed(
138	NbBundle.getMessage(RevertModificationsAction.class,	139	NbBundle.getMessage(RevertModificationsAction.class,
139	"MSG_REVERT_DONE")); // NOI18N	140	"MSG_REVERT_DONE")); // NOI18N
140	HgUtils.outputMercurialTabInRed(""); // NOI18N	141	logger.outputInRed(""); // NOI18N
141	return;	142	return;
142	}	143	}
143		144
144	HgUtils.outputMercurialTab(	145	logger.output(
145	NbBundle.getMessage(RevertModificationsAction.class,	146	NbBundle.getMessage(RevertModificationsAction.class,
146	"MSG_REVERT_REVISION_STR", revStr)); // NOI18N	147	"MSG_REVERT_REVISION_STR", revStr)); // NOI18N
147	for (File file : revertFiles) {	148	for (File file : revertFiles) {
148	HgUtils.outputMercurialTab(file.getAbsolutePath());	149	logger.output(file.getAbsolutePath());
149	}	150	}
150	HgUtils.outputMercurialTab(""); // NOI18N	151	logger.output(""); // NOI18N
151		152
152	HgCommand.doRevert(repository, revertFiles, revStr, doBackup);	153	HgCommand.doRevert(repository, revertFiles, revStr, doBackup, logger);
153	FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();	154	FileStatusCache cache = Mercurial.getInstance().getFileStatusCache();
154	File[] conflictFiles = cache.listFiles(revertFiles.toArray(new File[0]), FileInformation.STATUS_VERSIONED_CONFLICT);	155	File[] conflictFiles = cache.listFiles(revertFiles.toArray(new File[0]), FileInformation.STATUS_VERSIONED_CONFLICT);
155	if (conflictFiles.length != 0) {	156	if (conflictFiles.length != 0) {
Lines 174-183 public class RevertModificationsAction e Link Here
174	rootObj.getFileSystem().refresh(true);	175	rootObj.getFileSystem().refresh(true);
175	} catch (java.lang.Exception exc) {	176	} catch (java.lang.Exception exc) {
176	}	177	}
177	HgUtils.outputMercurialTabInRed(	178	logger.outputInRed(
178	NbBundle.getMessage(RevertModificationsAction.class,	179	NbBundle.getMessage(RevertModificationsAction.class,
179	"MSG_REVERT_DONE")); // NOI18N	180	"MSG_REVERT_DONE")); // NOI18N
180	HgUtils.outputMercurialTabInRed(""); // NOI18N	181	logger.outputInRed(""); // NOI18N
181		182
182	}	183	}
183		184