Bugzilla:Bzr: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
(Complete move to git)
 
(8 intermediate revisions by 3 users not shown)
Line 1: Line 1:
The Bugzilla Project uses the [http://bazaar.canonical.com/ Bazaar] Version-Control System. It is called "bzr" for short. You can see the contents of the Bugzilla bzr repository at [http://bzr.mozilla.org/bugzilla/ http://bzr.mozilla.org/bugzilla/].
The Bugzilla Project has [[Bugzilla:Git|moved to git]]. You should use Git for any updates you are making to your Bugzilla code. [http://bugzilla.readthedocs.io/en/latest/installing/migrating-from-bzr.html#migrating-from-bazaar Migration information] is available in the Bugzilla manual.
 
= Bzr For Users Of Other VCSes =
 
If you've used another Version Control System, there are [http://doc.bazaar.canonical.com/migration/en/survival/ guides for how to use Bzr based on your knowledge of that other system].
 
= Checking Code Out of Bzr =
 
The simplest way to get the latest Bugzilla development code is:
 
<pre>bzr co bzr://bzr.mozilla.org/bugzilla/trunk bugzilla</pre>
 
That will check out the "trunk" branch into a directory called "bugzilla". (If you leave out the "bugzilla" on the end, you'll get a directory called "trunk" instead.)
 
If you want other branches, replace "trunk" with the name of the branch. For example, to get the 3.6 branch, you'd do:
 
<pre>bzr co bzr://bzr.mozilla.org/bugzilla/3.6 bugzilla36</pre>
 
That will check out the "3.6" branch into a directory called "bugzilla36".
 
== Getting A Specific Release ==
 
Every time we release a version of Bugzilla, we "tag" the bzr repository so that the point in history that matches with that release can be explicitly checked out of the repository. For example, to check out Bugzilla 3.5.1, you would do:
 
<pre>bzr co -r tag:bugzilla-3.5.1 bzr://bzr.mozilla.org/bugzilla/trunk bz-3.5.1</pre>
 
That would check out Bugzilla 3.5.1 into a directory called "bz-3.5.1".
 
To see a list of all the tags available on a particular branch, just switch to the directory that you checked out into and do '''<code>bzr tags</code>'''.
 
== Checking Out Over HTTP ==
 
If for some reason you can't access port 4155 (which is what the bzr:// URLs are using) on bzr.mozilla.org (maybe you have a firewall at your company that prevents accessing unknown ports), you can check out the Bugzilla code using HTTP by just replacing "bzr://" in the above links with "http://", like this:
 
<pre>bzr co http://bzr.mozilla.org/bugzilla/trunk bugzilla</pre>
 
= Updating to a Newer Release =
 
There are two types of updates: updating from one minor release to another (like 3.4.1 to 3.4.2) and updating from one major release to another (like from 3.4.x to 3.6.x).
 
== Minor Updates ==
 
If you are just updating from one minor release to another (like from 3.4.1 to 3.4.4), all you have to do is change to your bugzilla directory and do:
 
bzr update -r tag:bugzilla-(version)
 
Where ''(version)'' is the version number that you want to update to, like <code>3.4.4</code>. So, for example, to update from 3.4.1 to 3.4.4, you would do:
 
bzr update -r tag:bugzilla-3.4.4
 
After running update, if bzr tells you there are any conflicts, you should edit those files and fix the conflicts.
 
== Major Updates ==
 
If you are updating from one ''major'' release to another (like from 3.4.x to 3.6.x), then the simplest method for upgrading is
 
bzr switch -r tag:bugzilla-(full version) bzr://bzr.mozilla.org/bugzilla/(major version)
 
Where ''(full version)'' is the whole version number you want to update to (like <code>3.6.1</code>) and ''(major version)'' is the first two numbers in the version (so, if you were updating to 3.6.1, the "major version" would be <code>3.6</code>.) So, for example, to update from 3.4.6 to 3.6.1, you would do:
 
bzr switch -r tag:bugzilla-3.6.1 bzr://bzr.mozilla.org/bugzilla/3.6
 
However, '''if you have committed customizations to your bugzilla directory using bzr commit --local, or used "bzr branch" to check out instead of "bzr checkout", "bzr switch" does not work and should not be used.''' Instead, you should follow the instructions at [[Bugzilla:Bzr:Porting_Forward_Customizations]].
 
= Creating Patches With Bzr =
 
See [[Bugzilla:Patches]] for information on how to produce patches in the format that the Bugzilla Project prefers.
 
If you just want to see what changes you've made to your checkout, there are a few useful commands that can help:
 
* '''<code>bzr status</code>''' will show all the files you've modified, added, renamed, or removed.
* If you have [http://wiki.bazaar.canonical.com/BzrTools bzrtools] installed, '''<code>bzr cdiff</code>''' shows a colorized "diff" of your changes, which is pretty handy and easier to read than plain-old "bzr diff".
 
= Checking In Using Bzr =
 
See [[Bugzilla:Committing_Patches]].
 
= Writing Patches On Top of Other Patches =
 
Since we require [[Bugzilla:Simple_Patches|simple patches]], you may often find yourself needing to write a patch "on top" of another patch that you just wrote and that hasn't been reviewed yet. One option is to wait until each small patch is reviewed, and only then write the next one. But that can get pretty slow. So instead of slowing down your development, a better option is to use [https://launchpad.net/bzr-loom bzr-loom], a plugin for bzr that allows you to have separate patches on top of an existing code base, and even keep them up-to-date easily as the upstream code base changes.

Latest revision as of 14:09, 5 August 2016

The Bugzilla Project has moved to git. You should use Git for any updates you are making to your Bugzilla code. Migration information is available in the Bugzilla manual.

Retrieved from "https://wiki.allizom.org/index.php?title=Bugzilla:Bzr&oldid=1142793"