← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-08 11:35:49 UTC
  • mfrom: (5531.1.3 662509-ignore-empty)
  • Revision ID: pqm@pqm.ubuntu.com-20101108113549-e4mhhq2fe1i0etbf
(vila) Add an option to accept any output from commands in shell-like tests.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
55
55
    revision,
56
56
    trace,
57
57
    tree,
58
 
    ui,
59
58
    )
60
59
from bzrlib.branch import Branch
61
60
from bzrlib.cleanup import OperationWithCleanups
73
72
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
74
73
from bzrlib import symbol_versioning
75
74
from bzrlib.urlutils import unescape_for_display
 
75
import bzrlib.ui
76
76
 
77
77
 
78
78
class NullCommitReporter(object):
346
346
            not self.branch.repository._format.supports_tree_reference and
347
347
            (self.branch.repository._format.fast_deltas or
348
348
             len(self.parents) < 2))
349
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
349
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
350
350
        operation.add_cleanup(self.pb.finished)
351
351
        self.basis_revid = self.work_tree.last_revision()
352
352
        self.basis_tree = self.work_tree.basis_tree()
380
380
        self.pb_stage_count = 0
381
381
        self.pb_stage_total = 5
382
382
        if self.bound_branch:
383
 
            # 2 extra stages: "Uploading data to master branch" and "Merging
384
 
            # tags to master branch"
385
 
            self.pb_stage_total += 2
 
383
            self.pb_stage_total += 1
386
384
        self.pb.show_pct = False
387
385
        self.pb.show_spinner = False
388
386
        self.pb.show_eta = False
446
444
            self._set_progress_stage("Uploading data to master branch")
447
445
            # 'commit' to the master first so a timeout here causes the
448
446
            # local branch to be out of date
449
 
            self.master_branch.import_last_revision_info_and_tags(
450
 
                self.branch, new_revno, self.rev_id)
 
447
            self.master_branch.import_last_revision_info(
 
448
                self.branch.repository, new_revno, self.rev_id)
451
449
 
452
450
        # and now do the commit locally.
453
451
        self.branch.set_last_revision_info(new_revno, self.rev_id)
454
452
 
455
 
        # Merge local tags to remote
456
 
        if self.bound_branch:
457
 
            self._set_progress_stage("Merging tags to master branch")
458
 
            tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
459
 
            if tag_conflicts:
460
 
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
461
 
                note("Conflicting tags in bound branch:\n" +
462
 
                    "\n".join(warning_lines))
463
 
 
464
453
        # Make the working tree be up to date with the branch. This
465
454
        # includes automatic changes scheduled to be made to the tree, such
466
455
        # as updating its basis and unversioning paths that were missing.