Difference between revisions of "Mercurial"

From Octave
Jump to navigation Jump to search
Line 129: Line 129:
   <li> pull from the main repository<br/>
   <li> pull from the main repository<br/>
   <code>hg pull http://www.octave.org/hg/octave</code></li>
   <code>hg pull http://www.octave.org/hg/octave</code></li>
   <li> pull from the main repository<br/>
   <li> move to the top of the main line of development and merge in the feature branch<br/>
   <code>hg pull http://www.octave.org/hg/octave</code></li>
   <code>hg up -r @</code><br/>
  <code>hg merge -r </code><br/>
   </ol> </li>
   </ol> </li>

Revision as of 21:36, 15 August 2013

wikipedia:Mercurial (sometimes referred to as hg) is the version control tool used by Octave. This page contains some helpful commands to use when interacting with the GNU Octave mercurial repository.


When you do not have push permissions to the repository (you cannot add your changes using mercurial itself) and you have a modification to the current GNU Octave code, you have to generate a patch (or changeset) so developers with permissions can include them in the code. The overview of the process is as follows

  1. Change the code and test that your changes do work (write tests, that's the best!).
  2. Create the changeset (instructions below).
  3. Post your patch in the Patch tracker.

Before starting

The way patches are generated uses an extension of mercurial and therefore you need to prepare your .hgrc file to use it. If you do not have a .hgrc file, just create one in your home directory. In Windows, this is something like "C:\Documents and Settings\your_name\Mercurial.ini"

Add the following code to that file:

hgext.mq =
hgext.pager =
color =

pager = LESS='FSRX' less
attend = help, annotate, cat, diff, export, glog, log, qdiff, status, outgoing, incoming

## Colours I like
status.modified = magenta bold
status.added = green bold
status.removed = red bold
status.deleted = cyan bold
status.unknown = gray  bold
status.ignored = gray bold

The only part that is important is the extensions. The rest is to make hg behave in a fancy way (recommended).

Creating changesets with hg

Simple way

  • Update to the latest revision.
 hg up 
 hg ci 
  • Export the modifications.
 hg export -r tip -o mypatch.patch 
  • Save the output to a file and upload it tot he patch tracker.

Using the MQ extension

In the repository you can start a patch by doing

hg qnew mychangeset

You can further edit your files... if you do, you need your patch to know about these changes. To do that execute

hg qrefresh

Once you think you have all the changes that make your patch complete you can export your patch

hg qdiff > mychangeset.patch

Now you can do (at least) two things

  • Apply your patch to your copy (it will differ form the repository and you will have to merge somehow...). To do it run
hg qfinish tip
  • Forget the changes and go back to the unpatched version of the code.
hg qrefresh
hg qpop
hg qfinish tip

The file mychangeset.patch contains your changes.

Mercurial Tips for SoC students

This section is meant to provide tips for SOCIS or GSoC students working on new Octave features.

Students should publish their work as it progresses in a public repository merging regularly the main savannah repository to facilitate merging back their code at the end of the project.

Here are some useful hg commands that can be used to do this.

Getting started

  1. Clone the main Octave repository at savannah:
    hg clone http://www.octave.org/hg/octave
  2. Create a new bookmark:
    hg bookmark student-bookmark-name
  3. Make the bookmark visible in the public repo, assuming the public repo is at public.server.org/octave
    hg push --bookmark ssh://student@public.server.org/octave

Staying up-to-date with the main savannah repository

As the students development proceeds, the savannah repository gets updated, too. To avoid having the two branches diverging too much, which can lead to conflicts when the final merge is done, students should keep their public repo up-to-date with the recent changes, the following commands can be used for this:

  1. Download new changes from the main line of development
    hg pull http://www.octave.org/hg/octave
  2. Merge the main line of development into the feature branch
    hg up -r student-bookmark-name
    hg merge @
  3. Apply the change and publish it
    hg commit -m "periodic merge of default branch into my branch"
    hg push ssh://student@public.server.org/octave

Preparing for code reviews

At the time of the mid-term or final review (or whenever the mentor requires it) students should prepare their code for review and possibly inclusion into the main development branch. To this end students should:

  1. prepare a full log of their changes, listing files that have been touched and including a summary of the purpose of those changes. If students have been following the Commit message guidelines the following command will give a good starting point
    hg log --style=changelog --no-merges --user student-name
    this message should be edited so that
    1. each touched file appears only once
    2. changes that were backed out should not be mentioned

    The main purpose of this log is to make it easy, not only for the main mentor, but also for other developers who have not been closely following the progress of the project to quickly understand where to look at in the code to evaluate it, but it will also be used as the commit message for the merge changeset, so it should itself comply with the Commit message guidelines.

  2. prepare a merge changeset including all the code that should be submitted for review
    1. pull from the main repository
      hg pull http://www.octave.org/hg/octave
    2. move to the top of the main line of development and merge in the feature branch
      hg up -r @
      hg merge -r

Mercurial Tips for SoC mentors

Will fill in this section after trying out the above procedure at least once with a student and actually pushing his changes to the main repo.