← Back to branch summary

~ubuntu-branches/ubuntu/utopic/bzr-builddeb/utopic

« back to all changes in this revision

Viewing changes to merge_quilt.py

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2012-03-19 11:10:21 UTC
  • Revision ID: package-import@ubuntu.com-20120319111021-rnytrd8wyor0x4d5
Tags: 2.8.4
https://launchpad.net/bugs/951207
https://launchpad.net/bugs/950419
https://launchpad.net/bugs/959065
* Add dependency on quilt. LP: #951207
* Cope with missing tags when looking up upstream versions.
* Skip quilt unapplying for trees that can not be copied (such as
  _PreviewTree). LP: #950419
* Document the argument for --export-upstream. LP: #959065

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge_quilt.py
25
25
import shutil
26
26
import tempfile
27
27
from bzrlib.mutabletree import MutableTree
 
28
from bzrlib.revisiontree import RevisionTree
28
29
from bzrlib import (
29
30
    errors,
30
31
    merge as _mod_merge,
73
74
            merger = _mod_merge.Merger.from_uncommitted(tree, orig_tree)
74
75
            merger.merge_type = NoUnapplyingMerger
75
76
            merger.do_merge()
 
77
        elif isinstance(orig_tree, RevisionTree):
 
78
            tree = orig_branch.create_checkout(target_dir, lightweight=True,
 
79
                accelerator_tree=orig_tree, revision_id=orig_tree.get_revision_id())
76
80
        else:
77
 
            tree = orig_branch.create_checkout(target_dir, lightweight=True,
78
 
                accelerator_tree=orig_tree, revision_id=orig_tree.get_revision_id())
 
81
            trace.mutter("Not sure how to create copy of %r", orig_tree)
 
82
            shutil.rmtree(target_dir)
 
83
            return orig_tree, None
79
84
        trace.mutter("Applying quilt patches for %r in %s", orig_tree, target_dir)
80
85
        quilt_pop_all(working_dir=tree.basedir, force=force)
81
86
        return tree, target_dir