Public Git Hosting - nbgit.git/blob - src/org/netbeans/modules/git/ui/pull/PullAction.java

1 /*

2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

3 *

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

30 *

31 * If you wish your version of this file to be governed by only the CDDL

32 * or only the GPL Version 2, indicate your decision by adding

33 * "[Contributor] elects to include this software in this distribution

34 * under the [CDDL or GPL Version 2] license." If you do not indicate a

35 * single choice of license, a recipient has the option to distribute

36 * your version of this file under either the CDDL, the GPL Version 2 or

37 * to extend the choice of license to its licensees as provided above.

38 * However, if you add GPL Version 2 code and therefore, elected the GPL

39 * Version 2 license, then the option applies only if the new code is

40 * made subject to such option by the copyright holder.

41 */

package org.netbeans.modules.git.ui.pull;

import java.awt.event.ActionEvent;

46 import java.io.File;

47 import java.util.ArrayList;

48 import java.util.HashSet;

49 import java.util.List;

50 import java.util.Set;

51 import javax.swing.Action;

52 import javax.swing.JOptionPane;

import org.netbeans.api.project.Project;

import org.netbeans.modules.git.FileInformation;

import org.netbeans.modules.git.FileStatusCache;

import org.netbeans.modules.git.Git;

import org.netbeans.modules.git.GitException;

import org.netbeans.modules.git.GitProgressSupport;

import org.netbeans.modules.git.OutputLogger;

import org.netbeans.modules.git.ui.actions.ContextAction;

import org.netbeans.modules.git.ui.merge.MergeAction;

import org.netbeans.modules.git.util.GitCommand;

import org.netbeans.modules.git.util.GitProjectUtils;

import org.netbeans.modules.git.util.GitUtils;

import org.netbeans.modules.versioning.spi.VCSContext;

66 import org.openide.DialogDisplayer;

67 import org.openide.NotifyDescriptor;

import org.openide.filesystems.FileObject;

import org.openide.filesystems.FileUtil;

import org.openide.util.NbBundle;

import org.openide.util.RequestProcessor;

import org.openide.windows.IOProvider;

import org.openide.windows.InputOutput;

import org.openide.windows.OutputWriter;

77 /**

78 * Pull action for Git:

79 * git pull - fetch from, and merge changes with the specified repository and

80 * branch.

81 *

82 * @author John Rice

83 */

84 public class PullAction extends ContextAction {

    private static final String CHANGESET_FILES_PREFIX = "files:"; //NOI18N

87 public enum PullType {

88 LOCAL, OTHER

89 }

91 private final VCSContext context;

    public PullAction(String name, VCSContext context) {

94 this.context = context;

        putValue(Action.NAME, name);

96 }

98 public void performAction(ActionEvent e) {

        final File root = GitUtils.getRootFile(context);

        if (root == null) {

            OutputLogger logger = OutputLogger.getLogger(Git.GIT_OUTPUT_TAB_TITLE);

            logger.outputInRed( NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE")); // NOI18N

            logger.outputInRed( NbBundle.getMessage(PullAction.class,"MSG_PULL_TITLE_SEP")); // NOI18N

104 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

110 JOptionPane.INFORMATION_MESSAGE);

111 logger.closeLog();

112 return;

113 }

114 pull(context);

115 }

116

    public static boolean confirmWithLocalChanges(File rootFile, Class bundleLocation, String title, String query, 

118 List<String> listIncoming, OutputLogger logger) {

        FileStatusCache cache = Git.getInstance().getFileStatusCache();

        File[] roots = new File[1];

121 roots[0] = rootFile;

        File[] localModNewFiles = cache.listFiles(roots, 

123 FileInformation.STATUS_VERSIONED_MODIFIEDLOCALLY |

124 FileInformation.STATUS_VERSIONED_CONFLICT |

125 FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY);

        List<String> listIncomingAndLocalMod = new ArrayList<String>();

        Set<String> setFiles = new HashSet<String>();

128 String filesStr;

129 String[] aFileStr;

130 String root = rootFile.getAbsolutePath();

131

132 for(String s: listIncoming){

            if(s.indexOf(CHANGESET_FILES_PREFIX) == 0){

                filesStr = (s.substring(CHANGESET_FILES_PREFIX.length())).trim();

                aFileStr = filesStr.split(" ");

136 for(String fileStr: aFileStr){

                    setFiles.add(root + File.separator + fileStr);

138 break;

139 }

140 }

141 }

142 for(File f : localModNewFiles){

143 for(String s : setFiles){

                if( s.equals(f.getAbsolutePath())){

145 listIncomingAndLocalMod.add(s);

146 }

147 }

148 }

149

        if (listIncomingAndLocalMod != null && listIncomingAndLocalMod.size() > 0) {

            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_OVERWRITE_LOCAL")); // NOI18N

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

156

            if (response == JOptionPane.NO_OPTION) {

158 return false;

159 }

160 }

161 return true;

162 }

163

164

    static void annotateChangeSets(List<String> list, Class bundleLocation, String title) {

        InputOutput io = IOProvider.getDefault().getIO(Git.GIT_OUTPUT_TAB_TITLE, false);

167 io.select();

168 OutputWriter out = io.getOut();

169 OutputWriter outRed = io.getErr();

        outRed.println(NbBundle.getMessage(bundleLocation, title));

171 for (String s : list) {

            if (s.indexOf(Git.CHANGESET_STR) == 0) {

173 outRed.println(s);

            } else if (!s.equals("")) {

175 out.println(s);

176 }

177 }

        out.println("");

179 out.close();

180 outRed.close();

181 }

182

    public static void pull(final VCSContext ctx) {

        final File root = GitUtils.getRootFile(ctx);

        if (root == null) return;

186 String repository = root.getAbsolutePath();

187

        RequestProcessor rp = Git.getInstance().getRequestProcessor(repository);

189 GitProgressSupport support = new GitProgressSupport() {

            public void perform() { getDefaultAndPerformPull(ctx, root, this.getLogger()); } };

191

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

193 }

194

195 @Override

196 public boolean isEnabled() {

        return GitUtils.getRootFile(context) != null;

198 }

199

    static void getDefaultAndPerformPull(VCSContext ctx, File root, OutputLogger logger) {

        final String pullPath = GitCommand.getPullDefault(root);

202 // 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"),

212 JOptionPane.INFORMATION_MESSAGE);

213 return;

214 }

215 // We assume that if fromPrjName is null that it is a remote pull.

216 // This is not true as a project which is in a subdirectory of a

217 // repository will report a project name of null. This does no harm.

        final String fromPrjName = GitProjectUtils.getProjectName(new File(pullPath));

        Project proj = GitUtils.getProject(ctx);

        final String toPrjName = GitProjectUtils.getProjectName(proj);

        performPull(fromPrjName != null ? PullType.LOCAL : PullType.OTHER, ctx, root, pullPath, fromPrjName, toPrjName, logger);

222 }

223

    static void performPull(PullType type, VCSContext ctx, File root, String pullPath, String fromPrjName, String toPrjName, OutputLogger logger) {

        if(root == null || pullPath == null) return;

226 File bundleFile = null;

227

228 try {

            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_TITLE")); // NOI18N

            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_TITLE_SEP")); // NOI18N

231

232 List<String> listIncoming;

            if(type == PullType.LOCAL){

                listIncoming = GitCommand.doIncoming(root, logger);

235 }else{

                for (int i = 0; i < 10000; i++) {

                    if (!new File(root.getParentFile(), root.getName() + "_bundle" + i).exists()) { // NOI18N

                        bundleFile = new File(root.getParentFile(), root.getName() + "_bundle" + i); // NOI18N

239 break;

240 }

241 }

                listIncoming = GitCommand.doIncoming(root, pullPath, bundleFile, logger);

243 }

            if (listIncoming == null || listIncoming.isEmpty()) return;

245

            boolean bNoChanges = GitCommand.isNoChanges(listIncoming.get(listIncoming.size() - 1));

247

248 // 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

252 return;

253 }

254

255 // Do Pull if there are changes to be pulled

256 List<String> list;

257 if (bNoChanges) {

258 list = listIncoming;

259 } else {

                if(type == PullType.LOCAL){

                    list = GitCommand.doPull(root, logger);

262 }else{

263 //list = GitCommand.doUnbundle(root, bundleFile, logger);

                    list = GitCommand.doPull(root, logger);

265 }

266 }

267

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

269

270 if (!bNoChanges) {

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

272 }

273

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

                if (fromPrjName != null) {

                    logger.outputInRed(NbBundle.getMessage(

                            PullAction.class, "MSG_PULL_FROM", fromPrjName, GitUtils.stripDoubleSlash(GitUtils.replaceHttpPassword(pullPath)))); // NOI18N

278 } else {

                    logger.outputInRed(NbBundle.getMessage(

                            PullAction.class, "MSG_PULL_FROM_NONAME", GitUtils.stripDoubleSlash(GitUtils.replaceHttpPassword(pullPath)))); // NOI18N

281 }

                if (toPrjName != null) {

                    logger.outputInRed(NbBundle.getMessage(

                            PullAction.class, "MSG_PULL_TO", toPrjName, root)); // NOI18N

285 } else {

                    logger.outputInRed(NbBundle.getMessage(

                            PullAction.class, "MSG_PULL_TO_NONAME", root)); // NOI18N

288 }

289

290 // Handle Merge - both automatic and merge with conflicts

                boolean bMergeNeededDueToPull = GitCommand.isMergeNeededMsg(list.get(list.size() - 1));

292 boolean bConfirmMerge = false;

293 if(bMergeNeededDueToPull){

294 bConfirmMerge = GitUtils.confirmDialog(

                        PullAction.class, "MSG_PULL_MERGE_CONFIRM_TITLE", "MSG_PULL_MERGE_CONFIRM_QUERY"); // NOI18N

296 } else {

                    boolean bOutStandingUncommittedMerges = GitCommand.isMergeAbortUncommittedMsg(list.get(list.size() - 1));

298 if(bOutStandingUncommittedMerges){

299 bConfirmMerge = GitUtils.confirmDialog(

                            PullAction.class, "MSG_PULL_MERGE_CONFIRM_TITLE", "MSG_PULL_MERGE_UNCOMMITTED_CONFIRM_QUERY"); // NOI18N

301 }

302 }

303 if (bConfirmMerge) {

                    logger.output(""); // NOI18N

                    logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_MERGE_DO")); // NOI18N

                    MergeAction.doMergeAction(root, null, logger);

307 } else {

                    List<String> headRevList = GitCommand.getHeadRevisions(root);

                    if (headRevList != null && headRevList.size() > 1){

                        MergeAction.printMergeWarning(headRevList, logger);

311 }

312 }

313 }

314

315 if (!bNoChanges) {

316 GitUtils.forceStatusRefreshProject(ctx);

317 // refresh filesystem to take account of deleted files.

                FileObject rootObj = FileUtil.toFileObject(root);

319 try {

                    rootObj.getFileSystem().refresh(true);

                } catch (java.lang.Exception ex) {

322 }

323 }

324

325 } catch (GitException ex) {

            NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex);

            DialogDisplayer.getDefault().notifyLater(e);

328 } finally {

            if (bundleFile != null) {

330 bundleFile.delete();

331 }

            logger.outputInRed(NbBundle.getMessage(PullAction.class, "MSG_PULL_DONE")); // NOI18N

            logger.output(""); // NOI18N

334 }

335 }

336 }