Merge lp:~jelmer/wikkid/null-revision into lp:wikkid

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 40
Proposed branch: lp:~jelmer/wikkid/null-revision
Merge into: lp:wikkid
Diff against target: 20 lines (+3/-0)
1 file modified
wikkid/filestore/bzr.py (+3/-0)
To merge this branch: bzr merge lp:~jelmer/wikkid/null-revision
Reviewer Review Type Date Requested Status
Tim Penhey Approve
Review via email: mp+26075@code.launchpad.net

Description of the change

This fixes a deprecation warning that is triggered when creating new pages using wikkid from the testsuite.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :
Download full text (4.6 KiB)

Hi Jelmer,

This makes the test suite fail:

ERROR: wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file
----------------------------------------------------------------------
Text attachment: log
------------
1.631 creating repository in file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/.
1.634 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x39c7090> in file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/
1.640 trying to create missing lock '/tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/checkout/dirstate'
1.640 opening working tree '/tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work'
1.645 skip control directory '.bzr'
1.645 creating config directory: '/tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/home/.bazaar'
1.648 preparing to commit
    INFO Committing to: /tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/
1.650 Selecting files for commit with filter None
    INFO added README
    INFO Committed revision 1.
1.668 opening working tree '/tmp/testbzr-lrpIxX.tmp'
------------
Text attachment: traceback
------------
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 153, in _runCleanups
    function(*arguments, **keywordArguments)
AssertionError: Different number of acquired and released or broken locks. ([LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/branch-lock3wtt4kz8cx40cwolrim4), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/repository/locks1n7dza8ncd6g4mpkm3n), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/branch/lock00a4oh1pyoqalyn1ojjt), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/checkout/lock5i05vu2exlsh0iz13bvd), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/checkout/lock71m26fqbpszpruhrzqcj), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/branch/lockkai5puavhgt9w3n950aj), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/checkout/lockvho3y2u6zp2rk7u51gm6), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/repository/lock452dh8q3ts2rdxjdagmh), LockResult(file:///tmp/testbzr-lrpIxX.tmp/wikkid.tests.test_bzr_filestore.TestBzrFileStore.test_updating_existing_file/work/.bzr/branch/lockhhtjr77jxj86io359ii9), LockResult(file:///tmp/tes...

Read more...

review: Needs Fixing
lp:~jelmer/wikkid/null-revision updated
36. By Jelmer Vernooij

Use NULL_REVISION rather than None when specifying parent revision to Bazaar (the latter triggers a deprecation warning).

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I've pushed a new branch without my other changes, which seem to've broken the tests.

Revision history for this message
Tim Penhey (thumper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wikkid/filestore/bzr.py'
2--- wikkid/filestore/bzr.py 2010-05-26 16:53:26 +0000
3+++ wikkid/filestore/bzr.py 2010-05-29 22:08:24 +0000
4@@ -13,6 +13,7 @@
5 from bzrlib.errors import BinaryFile
6 from bzrlib.merge3 import Merge3
7 from bzrlib.osutils import split_lines
8+from bzrlib.revision import NULL_REVISION
9 from bzrlib.textfile import check_text_path
10 from bzrlib.urlutils import basename, dirname, joinpath
11
12@@ -60,6 +61,8 @@
13 """
14 if commit_message is None or commit_message.strip() == '':
15 commit_message = 'No description of change given.'
16+ if parent_revision is None:
17+ parent_revision = NULL_REVISION
18 # Firstly we want to lock the tree for writing.
19 self.working_tree.lock_write()
20 try:

Subscribers

People subscribed via source and target branches