Skip to main content

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

Jump to: navigation, search

Difference between revisions of "OSEE/Workspace Setup"

(Git common configuration (in a file))
(Git Commands)
Line 103: Line 103:
 
=== Git Commands ===
 
=== Git Commands ===
 
* '''Using stash'''
 
* '''Using stash'''
  git stash
+
  git stash save <message>
 
  git stash list
 
  git stash list
 
  git stash show -p stash@{0}
 
  git stash show -p stash@{0}

Revision as of 13:22, 24 August 2010

This guide describes how to set up an Eclipse workspace to develop OSEE.

Downloading and Configuring Eclipse

See the PDE Build Guide for information on how to download and configure Eclipse. The SVN PDE Build Extension plugin can be skipped.

SVN Checkout

Download and import the relevant (client or application server) OSEE Team Project Set file frrom https://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk/plugins/org.eclipse.osee.support.config/projectSets/ into your workspace.

In Eclipse, open the SVN Repository perspective and check out https://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk/. The username and password can be left blank for anonymous read-only access.

Configure a Development Runtime

Using an SVN client such as Subversive, check out into your Eclipse workspace all the projects from https://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk/. When configuring this SVN repository leave the user name and password blank in order to get anonymous, read-only access.

  1. Follow the PostgreSQL installation instructions.
  2. Use the configuration /org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch to run an OSEE application server
  3. Use the configuration /org.eclipse.osee.ats.config.demo/MasterTestSuite_DemoDbInit.launch to initialize an OSEE database
  4. Use the configuration /org.eclipse.osee.ats.config.demo/MasterTestSuite_DemoDbPopulate.launch to populate the database for demonstration purposes
  5. Use the configuration /org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost].launch to run a local OSEE client

Working with Git

This guide explains how to set up a local OSEE source repository using Git. When you complete it, you will have an Eclipse workspace populated with the OSEE projects from your Git working directory, with full tool support from both the EGit plugin and the original command-line git.

Installing Git on Windows

  1. Download the full installer for the latest version of msysGit.
  2. Run the installer, using the default settings.
  3. Open Git Bash and run the following commands:
    1. git config --global user.email my_committer_email@address.com
    2. git config --global user.name "Committer Name"
    3. git config --global http.proxy "proxy_url:proxy_port" (if you have a proxy)
  4. Create a clone of the OSEE repository.
    1. git clone ssh://rbrooks@git.eclipse.org/gitroot/osee/org.eclipse.osee.git

Installing EGit

Install the latest stable versions of EGit and JGit from this update site.

Setting up a workspace

  1. Create a new Eclipse workspace.
  2. File > Import... > Existing Projects into Workspace
  3. As the root directory, select the plugins folder in the OSEE repository.
  4. Select all projects.
  5. Do not copy the projects into the workspace.
  6. Finish the import.

Git common configuration (in a file)

[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
hideDotFiles = dotGitOnly
autocrlf = false
[svn-remote "svn"]
url = https://dev.eclipse.org/svnroot/technology/org.eclipse.osee
fetch = trunk:refs/remotes/trunk
branches = branches/*:refs/remotes/*
tags = tags/*:refs/remotes/tags/*
[apply]
whitespace = fix
[diff]
renames = copy
[merge]
conflictstyle = diff3
[alias]
s = status
c = commit
co = checkout
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
cpnx = cherry-pick --no-commit -x
rhh = reset --hard HEAD
#fixes launchers
fl = checkout -- *launch
[user]
name = Gallus Anonymus
email = GallusAnonymus@your_email.com
[guitool "git stash pop"]
cmd = git stash pop
[guitool "git stash"]
cmd = git stash
[guitool "git svn rebase"]
cmd = git svn rebase

You can save the following in a .git/config_file and load it in with:

git config --file -- .git/config_file

Connecting to the Git repository

  1. Highlight all of the projects just imported from the repository.
  2. Right click and select Team > Share Project... (not Share Projects..., which is provided by SVN)
  3. Select Git as the repository type; click Next.
  4. Highlight all the lines displayed in the combo box (Ctrl+A).
  5. Click Finish.

Git Commands

  • Using stash
git stash save <message>
git stash list
git stash show -p stash@{0}
git stash drop stash@{0}
git stash pop
  • Show changes
git show --name-only HASH path
git diff HASH

Compare two commits:

git diff OLDHASH NEWHASH


  • Undo
git rebase -i HEAD~5
git reset --hard HEAD

To replace with incoming file so you can re-make your changes (or abandon them):

git checkout --[theirs|our] <path>
  • Git Log

View history for a given path even if it has been moved/renamed:

git log --follow [current path]

View current branch activity:

git log --name-only HASH
git lg | head

Show full history even with removed commits

git reflog show [log-options] master


  • Branching and Merging
git checkout -b newLocalBranchName existingBranch

i.e.

git checkout -b 91 remotes/MS_0_9_1_20100111 

creates a local tracking branch called 91

Switch branches:

git checkout [master|94|...]

Merge onto current branch:

git merge branch
git rebase --continue

Generating individual patches (one per commit) to submit by email (or bug report):

git format-patch -o ../ trunk..HEAD 

will export all commits made to current branch, from trunk to HEAD.

-o ../ 

will put them one level above in individual .patch files

Git Resources

Locations of all OSEE bundles

Git org.eclipse.osee

  • git: /org.eclipse.osee/features/*
  • git: /org.eclipse.osee/plugins/*
  • git: /org.eclipse.osee/releng/*

Orbit Release Engineering Bundles

 host:  dev.eclipse.org
 Repository path: /cvsroot/tools
 connection type:  extssh
  • org.eclipse.orbit/org.eclipse.orbit.build.feature.set1
  • org.eclipse.orbit/org.eclipse.orbit.releng

SWT Nebula Bundles

 host:  dev.eclipse.org
 Repository path: /cvsroot/technology
 connection type:  pserver
 user:  anonymous
  • /cvsroot/technology/org.eclipse.swt.nebula/org.eclipse.nebula.widgets.xviewer

OSEE Website

 host:  dev.eclipse.org
 Repository path: /cvsroot/org.eclipse
 connection type:  extssh

Back to the top