Difference between revisions of "Software Repository"

From edegan.com
Jump to navigation Jump to search
imported>Harsh
imported>Harsh
Line 42: Line 42:
 
* to checkout code from remote repository, use the <code><big>git clone</big></code> command. This will create a local repository on your disk as well as download the source code of the project you wish to work on. Here's an example:
 
* to checkout code from remote repository, use the <code><big>git clone</big></code> command. This will create a local repository on your disk as well as download the source code of the project you wish to work on. Here's an example:
 
<div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git clone http://128.42.44.182/codebase/Matcher.git</big></code></div>
 
<div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git clone http://128.42.44.182/codebase/Matcher.git</big></code></div>
 +
 +
* to update your repository to include others' work in your project use the <code><big>git update</big></code> command. Its always a good practice to update your code before you commit to ensure that others' code doesn't break yours. Also, you cannot push to remote unless your local repository is up to date. If you commit on a stale local repository that is fine, just that this would mean you are likely to have more trouble merging your code with others later on thanks to all the conflicts that you'll face when you actually try to update your repository later. See example:
 +
<div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git update <optional folder path></big></code></div>
  
 
* to commit your changes to your local repository use the <code><big>git commit</big></code> command. Committing your changes is an essential step whether you are adding/removing items from the repository or changing existing items. See example :
 
* to commit your changes to your local repository use the <code><big>git commit</big></code> command. Committing your changes is an essential step whether you are adding/removing items from the repository or changing existing items. See example :
Line 47: Line 50:
  
 
* to push your changes to remote repository use the <code><big>git push</big></code> command. Whatever you need to be pushed to the server must be committed to your local repository first. See example:
 
* to push your changes to remote repository use the <code><big>git push</big></code> command. Whatever you need to be pushed to the server must be committed to your local repository first. See example:
 +
 +
* to add new files to your repository use the <code><big>git add</big></code> command. After that you must commit to ensure that your repository actually has the new file. See example:
 +
<div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git add <filename></big></code></div>
  
 
* to add new files to your repository use the <code><big>git add</big></code> command. After that you must commit to ensure that your repository actually has the new file. See example:
 
* to add new files to your repository use the <code><big>git add</big></code> command. After that you must commit to ensure that your repository actually has the new file. See example:

Revision as of 18:10, 6 May 2016

Background

Given the amount of software that has been written by past computer science interns and more being written, we felt the need to have some kind of source code management system put into place so that developers can work without ever being in fear of breaking production and facing Ed's wrath (you do not want that dude angry! Wherever you go, he will find you! No escape.).

To enforce efficient source control we(Ed) chose to host our own git server on the RDP machine using Bonobo Git Server that makes use of the windows IIS platform and is open source.

Installing Bonobo git server is pretty simple:

  • dowload the zip file from the Bonobo website.
  • extract its contents. It should be a single folder containing directories like App_Data, bin etc.
  • rename that folder to anything you want. I used the name "codebase"
  • copy the codebase folder to C:\inetpub\wwwroot\
  • Allow IIS User to modify C:\inetpub\wwwroot\codebase\App_Data folder. To do so:
    • select Properties of App_Data folder,
    • go to Security tab,
    • click edit,
    • select IIS user (in my case IIS_IUSRS) and add Modify and Write permission,
    • confirm these settings with Apply button.
  • Convert codebase to Application in IIS
    • Run IIS Manager and navigate to Sites -> Default Web Site. You should see Bonobo.Git.Server.
    • Right click on 'codebase' and convert to application.
    • Check if the selected application pool runs on .NET 4.0 and convert the site.
  • Enable Anonymous Authentication in IIS and disable the others. To do so, select the application in the left pane, double-click on the authentication icon in the right pane and set the value to of Anonymous Authentication to Enabled
  • Launch your browser and go to http://localhost/codebase. Now you can see the initial page of the Bonobo Git Server and everything should work.
    • default credentials are username: admin, password: admin

Our Git Server

We have already done the set up of the git server on the RDP machine. Here are the admin credentials:

  • Username: boss
  • Name: Ed
  • Surname: Egan
  • Email: Edward.Egan@rice.edu
  • Password: you_seriously_thought_Id_write_that_in_here??

To access this from your computer and not the RDP you can go to http://128.42.44.182/codebase where it will prompt you for your username and password.

Quick and dirty github tutorial

  • Installing - Depending on your operating system you can install git in three different ways:
    • If you are a windows or a mac user user, you can simply download & install the latest release from git scm website
    • If you use ubuntu then all you need to do is type sudo apt-get install git
  • Check your installation by typing git in terminal or windows powershell
  • Basic git operations:
  • to checkout code from remote repository, use the git clone command. This will create a local repository on your disk as well as download the source code of the project you wish to work on. Here's an example:
  • to update your repository to include others' work in your project use the git update command. Its always a good practice to update your code before you commit to ensure that others' code doesn't break yours. Also, you cannot push to remote unless your local repository is up to date. If you commit on a stale local repository that is fine, just that this would mean you are likely to have more trouble merging your code with others later on thanks to all the conflicts that you'll face when you actually try to update your repository later. See example:
git update <optional folder path>
  • to commit your changes to your local repository use the git commit command. Committing your changes is an essential step whether you are adding/removing items from the repository or changing existing items. See example :
git commit -m "mandatory commit message"
  • to push your changes to remote repository use the git push command. Whatever you need to be pushed to the server must be committed to your local repository first. See example:
  • to add new files to your repository use the git add command. After that you must commit to ensure that your repository actually has the new file. See example:
git add <filename>
  • to add new files to your repository use the git add command. After that you must commit to ensure that your repository actually has the new file. See example:
git add <filename>