The Linux Foundation

 
Bazaar

From The Linux Foundation

(Difference between revisions)
(Speed)
(Remove old Issues section.)
(13 intermediate revisions by 2 users not shown)
Line 1: Line 1:
 
= Bazaar =
 
= Bazaar =
  
Bazaar (or "bzr") is in the process of replacing CVS as the LF's preferred [[Version Control]] system.  Bazaar was previously known as Bazaar-NG (to distinguish it from the older Bazaar project (or "baz"); most of the pages on this wiki still call it Bazaar-NG. [[Mercurial]] (or "hg") was also seriously considered.
+
Bazaar (or "bzr") is the [[Version Control]] system in use by several workgroups at the Linux Foundation.   
 +
 
 +
Bazaar was previously known as Bazaar-NG (to distinguish it from the older Bazaar project (or "baz"); most of the pages on this wiki still call it Bazaar-NG.
  
 
== Getting Started ==
 
== Getting Started ==
  
Bazaar-NG is available in several distributions, although most of them currenly provide an older version.  Access to the LF's repositories requires bzr 0.8 or higher.
+
Bazaar is available in nearly all recent distributions.  Access to the LF's repositories requires bzr 2.0 or higher.
 
+
=== LSB Package ===
+
 
+
A package for bzr exists that aims at LSB compliance, depending only on lsb-python in the Application Battery.  It includes bzr itself, its dependencies, and a few useful plugins.  A package for bazaar 0.14 is available here:
+
 
+
* lsb-bzr for [http://www.linux-foundation.org/~mats/lsb-bzr-0.14-1.lsb3.i486.rpm ia32], [http://www.linux-foundation.org/~mats/lsb-bzr-0.14-1.lsb3.x86_64.rpm x86_64]
+
* Older versions available if needed:
+
** 0.13: [http://www.linux-foundation.org/~mats/lsb-bzr-0.13-1.lsb3.i486.rpm ia32], [http://www.linux-foundation.org/~mats/lsb-bzr-0.13-1.lsb3.x86_64.rpm x86_64]
+
** 0.12: [http://www.linux-foundation.org/~mats/lsb-bzr-0.12-1.lsb3.i486.rpm ia32],[http://www.linux-foundation.org/~mats/lsb-bzr-0.12-1.lsb3.x86_64.rpm x86_64]
+
* lsb-python for [http://ftp.linux-foundation.org/pub/lsb/app-battery/released-3.1.0/ia32/lsb-python-2.4.3-3.lsb3.i486.rpm ia32], [http://ftp.linux-foundation.org/pub/lsb/app-battery/released-3.1.0/amd64/lsb-python-2.4.3-3.lsb3.x86_64.rpm x86_64]
+
  
Please request additional architectures on the mailing list.
+
=== Prebuilt Bazaar ===
  
=== Installing Base Software ===
+
Prebuilt binaries are available for a number of platforms via the [http://wiki.bazaar.canonical.com/Download Bazaar download page].
  
Users of Fedora Core 5, Debian "etch", or Ubuntu "Dapper" can use their distribution's version of bzr.  For Debian 3.1 ("sarge"), a [http://backports.org/package.php?search=bzr backport] is available.
+
=== Installing from Source ===
The bzr project also maintains a list of available bzr ports at [http://bazaar-vcs.org/DistroDownloads their distro downloads page].  There may be more up-to-date information on availability.  Remember that the LF repositories require bzr 0.8 or higher.
+
  
If a packaged version won't work or doesn't exist, the current version of bzr can be downloaded from [http://bazaar-vcs.org/Download the Bazaar-NG download page].  It requires Python 2.4 and the [http://effbot.org/zone/element-index.htm ElementTree] and [http://effbot.org/zone/celementtree.htm cElementTree] modules at minimum.  To use the "sftp" method of talking to external repositories, the [http://www.lag.net/paramiko/ paramiko] and [http://www.amk.ca/python/code/crypto.html pycrypto] modules are required.
+
The current version of bzr can be downloaded from [http://wiki.bazaar.canonical.com/SourceDownloads the Bazaar download page].  It requires Python 2.4 and the [http://effbot.org/zone/element-index.htm ElementTree] and [http://effbot.org/zone/celementtree.htm cElementTree] modules at minimum; the latter two modules are a part of Python 2.5 or later.  To use the "sftp" method of talking to external repositories, the [http://www.lag.net/paramiko/ paramiko] and [http://www.amk.ca/python/code/crypto.html pycrypto] modules are required.
  
If you do need to build an alternative version of Python to support these packages (some distributions can't upgrade the system version from 2.3), make sure to use that version when installing them. For example, if you built Python 2.4 and installed it as <code>/usr/local/bin/python24</code> make sure you install the modules by running <code>python24 setup.py install</code>.
+
Bazaar's source tree is set up so it can be used easily without installing if necessary. Just run the "bzr" executable at the root of the source tree.
  
 
=== Installing Plugins ===
 
=== Installing Plugins ===
  
[http://bazaar-vcs.org/BzrPlugins Plugins] are add-on code modules which extend bzr, enhancing current features and adding new ones.
+
[http://wiki.bazaar.canonical.com/BzrPlugins Plugins] are add-on code modules which extend bzr, enhancing current features and adding new ones.
  
Distributions which package bzr itself often package plugins as well; search for a "bzrtools" package to see.  For unpackaged plugins, the bzr site has [http://bazaar-vcs.org/BzrPlugins good installation instructions].
+
Distributions which package bzr itself often package plugins as well; search for a "bzrtools" package to see.  For unpackaged plugins, the bzr site has [http://doc.bazaar.canonical.com/plugins/en/ good installation instructions].
  
One plugin in particular used at the LF is "tags".  You must have this plugin installed to access tagging information in our repositories, or to add new tags.  See the [[Bazaar-NG Tags]] page for more details.
+
One plugin that looks useful for projects (such as LSB) which have multiple repositories is the "update-mirrors" plugin. With this plugin, a single command "bzr update-mirrors" in a directory that holds branches of multiple repositories can do the effect of a "bzr pull" on each.
 
+
Another plugin that looks useful for projects (such as LSB) which have multiple repositories is the "update-mirrors" plugin. With this plugin, a single command "bzr update-mirrors" in a directory that holds branches of multiple repositories can do the effect of a "bzr pull" on each.
+
  
 
=== Initial Setup ===
 
=== Initial Setup ===
  
(modified from [[http://bazaar-vcs.org/IntroductionToBzr]]):
+
(modified from [[http://doc.bazaar.canonical.com/bzr.dev/en/tutorials/tutorial.html here]]):
  
 
One function of a version control system is to keep track of who changed what. In a decentralized system, that requires an identifier for each author that is globally unique. Most people already have one of these: an email address. Bzr will auto-generate an email address by looking up your username and hostname, but this is only right if you always run bzr from the same machine and don't use a different email address as your identifier (such as @linux-foundation.org). We need a user's commits to have the same identifier over time!  Here are some options:
 
One function of a version control system is to keep track of who changed what. In a decentralized system, that requires an identifier for each author that is globally unique. Most people already have one of these: an email address. Bzr will auto-generate an email address by looking up your username and hostname, but this is only right if you always run bzr from the same machine and don't use a different email address as your identifier (such as @linux-foundation.org). We need a user's commits to have the same identifier over time!  Here are some options:
  
 
<ol>
 
<ol>
 +
<li><p>Set an email address via bzr whoami. This is the simplest way.</p>
 +
 +
<p>To set a global identity, use:</p>
 +
 +
<pre>
 +
% bzr whoami "Your Name <email@example.com>"
 +
</pre>
 +
If you’d like to use a different address for a specific branch, enter the branch folder and use:
 +
<pre>
 +
% bzr whoami --branch "Your Name <email@example.com>"
 +
</pre>
 +
</li>
 
<li>Set the email address in the ~/.bazaar/bazaar.conf by adding the following lines. Please note that [DEFAULT] is case sensitive:
 
<li>Set the email address in the ~/.bazaar/bazaar.conf by adding the following lines. Please note that [DEFAULT] is case sensitive:
 
<pre>
 
<pre>
Line 65: Line 66:
 
== Documentation ==
 
== Documentation ==
  
We document our use of bzr in several places: [[Bazaar-NG User Branches]], [[Bazaar-NG Patch Queue Manager]], [[Bazaar-NG Tags]].
+
The [http://doc.bazaar.canonical.com/ Bazaar documentation site] has lots of useful info, although not specific to our usage.
  
CVS wizards may (or may not) benefit from [[Bazaar-NG For CVS Users]].
+
CVS wizards may (or may not) benefit from [http://wiki.bazaar.canonical.com/BzrForCVSUsers BzrForCVSUsers].
 
+
The [http://bazaar-vcs.org/ Bazaar-NG Web site] has lots of useful info, although not specific to LF usage.  In particular, the following links are useful:
+
 
+
* [http://bazaar-vcs.org/Installation Installation]
+
* [http://bazaar-vcs.org/IntroductionToBzr Introduction to Bzr]
+
* [http://bazaar-vcs.org/QuickHackingWithBzr Quick Hacking with Bzr]
+
* The [http://bazaar-vcs.org/BzrFAQ FAQ]
+
  
 
== Repositories ==
 
== Repositories ==
Line 94: Line 88:
 
The webserve interface in the browser has links to the repository that work.
 
The webserve interface in the browser has links to the repository that work.
  
=== Migration Status ===
+
== Commit Access ==
  
At the moment, only the OpenPrinting, LSB development, and unofficial repositories are live; the rest are still being managed in CVS.  These bzr repositories are synchronized with CVS nightlyThey can be branched, modified, and merged through the [[Bazaar-NG Patch Queue Manager]], but any merges will be overwritten nightly when CVS changes are pulled in.
+
In general, you do not need commit access to contribute.  Instead, branch from our read-only repositories, and send changes using "bzr send"Changes can be sent to the [http://lists.linuxfoundation.org/mailman/listinfo/lsb-discuss lsb-discuss mailing list].
  
So, for those projects which are still being synchronized with CVS, the proper place to make real changes is still CVSMerging changes with these projects is still possible, but only as a test of the merge process.
+
People with a history of contributing to the LSB can request commit access.  To do this, first set up an account on [http://www.linuxfoundation.org/ the main Linux Foundation site].  Then, make a request to us via the mailing list or IRCBe sure to include your LF user ID.
 +
 
 +
Once commit access is granted, read-write branches can be checked out over HTTPS, using your username and the 'https+urllib:' URL type. For example, to check out the devel version of misc-test as user "foo", you'd use the following URL:
  
When a project switches to bzr, the CVS repository will become read-only, the following error message will appear on attempted checkins:
 
 
<pre>
 
<pre>
cvs commit: Pre-commit check failed
+
https+urllib://foo@bzr.linuxfoundation.org/lsb/devel/misc-test
cvs [commit aborted]: correct above errors first!
+
 
</pre>
 
</pre>
Note that at this time, migrated repositories do not sync back to cvs XXXX
 
 
== Issues with Bazaar-NG ==
 
 
=== Speed ===
 
 
By far, the biggest problem with bzr is its speed, particularly at doing the initial checkout.  During the trial (in the bzr 0.8.x timeframe), the initial checkout of the "build_env" repositiory was timed to take as long as 25 minutes, and others have reported even longer times.  Local operations, and updates after the initial checkout, are much faster.
 
 
The bzr developers have blamed this on an initial focus on correctness and functionality, rather than speed.  Optimizing bzr is a primary goal of bzr development leading towards 1.0. There have been noticable speed improvements in subsequent releases to where 0.14 didn't feel anywhere near as slow (but specific timing tests have not been repeated).
 
 
An automated tarball download feature has been implemented through the webserve.  In the changelog mode, there is a "download" link, which will create and send a tarball to the user consisting of the .bzr directory of the repository.  This can be made into a working copy by untarring the tarball, changing into the root of the resulting tree, and running "bzr revert".  After this, the directory is functionally identical to a tree created with "bzr branch". This will likely ALWAYS be faster for initial branch creation.
 
 
=== Project Reorganization ===
 
 
It's been [http://lists.linux-foundation.org/pipermail/lsb-core/2006-May/000779.html pointed out] that bzr does not allow the checking out of subdirectories alone; you must check out the entire branch.  Thus, it may not make sense to lump as many of the sub-projects together as they are currently organized in CVS.
 
 
=== Commit Rights ===
 
 
With CVS, since it is very difficult to maintain a local branch, pretty much anyone who did serious development on the LSB was granted commit rights.  With bzr, since each branch is local, that's no longer needed.  Thus, many fewer developers need commit rights.  The problem then becomes: how do we get changes made by individual developers back into the main tree?
 
 
We are planning to use an approach the bzr developers also use: an add-on for bzr called a "patch queue manager".  Under this approach, maintenance of the official main tree is automated to some degree.  Development is done on local branches, which are then made available online, and a request for a merge is submitted via a web interface, linked to from the bzr-webserve browser interfaces (via the "merge" link).
 
 
Access to PQM requires authentication.  Access to merge patches is granted on a per-workgroup basis.
 
 
For more information, see the [[Bazaar-NG Patch Queue Manager]] page.
 
 
=== User Branches ===
 
 
Without CVS as a method of distributing patches through the official tree, we will need some other means of making new development available.  Allowing users to publish their bzr branches on an LF site is the best way for this to happen.  The question, of course, is how to best do this.
 
 
The current trial has a "unofficial" section for user branches.  For more information on how they work, see [[Bazaar-NG User Branches]].
 
 
=== Tags ===
 
 
As of 0.8.x, bzr does not have a native tagging facility.  [http://bazaar-vcs.org/BzrTagging This page] explains the proposals for adding tags to bzr.  In the short term, Martin Pool has recommended to us that we use the [http://michael.ellerman.id.au/bzr/plugins/tags/ tags plugin] ([http://bzr.freestandards.org/unofficial/bzr-tags local branch]), which gives us approximately what [[Mercurial]] tags give us.  See the [[Bazaar-NG Tags]] page for more details.
 
 
=== Other Problems ===
 
 
If you notice other issues, please add them to the wiki, or discuss them on the Discussion page if you prefer.
 

Revision as of 20:57, 13 December 2012

Contents

Bazaar

Bazaar (or "bzr") is the Version Control system in use by several workgroups at the Linux Foundation.

Bazaar was previously known as Bazaar-NG (to distinguish it from the older Bazaar project (or "baz"); most of the pages on this wiki still call it Bazaar-NG.

Getting Started

Bazaar is available in nearly all recent distributions. Access to the LF's repositories requires bzr 2.0 or higher.

Prebuilt Bazaar

Prebuilt binaries are available for a number of platforms via the Bazaar download page.

Installing from Source

The current version of bzr can be downloaded from the Bazaar download page. It requires Python 2.4 and the ElementTree and cElementTree modules at minimum; the latter two modules are a part of Python 2.5 or later. To use the "sftp" method of talking to external repositories, the paramiko and pycrypto modules are required.

Bazaar's source tree is set up so it can be used easily without installing if necessary. Just run the "bzr" executable at the root of the source tree.

Installing Plugins

Plugins are add-on code modules which extend bzr, enhancing current features and adding new ones.

Distributions which package bzr itself often package plugins as well; search for a "bzrtools" package to see. For unpackaged plugins, the bzr site has good installation instructions.

One plugin that looks useful for projects (such as LSB) which have multiple repositories is the "update-mirrors" plugin. With this plugin, a single command "bzr update-mirrors" in a directory that holds branches of multiple repositories can do the effect of a "bzr pull" on each.

Initial Setup

(modified from [here]):

One function of a version control system is to keep track of who changed what. In a decentralized system, that requires an identifier for each author that is globally unique. Most people already have one of these: an email address. Bzr will auto-generate an email address by looking up your username and hostname, but this is only right if you always run bzr from the same machine and don't use a different email address as your identifier (such as @linux-foundation.org). We need a user's commits to have the same identifier over time! Here are some options:

  1. Set an email address via bzr whoami. This is the simplest way.

    To set a global identity, use:

    % bzr whoami "Your Name <email@example.com>"
    

    If you’d like to use a different address for a specific branch, enter the branch folder and use:

    % bzr whoami --branch "Your Name <email@example.com>"
    
  2. Set the email address in the ~/.bazaar/bazaar.conf by adding the following lines. Please note that [DEFAULT] is case sensitive:
    [DEFAULT]
    email = Your Name <email@isp.com>
    
  3. Override the previous setting on a branch by branch basis by creating a branch section in ~/.bazaar/branches.conf by adding the following lines:
    [/the/directory/to/the/branch]
    email = Your Name <email@isp.com>
    
  4. Override the two previous options by setting the global environment variable $BZREMAIL or $EMAIL ($BZREMAIL will take precedence) to your full email address.

Documentation

The Bazaar documentation site has lots of useful info, although not specific to our usage.

CVS wizards may (or may not) benefit from BzrForCVSUsers.

Repositories

All LF repositories are available at the following URL:

http://bzr.linux-foundation.org/

The repository is browseable, and has roughly the same functionality as cvsweb. Unofficial user branches are stored in "unofficial"; official branches from the workgroups are stored in a workgroup directory, with released and development versions in subdirectories.

To check out a copy:

bzr branch http://bzr.linux-foundation.org/unofficial/(project) (localdir)

or:

bzr branch http://bzr.linux-foundation.org/lsb/3.1/(project) (localdir)

The webserve interface in the browser has links to the repository that work.

Commit Access

In general, you do not need commit access to contribute. Instead, branch from our read-only repositories, and send changes using "bzr send". Changes can be sent to the lsb-discuss mailing list.

People with a history of contributing to the LSB can request commit access. To do this, first set up an account on the main Linux Foundation site. Then, make a request to us via the mailing list or IRC. Be sure to include your LF user ID.

Once commit access is granted, read-write branches can be checked out over HTTPS, using your username and the 'https+urllib:' URL type. For example, to check out the devel version of misc-test as user "foo", you'd use the following URL:

https+urllib://foo@bzr.linuxfoundation.org/lsb/devel/misc-test

[Article] [Discussion] [View source] [History]