/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-28 02:47:10 UTC
  • mfrom: (7519.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200728024710-a2ylds219f1lsl62
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/388173

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
# The newly committed revision is going to have a shape corresponding
20
18
# to that of the working tree.  Files that are not in the
21
19
# working tree and that were in the predecessor are reported as
57
55
    ui,
58
56
    )
59
57
from .branch import Branch
60
 
from .cleanup import ExitStack
 
58
from contextlib import ExitStack
61
59
import breezy.config
62
60
from .errors import (BzrError,
63
61
                     ConflictsInTree,
440
438
            # as updating its basis and unversioning paths that were missing.
441
439
            self.work_tree.unversion(self.deleted_paths)
442
440
            self._set_progress_stage("Updating the working tree")
443
 
            self.work_tree.update_basis_by_delta(self.rev_id,
444
 
                                                 self.builder.get_basis_delta())
 
441
            self.work_tree.update_basis_by_delta(
 
442
                self.rev_id, self.builder.get_basis_delta())
445
443
            self.reporter.completed(new_revno, self.rev_id)
446
444
            self._process_post_hooks(old_revno, new_revno)
447
445
            return self.rev_id