How to work with bazaar through the GUI on Windows: Difference between revisions

From OpenPetra Wiki
Jump to navigation Jump to search
m (→‎Get the files: browse code online)
(Replaced content with "We are not using Bazaar anymore, but Git.")
Tag: Replaced
 
(66 intermediate revisions by 5 users not shown)
Line 1: Line 1:
= Alternative: use Bazaar from the command line =
We are not using Bazaar anymore, but Git.
If the GUI is not your prefered way of doing things, please see [[How to work with bazaar on the command line]]
 
= Download Bazaar for Windows =
You find the downloads for Bazaar for Windows here: http://wiki.bazaar.canonical.com/WindowsDownloads
 
We currently recommend to use the Standalone 2.2 Stable Release. This includes the core Bazaar distribution and several GUIs for Bazaar.
 
We have noticed that the german translation is not complete at all, and on German Windows systems the GUI is quite mixed up with several languages. Solution: delete all but the en locale directory from C:\Program Files\Bazaar\locale.
 
See also [http://doc.bazaar.canonical.com/explorer/en/visual-tour-windows.html Visual Tour of Bazaar Explorer on Windows].
 
== Resolve plink annoyances ==
If you get annoyed by all the plink console windows: It seems, Bazaar is still using the default Putty version of plink, which always shows a console window. TortoiseSVN eg. uses TortoisePLink.exe, which is a modified version of plink, that runs invisibly, without a console window. It does not seem to work to replace the putty plink.exe with the TortoisePLink.exe.
 
The solution is to use paramiko, a python tool that deals with SSH connections. It seems there is the suggestion to make paramiko the default instead of plink.exe (see https://bugs.launchpad.net/bzr/+bug/414743).
 
To install paramiko now, using instructions from http://www.andreas-schlapsi.com/2008/03/29/using-bazaar-and-launchpad-on-windows/:
* Download the latest release of [http://www.python.org/download/releases/ Python for Windows], I chose http://www.python.org/download/releases/2.7.1/
* Download and install pycrypto: http://www.voidspace.org.uk/python/modules.shtml#pycrypto
* download the zip file http://www.lag.net/paramiko/
* unzip and on the command line:
cd paramiko-1.7.4
c:\python27\python.exe setup.py install
* Then remove the variable BZR_SSH from the environment variables
* now you won't get the plink console windows anymore when doing any bazaar operation
 
= Setup your environment =
Start Bazaar Explorer from the Start menu.
 
[[File:BzrExplorer1.png|center|First screen of Bazaar Explorer]]
 
Go to Settings|Configuration|User Configuration to set your user name and email address:
 
[[File:BzrExplorer2.png|center|User Configuration of Bazaar Explorer]]
 
Set up the bug tracker integration as follows:
[[File:BzrExplorer_Bug_mantis.PNG‎|center|Configure Mantis Bug Tracker Integration]]
Here is the URL for easy copy&paste: <code>http://sourceforge.net/apps/mantisbt/openpetraorg/view.php?id={id}</code>
 
The commit dialogue of Bazaar Explorer allows one to specify a bug that was closed with the commit. One needs to prefix the bug number with 'op:' (e.g. 'op:170' if Bug #170 is closed in the openPETRA bug tracker).
 
 
If you prefer to use WinMerge for showing the diff of files, you can configure it in the same window as well:
 
[[File:BzrExplorer3.png|center|Configure WinMerge]]
 
To setup KDiff3 (http://kdiff3.sourceforge.net/) as your Merge tool, configure it in the same window:
 
[[File:BzrExplorer MergeConfig.png|centre|Configure KDiff3 as the merge tool]]
 
For Copy&Paste: <code>"C:\Program Files (x86)\KDiff3\kdiff3.exe" --output "%r" "%b" "%t" "%o"</code>
 
Now you should configure a directory where you will store all your branches. Go to "Start a new project", and click on "Initialize". Make sure to select the options "Shared repository" and "Branches in the repository will default to not having a working tree".
 
I have chosen the directory <code><My Documents>/openpetra/bzr/</code>
 
[[File:BzrExplorer4.png|center|Initialize Project Directory]]
 
You might be asked, if you want to create a new "hat". Just say yes. An explanation can be found here: http://wiki.bazaar.canonical.com/BzrExplorer#hats
== Line Ending issues ==
To avoid problems with the line endings, and the code generators, in Bazaar Explorer go to Settings/Rules and insert the content listed at [[How_to_work_with_bazaar_on_the_command_line#Line_Ending_issues]]
 
See also http://doc.bazaar.canonical.com/development/en/user-reference/eol-help.html
 
= Get the files =
You can now download the trunk into your own directory, by selecting in the menu Bazaar | Start | Checkout.
 
[[File:BzrExplorer5.png|center|Checkout trunk]]
 
As a developer with ssh permissions for the repository, use this source URL:
bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk
Important for developers with ssh permissions: make sure you have started pageant with your private key, otherwise your connection to the bazaar server will fail.
 
For anonymous access, use
http://bzr.openpetra.org:8008/openpetra/trunk
 
For just browsing the source online, go to
http://code.openpetra.org
 
The destination for the checked out trunk would be in my case:
<My Documents>/openpetra/bzr/trunk
 
After the checkout has finished, click on Refresh in the Bazaar Explorer, and then double-click trunk to get to this screen:
[[File:BzrExplorer6.png|center|Explore trunk]]
 
This screen gives you access to operations like:
* Add: add new files
* Rename: rename files in the working tree control
* Commit: commit local changes to the repository
[[File:BzrExplorer7.png|center|Commit]]
 
Alternatively, you can work with Tortoise Bazaar as well:
[[File:BzrTortoise.png|center|Tortoise Bazaar]]
 
= Create a working branch =
For a development/feature branch, you need to use the 'Switch' command.
 
* Click the 'Switch' Button in the ToolBar.
* Make sure you tick the box "Create Branch before Switching".
* You need to specify the name of the branch on the bazaar server.
In this example it is: <code>bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/dev_0000167_import_cc_hierarchy/</code>
 
[[File:BzrExplorer8.png|center|Switch to new branch]]
 
In the end, your code will still be in My Documents\openpetra\bzr\trunk, but if you commit, it will always be against <code>bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/dev_0000167_import_cc_hierarchy/</code>, and the title of the Bazaar Explorer window also contains the name of the branch you are working with.
 
To get an overview of all the existing Branches of openpetra go to [http://bzr.openpetra.org:8008/openpetra/ this] website.
 
= Rebase a branch =
You should rebase your branch regularly, so that the changes happening in trunk are flowing back into your branch.
 
You need to click on ''Merge'', and if there have been changes merged into your branch, you will need to ''Commit'' as well.
 
It is highly recommended to first commit all your own local changes, before doing a merge.
 
= Merge to trunk =
You need to switch to trunk, and then do a ''Merge'' from the branch. Resolve conflicts if there are any, and do a ''Commit''.
 
= Resolve conflicts =
This example will show you how to resolve a conflict.
 
The situation: the file Gift.Importing.cs has been edited both in trunk and in the dev branch. We switch to the dev branch, and select Merge from bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk/
 
This is how it looks in Bazaar Explorer:
[[File:BzrExplorerUncommittedMergeWithConflicts.png|center|Uncommitted Merge with Conflicts]]
 
Now go in the menu to Bazaar > Work > Resolve Conflicts. You will get this screen:
[[File:BzrListConflicts.png|center|Bazaar list unresolved conflicts]]
 
If you have configured KDiff3 right, you should be able to double-click the conflict files and see them in KDiff3. This only works for files that have text conflicts. For files with content conflicts, you need to manually compare the .BASE and .THIS or .OTHER file with the current file.
 
In KDiff3, you have 3 columns:
[[File:Kdiff3.png|center|KDiff3 sample]]
 
 
*The left column (A) is the BASE version. This is the version before all changes happened, the common source of the branches.
*The center column (B) is the THIS version. This is the version that you have last had in your branch.
*The right column (C) is the OTHER version. This is the version coming from trunk, in our example.
*The file at the bottom is the resulting file. You can go through the conflicts, and select if you want to select the version from A, B, or C, or you can modify it yourself.
 
You might also want to right click the conflicting file in the Explorer, and select the Log, this will you to see what happened to the file, and how the changes got into that file, by looking at the diff of each commit.
 
After you have fixed the bottom file, saved it and closed KDiff3, select "Mark as resolved" in the conflicts list window, when right-clicking the conflict file.

Latest revision as of 04:35, 16 March 2023

We are not using Bazaar anymore, but Git.

Retrieved from ‘https://wiki.openpetra.org/index.php?title=How_to_work_with_bazaar_through_the_GUI_on_Windows&oldid=4931’