/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: Jelmer Vernooij
  • Date: 2020-03-22 20:02:36 UTC
  • mto: (7490.7.7 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200322200236-fsbl91ktcn6fcbdd
Fix tests.

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
 
17
19
# The newly committed revision is going to have a shape corresponding
18
20
# to that of the working tree.  Files that are not in the
19
21
# working tree and that were in the predecessor are reported as
55
57
    ui,
56
58
    )
57
59
from .branch import Branch
58
 
from contextlib import ExitStack
 
60
from .cleanup import ExitStack
59
61
import breezy.config
60
62
from .errors import (BzrError,
61
63
                     ConflictsInTree,
438
440
            # as updating its basis and unversioning paths that were missing.
439
441
            self.work_tree.unversion(self.deleted_paths)
440
442
            self._set_progress_stage("Updating the working tree")
441
 
            self.work_tree.update_basis_by_delta(
442
 
                self.rev_id, self.builder.get_basis_delta())
 
443
            self.work_tree.update_basis_by_delta(self.rev_id,
 
444
                                                 self.builder.get_basis_delta())
443
445
            self.reporter.completed(new_revno, self.rev_id)
444
446
            self._process_post_hooks(old_revno, new_revno)
445
447
            return self.rev_id