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

(-)a/tests/org.eclipse.orion.server.tests/src/org/eclipse/orion/server/tests/servlets/git/GitBranchTest.java (+7 lines)
Lines 23-29 Link Here
23 
import org.eclipse.jgit.api.Git;
 23 
import org.eclipse.jgit.api.Git;
24 
import org.eclipse.jgit.api.MergeResult.MergeStatus;
 24 
import org.eclipse.jgit.api.MergeResult.MergeStatus;
25 
import org.eclipse.jgit.api.PullResult;
 25 
import org.eclipse.jgit.api.PullResult;
26 
import org.eclipse.jgit.lib.ConfigConstants;
26 
import org.eclipse.jgit.lib.Constants;
 27 
import org.eclipse.jgit.lib.Constants;
28 
import org.eclipse.jgit.lib.StoredConfig;
27 
import org.eclipse.orion.internal.server.servlets.ProtocolConstants;
 29 
import org.eclipse.orion.internal.server.servlets.ProtocolConstants;
28 
import org.eclipse.orion.server.core.ServerStatus;
 30 
import org.eclipse.orion.server.core.ServerStatus;
29 
import org.eclipse.orion.server.git.GitConstants;
 31 
import org.eclipse.orion.server.git.GitConstants;
Lines 135-140 Link Here
135 
			String cloneContentLocation = clone.getString(ProtocolConstants.KEY_CONTENT_LOCATION);
 137 
			String cloneContentLocation = clone.getString(ProtocolConstants.KEY_CONTENT_LOCATION);
136 
			String branchesLocation = clone.getString(GitConstants.KEY_BRANCH);
 138 
			String branchesLocation = clone.getString(GitConstants.KEY_BRANCH);
137 

          139
          

        

            

              
              
              140
              
			// overwrite user settings, do not rebase when pulling, see bug 372489

            

            

              141
              
			StoredConfig cfg = getRepositoryForContentLocation(cloneContentLocation).getConfig();

            

            

              142
              
			cfg.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, false);

            

            

              143
              
			cfg.save();

            

            

              144
              

            

        

          138
          
			// get project/folder metadata

          145
          
			// get project/folder metadata

        

        

          139
          
			WebRequest request = getGetFilesRequest(cloneContentLocation);

          146
          
			WebRequest request = getGetFilesRequest(cloneContentLocation);

        

        

          140
          
			WebResponse response = webConversation.getResponse(request);

          147
          
			WebResponse response = webConversation.getResponse(request);

        



(-)a/tests/org.eclipse.orion.server.tests/src/org/eclipse/orion/server/tests/servlets/git/GitCloneTest.java
      (-1 / +10 lines)




  

    
      
            Lines 33-42
          
      
      
        Link Here
      
    
  

        

          33
          
import org.eclipse.jgit.api.Git;

          33
          
import org.eclipse.jgit.api.Git;

        

        

          34
          
import org.eclipse.jgit.api.MergeResult.MergeStatus;

          34
          
import org.eclipse.jgit.api.MergeResult.MergeStatus;

        

        

          35
          
import org.eclipse.jgit.api.PullResult;

          35
          
import org.eclipse.jgit.api.PullResult;

        

            

              
              
              36
              
import org.eclipse.jgit.lib.ConfigConstants;

            

        

          36
          
import org.eclipse.jgit.lib.Constants;

          37
          
import org.eclipse.jgit.lib.Constants;

        

        

          37
          
import org.eclipse.jgit.lib.Repository;

          38
          
import org.eclipse.jgit.lib.Repository;

        

        

          38
          
import org.eclipse.jgit.lib.RepositoryCache;

          39
          
import org.eclipse.jgit.lib.RepositoryCache;

        

        

          39
          
import org.eclipse.jgit.lib.RepositoryState;

          40
          
import org.eclipse.jgit.lib.RepositoryState;

        

            

              
              
              41
              
import org.eclipse.jgit.lib.StoredConfig;

            

        

          40
          
import org.eclipse.jgit.transport.URIish;

          42
          
import org.eclipse.jgit.transport.URIish;

        

        

          41
          
import org.eclipse.jgit.util.FS;

          43
          
import org.eclipse.jgit.util.FS;

        

        

          42
          
import org.eclipse.orion.internal.server.core.IOUtilities;

          44
          
import org.eclipse.orion.internal.server.core.IOUtilities;

        

  

    
      
            Lines 667-674
          
      
      
        Link Here
      
    
  

        

          667
          
		JSONArray clonesArray = clones.getJSONArray(ProtocolConstants.KEY_CHILDREN);

          669
          
		JSONArray clonesArray = clones.getJSONArray(ProtocolConstants.KEY_CHILDREN);

        

        

          668
          
		assertEquals(1, clonesArray.length());

          670
          
		assertEquals(1, clonesArray.length());

        

        

          669
          

          671
          

        

          
            

              670
              
		Git git = new Git(getRepositoryForContentLocation(contentLocation));


              672
              
		Repository r = getRepositoryForContentLocation(contentLocation);

            

            

              
              

              673
              

            

            


              674
              
		// overwrite user settings, do not rebase when pulling, see bug 372489

            

            


              675
              
		StoredConfig cfg = r.getConfig();

            

            


              676
              
		cfg.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, false);

            

            


              677
              
		cfg.save();

            

            


              678
              

            

        

          671
          
		// TODO: replace with RESTful API when ready, see bug 339114

          679
          
		// TODO: replace with RESTful API when ready, see bug 339114

        

            

              
              
              680
              
		Git git = new Git(r);

            

        

          672
          
		PullResult pullResult = git.pull().call();

          681
          
		PullResult pullResult = git.pull().call();

        

        

          673
          
		assertEquals(pullResult.getMergeResult().getMergeStatus(), MergeStatus.ALREADY_UP_TO_DATE);

          682
          
		assertEquals(pullResult.getMergeResult().getMergeStatus(), MergeStatus.ALREADY_UP_TO_DATE);

        

        

          674
          
		assertEquals(RepositoryState.SAFE, git.getRepository().getRepositoryState());

          683
          
		assertEquals(RepositoryState.SAFE, git.getRepository().getRepositoryState());

        



(-)a/tests/org.eclipse.orion.server.tests/src/org/eclipse/orion/server/tests/servlets/git/GitStatusTest.java
      (-1 / +8 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

        

          1
          
/*******************************************************************************

          1
          
/*******************************************************************************

        

          
            

              2
              
 * Copyright (c) 2011 IBM Corporation and others


              2
              
 * Copyright (c) 2011, 2012 IBM Corporation and others

            

        

          3
          
 * All rights reserved. This program and the accompanying materials

          3
          
 * All rights reserved. This program and the accompanying materials

        

        

          4
          
 * are made available under the terms of the Eclipse Public License v1.0

          4
          
 * are made available under the terms of the Eclipse Public License v1.0

        

        

          5
          
 * which accompanies this distribution, and is available at

          5
          
 * which accompanies this distribution, and is available at

        

  

    
      
            Lines 26-33
          
      
      
        Link Here
      
    
  

        

          26
          
import org.eclipse.jgit.api.RmCommand;

          26
          
import org.eclipse.jgit.api.RmCommand;

        

        

          27
          
import org.eclipse.jgit.dircache.DirCache;

          27
          
import org.eclipse.jgit.dircache.DirCache;

        

        

          28
          
import org.eclipse.jgit.dircache.DirCacheEntry;

          28
          
import org.eclipse.jgit.dircache.DirCacheEntry;

        

            

              
              
              29
              
import org.eclipse.jgit.lib.ConfigConstants;

            

        

          29
          
import org.eclipse.jgit.lib.Constants;

          30
          
import org.eclipse.jgit.lib.Constants;

        

        

          30
          
import org.eclipse.jgit.lib.Repository;

          31
          
import org.eclipse.jgit.lib.Repository;

        

            

              
              
              32
              
import org.eclipse.jgit.lib.StoredConfig;

            

        

          31
          
import org.eclipse.orion.internal.server.servlets.ProtocolConstants;

          33
          
import org.eclipse.orion.internal.server.servlets.ProtocolConstants;

        

        

          32
          
import org.eclipse.orion.server.core.ServerStatus;

          34
          
import org.eclipse.orion.server.core.ServerStatus;

        

        

          33
          
import org.eclipse.orion.server.git.GitConstants;

          35
          
import org.eclipse.orion.server.git.GitConstants;

        

  

    
      
            Lines 525-530
          
      
      
        Link Here
      
    
  

        

          525
          
		IPath clonePath2 = new Path("file").append(project2.getString(ProtocolConstants.KEY_ID)).makeAbsolute();

          527
          
		IPath clonePath2 = new Path("file").append(project2.getString(ProtocolConstants.KEY_ID)).makeAbsolute();

        

        

          526
          
		String contentLocation2 = clone(clonePath2).getString(ProtocolConstants.KEY_CONTENT_LOCATION);

          528
          
		String contentLocation2 = clone(clonePath2).getString(ProtocolConstants.KEY_CONTENT_LOCATION);

        

        

          527
          

          529
          

        

            

              
              
              530
              
		// overwrite user settings, do not rebase when pulling, see bug 372489

            

            

              531
              
		StoredConfig cfg = getRepositoryForContentLocation(contentLocation2).getConfig();

            

            

              532
              
		cfg.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, false);

            

            

              533
              
		cfg.save();

            

            

              534
              

            

        

          528
          
		// get project metadata

          535
          
		// get project metadata

        

        

          529
          
		request = getGetFilesRequest(project2.getString(ProtocolConstants.KEY_CONTENT_LOCATION));

          536
          
		request = getGetFilesRequest(project2.getString(ProtocolConstants.KEY_CONTENT_LOCATION));

        

        

          530
          
		response = webConversation.getResponse(request);

          537
          
		response = webConversation.getResponse(request);

        






  

  Return to bug 372489