- Bazaar Version Control
- Table of Contents
- Bazaar Version Control
- Credits
- About the Author
- About the Reviewers
- www.PacktPub.com
- Preface
- 1. Getting Started
- 2. Diving into Bazaar
- Understanding the core concepts
- Introducing the user interfaces
- Configuring Bazaar
- Performing the basic version control operations
- Putting a directory under version control
- Checking the status of files and directories
- Adding files to version control
- Recording a new revision
- Ignoring files
- Deleting files
- Undoing changes
- Editing files
- Viewing differences in changed files
- Renaming or moving files
- Viewing the revision history
- Restoring files from a past revision
- Putting it all together
- Beyond the basics
- Summary
- 3. Using Branches
- What is a branch?
- What can you do with branches?
- Why use more than one branch?
- Understanding core terms and concepts
- Using a shared repository
- Basic branching and merging
- Using the branch command
- Viewing basic branch information
- Comparing branches
- Merging branches
- Mirroring branches
- Summary
- 4. Using Bazaar in a Small Team
- Collaborating with others
- Sharing branches over the network
- Working with remote branches
- Implementing simple workflows
- Summary
- 5. Working with Bazaar in Centralized Mode
- 6. Working with Bazaar in Distributed Mode
- The distributed mode in general
- The human gatekeeper workflow
- The automatic gatekeeper workflow
- The shared mainline workflow
- Choosing a distributed workflow
- Summary
- 7. Integrating Bazaar in CDE
- What is a CDE?
- Working with Launchpad
- Integrating Bazaar into Redmine
- Integrating Bazaar into Trac
- Linking commits to bug trackers
- Web-based repository browsing with Loggerhead
- Summary
- 8. Using the Advanced Features of Bazaar
- 9. Using Bazaar Together with Other VCS
- Working with other VCS in general
- Using Bazaar with Subversion
- Installing bzr-svn
- Supported protocols and URL schemes
- Using the example Subversion repository
- Understanding branches in Subversion
- Branching or checkout from Subversion
- Preserving Subversion metadata
- Pulling or updating from Subversion
- Committing to Subversion
- Pushing to Subversion
- Merging Subversion branches
- Merging local branches into Subversion
- Binding and unbinding to Subversion locations
- Using lightweight checkouts
- Browsing the logs
- Limitations of bzr-svn
- Final remarks on bzr-svn
- Using Bazaar with Git
- Migrating between version control systems
- Summary
- 10. Programming Bazaar
- Using Bazaar programmatically
- Creating a plugin
- Using the example plugins
- Naming the plugin
- Creating the plugin directory
- Implementing the plugin
- Writing the README file
- Creating __init__.py
- Writing unit tests
- Creating setup.py
- Browsing existing plugins
- Registering your plugin
- Creating a hook
- References
- Summary
- Index
There are two primary ways to interact with Bazaar—running bzr commands in a terminal program, or using the Bazaar Explorer graphical user interface. Both the interfaces have their advantages and disadvantages, but we will try to cover them equally throughout the book whenever possible.
bzr is the
command-line client and official user interface of Bazaar. It is the clearest way to explain all the version control operations, and often the fastest way to accomplish tasks.
To use bzr, you need a terminal application (or DOS prompt in Windows systems), and basic familiarity with shell commands of your local system, in order to be able to navigate in your local filesystem.
Bazaar Explorer is the
graphical user interface (GUI) of Bazaar. In Windows, you can launch it from Program Files or the Start menu. In other systems, you can launch it by running the bzr explorer command in a terminal application.
With Bazaar Explorer, it is easy to see an overview of all the files in a project and pending changes. In addition, it has many practical features for filtering, searching, and history browsing that simply wouldn't be possible by using the command-line interface. However, not all operations are available in Bazaar Explorer. For this reason, it is important to understand the command-line interface too.
-
No Comment