/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: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
562
562
        #       to local.
563
563
 
564
564
        # Make sure the local branch is identical to the master
565
 
        master_info = self.master_branch.last_revision_info()
566
 
        local_info = self.branch.last_revision_info()
567
 
        if local_info != master_info:
 
565
        master_revid = self.master_branch.last_revision()
 
566
        local_revid = self.branch.last_revision()
 
567
        if local_revid != master_revid:
568
568
            raise errors.BoundBranchOutOfDate(self.branch,
569
569
                                              self.master_branch)
570
570
 
588
588
            # - in a checkout scenario the tree may have no
589
589
            # parents but the branch may do.
590
590
            first_tree_parent = breezy.revision.NULL_REVISION
591
 
        old_revno, master_last = self.master_branch.last_revision_info()
 
591
        try:
 
592
            old_revno, master_last = self.master_branch.last_revision_info()
 
593
        except errors.UnsupportedOperation:
 
594
            master_last = self.master_branch.last_revision()
 
595
            old_revno = self.branch.revision_id_to_revno(master_last)
592
596
        if master_last != first_tree_parent:
593
597
            if master_last != breezy.revision.NULL_REVISION:
594
598
                raise errors.OutOfDateTree(self.work_tree)
677
681
        if self.exclude:
678
682
            iter_changes = filter_excluded(iter_changes, self.exclude)
679
683
        iter_changes = self._filter_iter_changes(iter_changes)
680
 
        for file_id, path, fs_hash in self.builder.record_iter_changes(
 
684
        for path, fs_hash in self.builder.record_iter_changes(
681
685
                self.work_tree, self.basis_revid, iter_changes):
682
686
            self.work_tree._observed_sha1(path, fs_hash)
683
687