Merge into trunk : backport-merge-into : Code : bzr-builder

Status:	Merged
Merged at revision:	101
Proposed branch:	lp://staging/~spiv/bzr-builder/backport-merge-into
Merge into:	lp://staging/bzr-builder
Prerequisite:	lp://staging/~spiv/bzr-builder/merge-subdirs-479705
Diff against target:	345 lines (+269/-35) 2 files modified bzrlibbackports.py (+227/-0) recipe.py (+42/-35)
To merge this branch:	bzr merge lp://staging/~spiv/bzr-builder/backport-merge-into
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Andrew Bennetts (community)		Abstain on 2010-08-13
James Westby	2010-08-12	Needs Fixing on 2010-08-12
Review via email: mp+32428@code.staging.launchpad.net

Description of the change

This removes dependencies on bzr 2.2 by backporting MergeIntoMerger and removing the use of OperationWithCleanups.

This branch follows the merge-subdirs branch, i.e. it provides the merge-subdirs feature without the dependency on bzr 2.2.

Revision history for this message

James Westby (james-w) wrote on 2010-08-12:

#

Download full text (14.5 KiB)

Hi Andrew, looks great, but there are a few small issues:

It needs

try:
MergeIntoMerger = merge.MergeIntoMerger
except (AttributeError, NameError):
from bzrlib.plugins.builder.bzrlibbackports import MergeIntoMerger

instead of just NameError

and

            merger = MergeIntoMerger(this_tree=tree_to, other_tree=other_tree,
                other_branch=merge_from, target_subdir=target_subdir,
                source_subpath=subpath, other_rev_id=merge_revid)

instead of merge.MergeIntoMerger.

With these tweaks I get two test failures:

bzr selftest: /usr/bin/bzr
/usr/lib/python2.6/dist-packages/bzrlib
bzr-2.1.1 python-2.6.5 Linux-2.6.32-24-generic-i686-with-Ubuntu-10.04-lucid

======================================================================
ERROR: bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part
----------------------------------------------------------------------
_StringException: Text attachment: log
------------
22.425 creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/.
22.434 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xb0eb88c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/
22.455 trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/checkout/dirstate'
22.457 opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1'
22.479 preparing to commit
22.484 Selecting files for commit with filter None
22.521 creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/.
22.530 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xae1156c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/
22.548 trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/checkout/dirstate'
22.548 opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2'
22.571 preparing to commit
22.576 Selecting files for commit with filter None
22.615 preparing to commit
22.620 Selecting files for commit with filter None
INFO Building tree.
INFO Retrieving 'source1' to put at 'target'.
22.663 opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1'
22.673 creating repository in file:///tmp/te...

Hi Andrew, looks great, but there are a few small issues:

It needs

try:
    MergeIntoMerger = merge.MergeIntoMerger
except (AttributeError, NameError):
    from bzrlib.plugins.builder.bzrlibbackports import MergeIntoMerger

instead of just NameError

and

merger = MergeIntoMerger(this_tree=tree_to, other_tree=other_tree,
                other_branch=merge_from, target_subdir=target_subdir,
                source_subpath=subpath, other_rev_id=merge_revid)

instead of merge.MergeIntoMerger.

With these tweaks I get two test failures:

bzr selftest: /usr/bin/bzr                                                                                                                                  
   /usr/lib/python2.6/dist-packages/bzrlib
   bzr-2.1.1 python-2.6.5 Linux-2.6.32-24-generic-i686-with-Ubuntu-10.04-lucid

======================================================================
ERROR: bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part
----------------------------------------------------------------------
_StringException: Text attachment: log
------------
22.425  creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/.
22.434  creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xb0eb88c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/
22.455  trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/checkout/dirstate'
22.457  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1'
22.479  preparing to commit
22.484  Selecting files for commit with filter None
22.521  creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/.
22.530  creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xae1156c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/
22.548  trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/checkout/dirstate'
22.548  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2'
22.571  preparing to commit
22.576  Selecting files for commit with filter None
22.615  preparing to commit
22.620  Selecting files for commit with filter None
    INFO  Building tree.
    INFO  Retrieving 'source1' to put at 'target'.
22.663  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1'
22.673  creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/.bzr/.
22.682  Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/.bzr/repository/')(RepositoryFormat2a())
22.708  creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xa61128c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/.bzr/
22.725  created new branch BzrBranch7('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/')
22.737  trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/.bzr/checkout/dirstate'
22.738  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target'
22.769  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target'
22.784  Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/.bzr/repository/')(RepositoryFormat2a())
22.784  fetch up to rev {jw2328@flash-20100812141057-5dy2e3d4gs3s20u5}
22.817  Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/source2/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part/work/target/.bzr/repository/')(RepositoryFormat2a())
22.818  fetch up to rev {null:}
------------
Text attachment: traceback
------------
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 128, in _run_user
    return fn(*args)
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 368, in _run_test_method
    testMethod()
  File "/tmp/tmp6fNoUr/export/plugins/builder/tests/test_recipe.py", line 582, in test_build_tree_nest_part
    build_tree(base_branch, "target")
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 431, in build_tree
    possible_transports=possible_transports)
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 408, in _build_inner_tree
    instruction.apply(target_path, tree_to, br_to)
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 486, in apply
    self.target_subdir)
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 264, in nest_part_branch
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 658, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 629, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 766, in do_merge
    operation.run()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 772, in _do_merge
    self._compute_transform()
  File "/tmp/tmp6fNoUr/export/plugins/builder/bzrlibbackports.py", line 163, in _compute_transform
    self._finish_computing_transform()
AttributeError: 'MergeIntoMergeType' object has no attribute '_finish_computing_transform'
------------

======================================================================
ERROR: bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target
----------------------------------------------------------------------
_StringException: Text attachment: log
------------
22.879  creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source1/.bzr/.
22.893  creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xb19f74c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source1/.bzr/
22.916  trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source1/.bzr/checkout/dirstate'
22.918  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source1'
22.940  preparing to commit
22.945  Selecting files for commit with filter None
22.982  creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source2/.bzr/.
22.991  creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xb1a5c0c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source2/.bzr/
23.007  trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source2/.bzr/checkout/dirstate'
23.007  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source2'
23.030  preparing to commit
23.034  Selecting files for commit with filter None
23.070  preparing to commit
23.075  Selecting files for commit with filter None
    INFO  Building tree.
    INFO  Retrieving 'source1' to put at 'target'.
23.122  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source1'
23.133  creating repository in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/.bzr/.
23.141  Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/.bzr/repository/')(RepositoryFormat2a())
23.164  creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xa61128c> in file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/.bzr/
23.178  created new branch BzrBranch7('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/')
23.187  trying to create missing lock '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/.bzr/checkout/dirstate'
23.188  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target'
23.216  opening working tree '/tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target'
23.232  Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source2/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/.bzr/repository/')(RepositoryFormat2a())
23.232  fetch up to rev {jw2328@flash-20100812141058-7qu2vikzpc033t73}
23.262  Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/source2/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-_LchpF.tmp/bzrlib.plugins.builder.tests.test_recipe.BuildTreeTests.test_build_tree_nest_part_explicit_target/work/target/.bzr/repository/')(RepositoryFormat2a())
23.262  fetch up to rev {null:}
------------
Text attachment: traceback
------------
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 128, in _run_user
    return fn(*args)
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 368, in _run_test_method
    testMethod()
  File "/tmp/tmp6fNoUr/export/plugins/builder/tests/test_recipe.py", line 611, in test_build_tree_nest_part_explicit_target
    build_tree(base_branch, "target")
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 431, in build_tree
    possible_transports=possible_transports)
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 408, in _build_inner_tree
    instruction.apply(target_path, tree_to, br_to)
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 486, in apply
    self.target_subdir)
  File "/tmp/tmp6fNoUr/export/plugins/builder/recipe.py", line 264, in nest_part_branch
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 658, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 629, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 766, in do_merge
    operation.run()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 772, in _do_merge
    self._compute_transform()
  File "/tmp/tmp6fNoUr/export/plugins/builder/bzrlibbackports.py", line 163, in _compute_transform
    self._finish_computing_transform()
AttributeError: 'MergeIntoMergeType' object has no attribute '_finish_computing_transform'
------------

Thanks,

James

review: Needs Fixing

lp://staging/~spiv/bzr-builder/backport-merge-into updated on 2010-08-13

73. By Andrew Bennetts on 2010-08-13: Fix bugs in MergeIntoMerger backport found by James.

Revision history for this message

Andrew Bennetts (spiv) wrote on 2010-08-13:

#

I've done those tweaks, and fixed the _finish_computing_transform bug (it's intended to be inherited by MergeIntoMergeType from its base class, but it is also new in 2.2, so I've copied it verbatim into the backported MergeIntoMergeType).

review: Needs Resubmitting

Revision history for this message

Andrew Bennetts (spiv) on 2010-08-13:

#

review: Abstain

bzr-builder

Merge lp://staging/~spiv/bzr-builder/backport-merge-into into lp://staging/bzr-builder

Commit message

Description of the change

Preview Diff

Subscribers