Merge lp:~andrewsomething/bzr-builddeb/bzr-grab-merge into lp:bzr-builddeb

[James Westby]

[Jelmer Vernooij (jelmer)]

Is this intended for merging? It contains a few commented out lines of code, and it doesn't have any tests.

review: Needs Information (code)

[James Westby (james-w)]

On Wed, 12 Jan 2011 22:01:49 -0000, Jelmer Vernooij <email address hidden> wrote:
> Review: Needs Information code
> Is this intended for merging? It contains a few commented out lines of code, and it doesn't have any tests.

Andrew said that it wasn't complete, but I wanted to review it, and was
willing to do some work to get it in a state to merge. Unfortunately I
haven't had the time to do so.

Thanks,

James

[lp:~andrewsomething/bzr-builddeb/bzr-grab-merge]

408. By Andrew Starr-Bochicchio on 2010-12-12

Re-merge on trunk.

409. By Andrew Starr-Bochicchio on 2011-05-29

Re-merge on trunk.

410. By Andrew Starr-Bochicchio on 2011-06-09

Remerge on trunk

411. By Andrew Starr-Bochicchio on 2011-07-08

Remerge on trunk

412. By Andrew Starr-Bochicchio on 2011-07-20

Re-merge on trunk.

413. By Andrew Starr-Bochicchio on 2011-08-01

Remerge on trunk

414. By Andrew Starr-Bochicchio on 2011-10-24

Remerge on trunk.

415. By Andrew Starr-Bochicchio on 2011-11-03

Remerge on trunk.

416. By Andrew Starr-Bochicchio on 2011-12-20

Re-merge on trunk.

417. By Andrew Starr-Bochicchio on 2012-01-07

A number of fixes for things moving around in bzrlib.

Unmerged revisions

417. By Andrew Starr-Bochicchio on 2012-01-07

A number of fixes for things moving around in bzrlib.

416. By Andrew Starr-Bochicchio on 2011-12-20

Re-merge on trunk.

415. By Andrew Starr-Bochicchio on 2011-11-03

Remerge on trunk.

414. By Andrew Starr-Bochicchio on 2011-10-24

Remerge on trunk.

413. By Andrew Starr-Bochicchio on 2011-08-01

Remerge on trunk

412. By Andrew Starr-Bochicchio on 2011-07-20

Re-merge on trunk.

411. By Andrew Starr-Bochicchio on 2011-07-08

Remerge on trunk

410. By Andrew Starr-Bochicchio on 2011-06-09

Remerge on trunk

409. By Andrew Starr-Bochicchio on 2011-05-29

Re-merge on trunk.

408. By Andrew Starr-Bochicchio on 2010-12-12

Re-merge on trunk.

=== modified file '__init__.py'
--- __init__.py	2012-01-06 17:55:50 +0000
+++ __init__.py	2012-01-07 00:39:25 +0000
@@ -58,6 +58,7 @@
         "mark_uploaded": [],
         "merge_package": [],
         "merge_upstream": ["mu"],
+        "grab_merge": ["gm"],
         }
 
 for command, aliases in commands.iteritems():

=== modified file 'cmds.py'
--- cmds.py	2012-01-05 00:43:11 +0000
+++ cmds.py	2012-01-07 00:39:25 +0000
@@ -1493,3 +1493,77 @@
             revision_id, bugs=bugs, authors=authors, origin=origin,
             forwarded=forwarded, applied_upstream=applied_upstream,
             description=description, last_update=last_update)
+
+class cmd_grab_merge(Command):
+    """Grab packaging branches for merging.
+       This initiates a shared repository and then grabs both
+       lp:ubuntu/<package> and lp:debian/<package>. Next, these
+       branches are merged in "./<package>/merge_dir."
+    """
+
+    takes_args = ['package']
+
+    def run(self, package):
+        from bzrlib import transport
+        from bzrlib import bzrdir
+        from bzrlib.tag import _merge_tags_if_possible
+        from bzrlib.plugins.builddeb.merge_package import fix_ancestry_as_needed
+        if package is None:
+            package = osutils.getcwd()
+
+        shared_repo = os.getcwd() + '/%s' % package
+        debian_path = shared_repo + '/debian_branch'
+        ubuntu_path = shared_repo + '/ubuntu_branch'
+
+        if os.access(shared_repo, os.F_OK) is True:
+              note('Please move or remove the existing %s directory.' % package)
+              return
+        else:
+            note('Initializing share repository...')
+            to_transport = transport.get_transport(shared_repo)
+            to_transport.ensure_base()
+            repo_format = bzrdir.format_registry.make_bzrdir('default')
+            newdir = repo_format.initialize_on_transport(to_transport)
+            repo = newdir.create_repository(shared=True)
+            repo.set_make_working_trees(True)
+
+        note('Pulling Ubuntu branch...')
+        ubuntu_branch_lp = Branch.open('lp:ubuntu/{0}' .format(package))
+        ubuntu_branch = ubuntu_branch_lp.bzrdir.sprout(ubuntu_path).open_branch()
+        note('Pulling Debian branch...')
+        # TODO: Make merging from sid or testing configurable.
+        debian_branch_lp = Branch.open('lp:debian/sid/{0}' .format(package))
+        debian_branch = debian_branch_lp.bzrdir.sprout(debian_path).open_branch()
+
+        note('Merging...')
+        merge_dir = ubuntu_branch.bzrdir.sprout(shared_repo + '/merge_dir').open_branch()
+        wt = WorkingTree.open(shared_repo + '/merge_dir')
+        # TODO: Call merge-package directly instead of doing this...
+        wt.lock_write()
+        self.add_cleanup(wt.unlock)
+        debian_branch.lock_read()
+        self.add_cleanup(debian_branch.unlock)
+        this_config = debuild_config(wt, wt)
+        that_config = debuild_config(debian_branch.basis_tree(),
+                debian_branch.basis_tree())
+        if not (this_config.build_type == BUILD_TYPE_NATIVE or
+                that_config.build_type == BUILD_TYPE_NATIVE):
+            fix_ancestry_as_needed(wt, debian_branch)
+
+        # Merge source packaging branch in to the target packaging branch.
+        _merge_tags_if_possible(debian_branch, wt.branch)
+        conflicts = wt.merge_from_branch(debian_branch)
+        if conflicts > 0:
+            note('The merge resulted in %s conflicts. Please resolve these '
+                 'and commit the changes with "bzr commit".' % conflicts)
+        else:
+            note('The merge resulted in no conflicts. You may commit the '
+            'changes by running "bzr commit".')
+
+#        # TODO: Are there other things that we could write out that might be useful?
+#        dt = WorkingTree.open(debian_path)
+#        ut = WorkingTree.open(ubuntu_path)
+#        ubuntu_patch = open(shared_repo + '/ubuntu_patch', 'w')
+#        show_diff_trees(dt, ut, ubuntu_patch, specific_files=None,
+#                        external_diff_options='-Nru')
+#        ubuntu_patch.close()