Merge lp:~joe.julian/bzr/bdist_rpm into lp:bzr

[Joe Julian]

[Joe Julian (joe.julian)]

This patch creates a MANIFEST.in file so the include files and tools directory are included in the rpmbuild source. There is also a README_BDIST_RPM explaining about the bug in disttools that prevents a successful build on some distributions and how to fix that bug.

This README can be removed once disttools is repaired and released.

[John A Meinel (jameinel)]

The diff doesn't look quite right, as it includes a bunch of things other than just MANIFEST.in and README_BDIST_RPM. And the other things look like changes that Andrew and myself had done...

Anyway, I'm sure the MANIFEST.in needs at least a *.txt, since we use bzrlib/help_topics/en/* as part of the runtime system (eg, bzr help authentication).

Using:
  bzr ls -R bzrlib/ | sed 's/.*\(\..*\)/\1/' | grep -v '/' | sort -u

We have these extensions:
.c
.crt
.csr
.h
.key
.patch
.pxd
.py
.pyc
.pyd
.pyx
.txt

Assuming we don't care about the test suite, the .crt and .csr aren't needed (we also have a few files without extensions used by the test suite). Same for .patch .key. Certainly .pyc isn't needed, and we wouldn't want to bundle .pyd (or .so). So I think the line should be:
recursive-include bzrlib *.py *.pyx *.pxd *.txt *.c *.h

review: Needs Fixing

[John A Meinel (jameinel)]

I went ahead and cleaned it up a bit, added a NEWS entry, and submitted it from:
lp:~jameinel/bzr/bdist_rpm

I also submitted this to the 2.0 branch since it seems reasonable and linked it to bug #175839.

review: Approve

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2010-01-10 02:33:27 +0000
@@ -0,0 +1,3 @@
+include bzr README setup.py
+recursive-include bzrlib *.py *.pyx *.pxd *.c *.h
+recursive-include tools *.py

=== modified file 'NEWS'
--- NEWS	2010-01-08 09:27:39 +0000
+++ NEWS	2010-01-10 02:33:27 +0000
@@ -177,6 +177,9 @@
 Bug Fixes
 *********
 
+* ``bzr annotate`` on another branch with ``-r branch:...`` no longer
+  fails with an ``ObjectNotLocked`` error.  (Andrew Bennetts, #496590)
+
 * ``bzr export dir`` now requests all file content as a record stream,
   rather than requsting the file content one file-at-a-time. This can make
   exporting over the network significantly faster (54min => 9min in one
@@ -195,6 +198,12 @@
 * Give a clearer message if the lockdir disappears after being apparently
   successfully taken.  (Martin Pool, #498378)
 
+* If we fail to open ``~/.bzr.log`` write a clear message to stderr rather
+  than using ``warning()``. The log file is opened before logging is set
+  up, and it leads to very confusing: 'no handlers for "bzr"' messages for
+  users, rather than something nicer.
+  (John Arbash Meinel, Barry Warsaw, #503886)
+
 * The 2a format wasn't properly restarting autopacks when something
   changed underneath it (like another autopack). Now concurrent
   autopackers will properly succeed. (John Arbash Meinel, #495000)

=== added file 'README_BDIST_RPM'
--- README_BDIST_RPM	1970-01-01 00:00:00 +0000
+++ README_BDIST_RPM	2010-01-10 02:33:27 +0000
@@ -0,0 +1,8 @@
+There is a bug in disttools for distributions who's rpmbuild compresses 
+the man pages. This causes an error building the final packages as it's 
+expecting bzr.1 and not finding it, but finding bzr.1.gz that's unpackaged.
+
+This bug is known to affect Fedora, RHEL, and Centos distributions.
+
+There is a preliminary patch at http://bugs.python.org/issue644744 that
+fixes this issue with disttools.

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-12-23 05:42:33 +0000
+++ bzrlib/builtins.py	2010-01-10 02:33:27 +0000
@@ -4537,21 +4537,25 @@
             branch.lock_read()
         try:
             tree = _get_one_revision_tree('annotate', revision, branch=branch)
-            if wt is not None:
-                file_id = wt.path2id(relpath)
-            else:
-                file_id = tree.path2id(relpath)
-            if file_id is None:
-                raise errors.NotVersionedError(filename)
-            file_version = tree.inventory[file_id].revision
-            if wt is not None and revision is None:
-                # If there is a tree and we're not annotating historical
-                # versions, annotate the working tree's content.
-                annotate_file_tree(wt, file_id, self.outf, long, all,
-                    show_ids=show_ids)
-            else:
-                annotate_file(branch, file_version, file_id, long, all, self.outf,
-                              show_ids=show_ids)
+            tree.lock_read()
+            try:
+                if wt is not None:
+                    file_id = wt.path2id(relpath)
+                else:
+                    file_id = tree.path2id(relpath)
+                if file_id is None:
+                    raise errors.NotVersionedError(filename)
+                file_version = tree.inventory[file_id].revision
+                if wt is not None and revision is None:
+                    # If there is a tree and we're not annotating historical
+                    # versions, annotate the working tree's content.
+                    annotate_file_tree(wt, file_id, self.outf, long, all,
+                        show_ids=show_ids)
+                else:
+                    annotate_file(branch, file_version, file_id, long, all,
+                        self.outf, show_ids=show_ids)
+            finally:
+                tree.unlock()
         finally:
             if wt is not None:
                 wt.unlock()

=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- bzrlib/tests/blackbox/test_annotate.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_annotate.py	2010-01-10 02:33:27 +0000
@@ -29,6 +29,7 @@
 from bzrlib.branch import Branch
 from bzrlib.config import extract_email_address
 from bzrlib.tests import TestCaseWithTransport
+from bzrlib.urlutils import joinpath
 
 
 class TestAnnotate(TestCaseWithTransport):
@@ -153,14 +154,27 @@
 class TestSimpleAnnotate(TestCaseWithTransport):
     """Annotate tests with no complex setup."""
 
-    def _setup_edited_file(self):
+    def _setup_edited_file(self, relpath='.'):
         """Create a tree with a locally edited file."""
-        tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('file', 'foo\ngam\n')])
+        tree = self.make_branch_and_tree(relpath)
+        file_relpath = joinpath(relpath, 'file')
+        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
         tree.add('file')
         tree.commit('add file', committer="test@host", rev_id="rev1")
-        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
+        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
         tree.branch.get_config().set_user_option('email', 'current@host2')
+        return tree
+
+    def test_annotate_cmd_revspec_branch(self):
+        tree = self._setup_edited_file('trunk')
+        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
+        os.chdir('work')
+        out, err = self.run_bzr('annotate file -r branch:../trunk')
+        self.assertEqual('', err)
+        self.assertEqual(
+            '1   test@ho | foo\n'
+            '            | gam\n',
+            out)
 
     def test_annotate_edited_file(self):
         tree = self._setup_edited_file()

=== modified file 'bzrlib/tests/test_trace.py'
--- bzrlib/tests/test_trace.py	2009-12-16 22:29:31 +0000
+++ bzrlib/tests/test_trace.py	2010-01-10 02:33:27 +0000
@@ -27,6 +27,7 @@
 
 from bzrlib import (
     errors,
+    trace,
     )
 from bzrlib.tests import TestCaseInTempDir, TestCase
 from bzrlib.trace import (
@@ -248,6 +249,20 @@
             tmp1.close()
             tmp2.close()
 
+    def test__open_bzr_log_uses_stderr_for_failures(self):
+        # If _open_bzr_log cannot open the file, then we should write the
+        # warning to stderr. Since this is normally happening before logging is
+        # set up.
+        self.addCleanup(setattr, sys, 'stderr', sys.stderr)
+        self.addCleanup(setattr, trace, '_bzr_log_filename',
+                        trace._bzr_log_filename)
+        sys.stderr = StringIO()
+        # Set the log file to something that cannot exist
+        os.environ['BZR_LOG'] = os.getcwd() + '/no-dir/bzr.log'
+        logf = trace._open_bzr_log()
+        self.assertIs(None, logf)
+        self.assertContainsRe(sys.stderr.getvalue(),
+                              'failed to open trace file: .*/no-dir/bzr.log')
 
 class TestVerbosityLevel(TestCase):
 

=== modified file 'bzrlib/trace.py'
--- bzrlib/trace.py	2009-12-01 05:35:52 +0000
+++ bzrlib/trace.py	2010-01-10 02:33:27 +0000
@@ -250,7 +250,12 @@
             bzr_log_file.write("bug reports to https://bugs.launchpad.net/bzr/+filebug\n\n")
         return bzr_log_file
     except IOError, e:
-        warning("failed to open trace file: %s" % (e))
+        # If we are failing to open the log, then most likely logging has not
+        # been set up yet. So we just write to stderr rather than using
+        # 'warning()'. If we using warning(), users get the unhelpful 'no
+        # handlers registered for "bzr"' when something goes wrong on the
+        # server. (bug #503886)
+        sys.stderr.write("failed to open trace file: %s\n" % (e,))
     # TODO: What should happen if we fail to open the trace file?  Maybe the
     # objects should be pointed at /dev/null or the equivalent?  Currently
     # returns None which will cause failures later.