Rev 4682: Merge bzr/2.0 resolve NEWS in http://bazaar.launchpad.net/~jameinel/bzr/2.0.1-322807-branch-at-root
John Arbash Meinel
john at arbash-meinel.com
Thu Oct 8 05:05:43 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.0.1-322807-branch-at-root
------------------------------------------------------------
revno: 4682 [merge]
revision-id: john at arbash-meinel.com-20091008040525-t1q1zez3h2x2yqpj
parent: john at arbash-meinel.com-20091008035802-gfdaqxgrxym64pqs
parent: pqm at pqm.ubuntu.com-20091007120120-n0rn19sgb5j6izua
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.1-322807-branch-at-root
timestamp: Wed 2009-10-07 23:05:25 -0500
message:
Merge bzr/2.0 resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-10-06 17:36:03 +0000
+++ b/NEWS 2009-10-08 04:05:25 +0000
@@ -26,6 +26,9 @@
with some combinations of remote and local formats. This was causing
"unknown object type identifier 60" errors. (Andrew Bennetts, #427736)
+* Fixed ``ObjectNotLocked`` errors when doing some log and diff operations
+ on branches via a smart server. (Andrew Bennetts, #389413)
+
* Handle things like ``bzr add foo`` and ``bzr rm foo`` when the tree is
at the root of a drive. ``osutils._cicp_canonical_relpath`` always
assumed that ``abspath()`` returned a path that did not have a trailing
@@ -61,6 +64,8 @@
Documentation
*************
+* Improved README. (Ian Clatworthy)
+
* Improved upgrade documentation for Launchpad branches.
(Barry Warsaw)
=== modified file 'README'
--- a/README 2008-03-16 14:01:20 +0000
+++ b/README 2009-10-06 07:41:02 +0000
@@ -3,72 +3,44 @@
=================
Bazaar (``bzr``) is a decentralized revision control system, designed to be
-easy for developers and end users alike. Bazaar is part of the GNU project to
-develop a complete free operating system.
-
-To install Bazaar from source, follow the instructions in the INSTALL
-file. Otherwise, you may want to check your distribution package manager
-for ready-to-install packages, or http://bazaar-vcs.org/DistroDownloads.
-
-To learn how to use Bazaar, check the documentation in the doc/ directory.
-Once installed, you can also run 'bzr help'. An always up-to-date and more
-complete set of documents can be found in the Bazaar website, at:
-
- http://bazaar-vcs.org/Documentation
+easy for developers and end users alike. Bazaar is part of the GNU project
+to develop a complete free operating system.
+
+To install Bazaar, follow the instructions given at
+http://bazaar-vcs.org/Download. Ready-to-install packages are available
+for most popular operating systems or you can install from source.
+
+To learn how to use Bazaar, see the official documentation at:
+
+ http://doc.bazaar-vcs.org/en/
+
+For additional training materials including screencasts and slides,
+visit our community wiki documentation page at:
+
+ http://bazaar-vcs.org/Documentation/
Bazaar is written in Python, and is sponsored by Canonical Limited, the
founders of Ubuntu and Launchpad. Bazaar is Free Software, and is released
under the GNU General Public License.
-Bazaar was formerly known as Bazaar-NG. It's the successor to ``baz``, a fork
-of GNU arch, but shares no code. (To upgrade from Baz, use the ``baz-import``
-command in the bzrtools plugin.)
-
Bazaar highlights
=================
-* Easy to use and intuitive.
-
- Only five commands are needed to do all basic operations, and all
- commands have documentation accessible via 'bzr help command'.
- Bazaar's interface is also easy to learn for CVS and Subversion users.
-
-* Robust and reliable.
-
- Bazaar is developed under an extensive test suite. Branches can be
- checked and verified for integrity at any time, and revisions can be
- signed with PGP/GnuPG.
-
-* Publish branches with HTTP.
-
- Branches can be hosted on an HTTP server with no need for special
- software on the server side. Branches can be uploaded by bzr itself
- over SSH (SFTP), or with rsync.
-
-* Adapts to multiple environments.
-
- Bazaar runs on Linux and Windows, fully supports Unicode filenames,
- and suits different development models, including centralized.
-
-* Easily extended and customized.
-
- A rich Python interface is provided for extending and embedding,
- including a plugin interface. There are already many available plugins,
- most of them registered at http://bazaar-vcs.org/PluginRegistry.
-
-* Smart merging.
-
- Changes will never be merged more than once, conflicts will be
- minimized, and identical changes are dealt with well.
-
-* Vibrant and active community.
-
- Help with Bazaar is obtained easily, via the mailing list, or the IRC
- channel.
-
-
-Registration and Feedback
-=========================
+Bazaar directly supports both central version control (like cvs/svn) and
+distributed version control (like git/hg). Developers can organize their
+workspace in whichever way they want on a per project basis including:
+
+* checkouts (like svn)
+* feature branches (like hg)
+* shared working tree (like git).
+
+It also directly supports and encourages a large number of development best
+practices like refactoring and pre-commit regression testing. Users can
+choose between our command line tool and our cross-platform GUI application.
+For further details, see our website at http://bazaar-vcs.org/en.
+
+Feedback
+========
If you encounter any problems with Bazaar, need help understanding it, or would
like to offer suggestions or feedback, please get in touch with us:
@@ -76,7 +48,7 @@
* Ask a question through our web support interface, at
https://answers.launchpad.net/bzr/
-* Report bugs at https://bugs.edge.launchpad.net/bzr/+filebug
+* Report bugs at https://bugs.launchpad.net/bzr/+filebug
* Write to us at bazaar at lists.canonical.com
You can join the list at <https://lists.ubuntu.com/mailman/listinfo/bazaar>.
@@ -85,12 +57,8 @@
* Talk to us in irc://irc.ubuntu.com/bzr
-* And see http://bazaar-vcs.org/BzrSupport for more.
-
-If you would like to help us improve Bazaar by telling us about yourself and
-what we could do better, please register and complete the online survey here:
-http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d.
-Registration is completely optional.
-
-Enjoy,
+Our mission is to make a version control tool that developers LOVE to use
+and that casual contributors feel confident with. Please let us know how
+we're going.
+
The Bazaar Team
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2009-10-02 03:07:22 +0000
+++ b/bzrlib/remote.py 2009-10-07 05:33:23 +0000
@@ -2392,6 +2392,7 @@
raise NotImplementedError(self.dont_leave_lock_in_place)
self._leave_lock = False
+ @needs_read_lock
def get_rev_id(self, revno, history=None):
if revno == 0:
return _mod_revision.NULL_REVISION
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2009-09-10 06:32:42 +0000
+++ b/bzrlib/tests/test_remote.py 2009-10-07 05:33:23 +0000
@@ -2147,6 +2147,26 @@
repo.get_rev_id_for_revno, 5, (42, 'rev-foo'))
self.assertFinished(client)
+ def test_branch_fallback_locking(self):
+ """RemoteBranch.get_rev_id takes a read lock, and tries to call the
+ get_rev_id_for_revno verb. If the verb is unknown the VFS fallback
+ will be invoked, which will fail if the repo is unlocked.
+ """
+ self.setup_smart_server_with_call_log()
+ tree = self.make_branch_and_memory_tree('.')
+ tree.lock_write()
+ rev1 = tree.commit('First')
+ rev2 = tree.commit('Second')
+ tree.unlock()
+ branch = tree.branch
+ self.assertFalse(branch.is_locked())
+ self.reset_smart_call_log()
+ verb = 'Repository.get_rev_id_for_revno'
+ self.disable_verb(verb)
+ self.assertEqual(rev1, branch.get_rev_id(1))
+ self.assertLength(1, [call for call in self.hpss_calls if
+ call.call.method == verb])
+
class TestRepositoryIsShared(TestRemoteRepository):
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2009-09-09 12:57:43 +0000
+++ b/doc/developers/releasing.txt 2009-10-06 06:49:53 +0000
@@ -201,9 +201,14 @@
signature. Or, if you prefer, use the
``tools/packaging/lp-upload-release`` script to do this.
-#. Link from http://bazaar-vcs.org/Download to the tarball and signature.
-
-#. Announce on the `Bazaar home page <http://bazaar-vcs.org/>`_.
+#. Link from http://bazaar-vcs.org/SourceDownloads to the tarball and
+ signature.
+
+#. Announce on the `Bazaar website <http://bazaar-vcs.org/>`_.
+ This page is edited via the lp:bzr-website branch. (Changes
+ pushed to this branch are refreshed by a cron job on escudero.)
+
+#. Announce on the `Bazaar wiki <http://bazaar-vcs.org/Welcome>`_.
#. Check that the documentation for this release is available in
<http://doc.bazaar-vcs.org>. It should be automatically build when the
More information about the bazaar-commits
mailing list