Contributing with Bugzilla &

Hg
Aimed at Package Owners and Committers
October 2009
 Bugzilla: Tools & Docs
 Hg: Tools & Docs
 Centralized SCMs
 Distributed SCMs
 Common Hg
Operations
 Demo and Lessons
 Bugzilla

Copyright © 2009 Symbian Foundation. 2

 Bugzilla: Tools and Documents
 Web interface
 Bugs, Enhancements, Creating reports, Triaging, Assigning
 http://developer.symbian.org/bugs/enter_bug.cgi

 MyLyn and Tasktop {{#b

ugz
 Bugzilla integrated into your IDE |pro illa:
du
home ct=
 http://developer.symbian.org/wiki/index.php/Mylyn_and_TaskTop_for_use_with_Foundation_Bug
}} scre
en
 Bugzilla Mediawiki extension
 Embed bug reports into your wiki page
 http://www.mediawiki.org/wiki/Extension:Bugzilla_Reports
 http://developer.symbian.org/wiki/index.php/Media_Wiki_Test_Page

 Bugzilla Metrics
 Gather metrics about your bugs
 http://developer.symbian.org/bugtracker_metrics/

 Guidelines
 http://developer.symbian.org/wiki/index.php/Defect_Handling_Guidelines

Copyright © 2009 Symbian Foundation. 3

Copyright © 2009 Symbian Foundation.
 Mercurial: Tools
 Mercurial
 Installing, Configuring, Understanding
 http://developer.symbian.org/wiki/index.php/Mercurial_Quick_Start

 TortoiseHg
 TortoiseHg is a Windows shell extension and a series of
applications
 Integrates with file explorer
 All-inclusive Mercurial binary installer package for Windows

 Mercurial Eclipse
 Eclipse plug-in for Mercurial
 Seems to do almost everything that TortoiseHg does
 Have not tested in anger, so not sure how well it works
with
Carbide 2.0.x – not well documented
 http://www.vectrace.com/mercurialeclipse/ for download
 http://bitbucket.org/mercurialeclipse/main

Copyright © 2009 Symbian Foundation. 5

Mercurial: Key Documents
 Mercurial Books and Presentations
 Mercurial: The Definitive Guide - http://hgbook.red-bean.com/read/
 Ted Naleid: Distributed Version Control (DVCS) With Mercurial

 Common Mercurial operations

 clone, update, commit, pull, push, branch
 http://developer.symbian.org/wiki/index.php/Making_changes_with_Hg

 Contributing the code back to the Foundation

 Patches, FCLs, Bugzilla again, Package Owners, Kudos
 http://developer.symbian.org/wiki/index.php/Contributing_your_changes_with_

 Bigger changes
 Codelines, Features, Roadmaps, Projects, Community
 http://developer.symbian.org/wiki/index.php/Contribution_Process

Copyright © 2009 Symbian Foundation. 6

Centralized SCM

Checkout,
Add,
Remove,
Remote
Update,
Log, central
Commit, Repos
Merge, …

Build Server
Copyright © 2009 Symbian Foundation. 7
Distributed SCM

Toms
Repo
s
Add,
Remove,
Update, Robs Alices
Log, Repo Push, Pull Repo
Commit,
Diff, s s
Merge, …

Build
Clone of
Repo
Alices
s
Repo
Build Server s

Copyright © 2009 Symbian Foundation. 8

You need to think slightly
differently

Copyright © 2009 Symbian Foundation.

Clone an Existing Repository

Symbia
n Clone of Clone
Localof ./bt/.hg
Repo “bt” repo
“bt”
“bt”
Creates the
hg clone <repo> default “tip” of
the file system
https://developer.symbian.org/
sfl/MCL/sf/os/bt/
Local
This will also work file- ./bt/*
for a local copy on your system
filesystem!

Copyright © 2009 Symbian Foundation. 10

Pull down latest changes

Symbia
n Clone of ./bt/.hg
Repo hg pull “bt”
“bt”

Check: hg update
hg in

Pull: Local
hg pull file- ./bt/*
hg pull –u system
will do this in one go

Copyright © 2009 Symbian Foundation. 11

Now in a real-life Pull scenario

Symbia
n Clone of ./bt/.hg
Repo “bt”
“bt”
hg pull

hg update
hg commit
>> merge

Local
file- ./bt/*
system

Local
changes

Copyright © 2009 Symbian Foundation. 12

Push changes to another repo

Symbia
n Clone of ./bt/.hg
Repo “bt”
“bt”
hg push

hg commit

Local
file- ./bt/*
system

Local hg
changes • add
• remove
• addremove

Copyright © 2009 Symbian Foundation. 13

Patches: Export and Import
./bt/.hg ./bt/.hg

Clone of Clone of Contributor

“bt” hg export
“bt”
hg push

Patch
file
./bt/* hg import ./bt/*
-m ...
Local Local
file- file-
system system

PkO

Copyright © 2009 Symbian Foundation. 14

Patches and Mercurial Queues

Copyright © 2009 Symbian Foundation.

 DEMO

Copyright © 2009 Symbian Foundation. 16

Think slightly differently -
revisited

Copyright © 2009 Symbian Foundation.