Talk:Mercurial on Windows

From MozillaWiki
Jump to: navigation, search

This page has been designated as the all things mercurial page

It links to this Article and calls it Mercurial on Windows.

Alternative name is using Mercurial with MozillaBuild

Should get to the content here by

Some Mercurial documentation mercurial handbooks

Clarifications needed

  • 0 -- does MozillaBuild set a merge program?

  • 1

do we need to know anything from here to just build FF 3.1? (looks good for commits etc) or here

this page talks about other jazz like doing an hg init etc.

A) can we ignore the stuff on this page?

Is the above for folks doing work on both FF3.0 and 3.1?

  • 2

I would be nice to have a consistent use of terms or at least a cross reference working space, where is it - ? your system, aka local repository?

repositories for firefox

tip most changeset, the tip?

alternate names, synonyms and extensions applicable to mercurial

  • 3

hg view - web interface to your working space or repository or both

hgext.graphlog =
hgext.hgk =

change into your working space and type hg view

  • 4

how does it relate to Bonsai and Tinderbox?

Is this the (Bonsai) status for the repository?

  • 5
example output from a hg clone  
this is done to create a working directory  

$ hg clone mercurial-repo
requesting all changes
adding changesets
adding manifests
adding file changes
added 6623 changesets with 12734 changes to 911 files
updating working directory
796 files updated, 0 files merged, 0 files removed, 0 files unresolved

#to update your repository
#change to your working directory or local repository
hg pull -u 

#new minimal mozconfig
. $topsrcdir/browser/config/mozconfig
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../FireFox
mk_add_options MOZ_CO_PROJECT=browser

mk_add_options AUTOCONF=autoconf-2.13

There is a post on mozillazine

It looks good; however, the stuff about hg update is not applicable to the build, its more of working with your repository

Commit This looks to have good doc for developers making changes-> (looks good for commits etc) It needs updating

pull or push? merge

Clone, Commit, Merge

$ hg clone project project-work    # clone repository
$ cd project-work
$ <make changes>
$ hg commit
$ cd ../project
$ hg pull ../project-work   # pull changesets from project-work
$ hg merge                  # merge the new tip from project-work into our working directory
$ hg commit                 # commit the result of the merge

Add a section on user Customizations you might want

There is a system wide ini file


Developers will want to add a user ini file to at least specify a Uersname.

File Location (Windows)


File Contents [ui] username = John Doe <>

USERNAME is your Windows user name
\Documents and Settings\USERNAME\Mercurial.ini