← Back to branch summary

~brz/brz-debian/byoci

« back to all changes in this revision

Viewing changes to cmds.py

  • Committer: James Westby
  • Date: 2009-02-18 18:36:18 UTC
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: jw+debian@jameswestby.net-20090218183618-0wuajt2nbtpcooag
Kill off export-upstream mode.

merge-upstream will be improved to merge the upstream branch, store it with
pristine-tar, and then produce the tarball as needed.

Using export-upstream for snapshots is now incorrect. You should use
"merge-upstream" every time instead, which will track if there is nothing
to do, and handle conflicts. You can autocommit the merge and build the
result if you like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmds.py
58
58
                     DebMergeBuild,
59
59
                     DebNativeBuild,
60
60
                     DebSplitBuild,
61
 
                     DebMergeExportUpstreamBuild,
62
 
                     DebExportUpstreamBuild,
63
61
                     )
64
62
from bzrlib.plugins.builddeb.config import DebBuildConfig
65
63
from bzrlib.plugins.builddeb.errors import (StopBuild,
311
309
            result_dir=None, builder=None, merge=False, build_dir=None,
312
310
            orig_dir=None, ignore_changes=False, ignore_unknowns=False,
313
311
            quick=False, reuse=False, native=False, split=False,
314
 
            export_upstream=None, export_upstream_revision=None,
315
312
            source=False, revision=None, no_user_config=False, result=None):
316
313
        branch, build_options, source = self._branch_and_build_options(
317
314
                branch_or_build_options_list, source)
330
327
            (changelog, larstiq) = find_changelog(tree, merge)
331
328
            config.set_version(changelog.version)
332
329
 
333
 
            if export_upstream is None:
334
 
                export_upstream = config.export_upstream
335
 
 
336
 
            if export_upstream_revision is None:
337
 
                export_upstream_revision = config.export_upstream_revision
338
 
 
339
330
            result_dir, build_dir, orig_dir = self._get_dirs(config, is_local,
340
331
                    result_dir, result, build_dir, orig_dir)
341
332
            properties = BuildProperties(changelog, build_dir, orig_dir, larstiq)
342
333
 
343
334
            if merge:
344
 
                if export_upstream is None:
345
 
                    build = DebMergeBuild(properties, tree, _is_working_tree=working_tree)
346
 
                else:
347
 
                    prepull_upstream = config.prepull_upstream
348
 
                    stop_on_no_change = config.prepull_upstream_stop
349
 
                    build = DebMergeExportUpstreamBuild(properties, tree, export_upstream,
350
 
                                                        export_upstream_revision,
351
 
                                                        prepull_upstream,
352
 
                                                        stop_on_no_change,
353
 
                                                        _is_working_tree=working_tree)
 
335
                build = DebMergeBuild(properties, tree, _is_working_tree=working_tree)
354
336
            elif native:
355
337
                build = DebNativeBuild(properties, tree, _is_working_tree=working_tree)
356
338
            elif split:
357
339
                build = DebSplitBuild(properties, tree, _is_working_tree=working_tree)
358
340
            else:
359
 
                if export_upstream is None:
360
 
                    build = DebBuild(properties, tree, branch, _is_working_tree=working_tree)
361
 
                else:
362
 
                    prepull_upstream = config.prepull_upstream
363
 
                    stop_on_no_change = config.prepull_upstream_stop
364
 
                    build = DebExportUpstreamBuild(properties, tree, export_upstream,
365
 
                                                   export_upstream_revision,
366
 
                                                   prepull_upstream,
367
 
                                                   stop_on_no_change,
368
 
                                                   _is_working_tree=working_tree)
 
341
                build = DebBuild(properties, tree, branch, _is_working_tree=working_tree)
369
342
 
370
343
            build.prepare(use_existing)
371
344
 
706
679
        if orig_dir is None:
707
680
            orig_dir = default_orig_dir
708
681
        properties = BuildProperties(changelog, build_dir, orig_dir, larstiq)
709
 
        export_upstream = config.export_upstream
710
 
        export_upstream_revision = config.export_upstream_revision
711
682
 
712
 
        if export_upstream is None:
713
 
            build = DebMergeBuild(properties, t, _is_working_tree=True)
714
 
        else:
715
 
            prepull_upstream = config.prepull_upstream
716
 
            stop_on_no_change = config.prepull_upstream_stop
717
 
            build = DebMergeExportUpstreamBuild(properties, t, export_upstream,
718
 
                                                export_upstream_revision,
719
 
                                                prepull_upstream,
720
 
                                                stop_on_no_change,
721
 
                                                _is_working_tree=True)
 
683
        build = DebMergeBuild(properties, t, _is_working_tree=True)
722
684
 
723
685
        build.prepare()
724
686
        try: