Difference between revisions of "Orion/How Tos/Working with git"

From Eclipsepedia

< Orion‎ | How Tos
Jump to: navigation, search
(Cloning a Git repository: Update for M7 UI)
(Cloning a Git repository)
Line 9: Line 9:
  
 
{{warning|Work in progress|This scenario has not been fully implemented yet.}}  
 
{{warning|Work in progress|This scenario has not been fully implemented yet.}}  
 +
 +
For detailed instruction how to clone repository from GitHub view [[Orion/How Tos/Cloning repository from github]]
  
 
#[[Orion/How Tos/Install Orion on Localhost#Downloading_and_Running_Orion_on_Localhost|Download and run Orion]]  
 
#[[Orion/How Tos/Install Orion on Localhost#Downloading_and_Running_Orion_on_Localhost|Download and run Orion]]  

Revision as of 09:11, 6 May 2011

Contents

Linking to a Git clone already existing on your computer

  1. First clone a git repository to any location in your local filesystem, you can do with a tool of your choice (EGit, msysgit...)
  2. Download and run Orion
  3. Create a project and link it to the location you used in Step 1.
  4. Orion will automatically detect that the project is actually a Git clone (we will probably make it configurable in the future)

Cloning a Git repository

Warning2.png
Work in progress
This scenario has not been fully implemented yet.


For detailed instruction how to clone repository from GitHub view Orion/How Tos/Cloning repository from github

  1. Download and run Orion
  2. Click the Repositories link to go to the Git Clones viewer.

    Orion Repostories link.png

  3. Select the Git Clone action.

    Git clone action.png

  4. Enter the Git repository URL, and click Next.

    Clone git repository dialog.png

  5. Now enter your credentials. Which fields are required depends on the specific repository you're connecting to.

    Git clone dialog.png

  6. When cloning is finished, you'll see the new clone appear in the list:

    Git clone complete.png

  7. Hover over the Actions column and click the Link button.

    Git clone Link Repo.png

  8. Type in a name, and click OK. The clone will be linked to a new folder in your workspace with that name.

    Git clone linking.png

  9. Done! You'll be taken to the folder and you can start using Orion's git tools on your new clone.

    Git clone linking 3.png

Using Orion Compare Viewer

Warning2.png
Work in progress
This scenario has not been fully implemented yet.

Although still in progress , you can now use both in-line and side-by-side compare viewer from Orion.Currently you have to use the viewer HTML directly in your browser and use your file location as the hash of the html. Please also note that the compare viewer container UI will be changed later to fit better layout.

  1. Download and run Orion or pull the latest code on both server and client side.
  2. Link a folder to your git repository.
  3. Open a file in the folder by Orion Editor.
  4. Change something and save the changes.
  5. Copy the "#/file/your_project/your_file" part from the editor URL as the file location.
  6. Paste it as the hash value of the viewer HTML(/js/compare/demo/demo-inline.html and /js/compare/demo/demo.html)
  7. Below are the format and examples.
  • In-line viewer :
http://Your_server:8080/js/compare/demo/demo-inline.html#/file/your_project/your_file
( e.g.  http://localhost:8080/js/compare/demo/demo-inline.html#/file/K/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-inline.html)
Howtogit--in-line-viewer.png
  • Side-by-side viewer(as planned , this viewer will become the merge editor):
http://Your_server:8080/js/compare/demo/demo.html#/file/your_project/your_file
( e.g.  http://localhost:8080/js/compare/demo/demo.html#/file/K/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-inline.html)
Howtogit--side-by-side-viewer1.png

Using Orion Git Status Page

Warning2.png
Work in progress
This scenario has not been fully implemented yet.

Please note that the section is currently used for developer's discussion.The UI shown below is the developer's UI mockup. The functionality is addressed in a high level.

Howtogit--git-status new.png

  1. Similiar to the compare viewer , the URL format of the git status page is : http://localhost:8080/git-status.html#/file/K/bundles/org.eclipse.orion.client.core/static/js/compare/.
    Here you pass the directory path to the html.The page will show you the git status under that directory.
  2. There will be an action somewhere in the navigator to open this page so that user does not have to input the directory as the hash.
  3. On the left hand , all the unstaged and staged changes are listed up in two areas.
  4. Clicking on any line will high-light it and the right hand side viewer will show the difference of that file against the Git repo.
  5. On the unstaged area , hovering on any line pops up two action buttons : compare and stage. The compare action navigates user to a side by side compare viewer. The stage action will stage the file represented by the line.
  6. On the staged area , hovering on any line pops up two action buttons : compare and unstage. The compare action navigates user to a side by side compare viewer. The unstage action will unstage the file represented by the line.
  7. The side by side viewer is planned to be upgraded to a compare merge editor post M6.

Git REST API

This section was moved to Orion/Server_API/Git_API.

Bugs, comments, feedback

If you experience any problems when following the steps above ping z4z4 or SzymonB on IRC (use #eclipse-orion channel), or open a new bug right away.