/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: 2017-07-31 22:36:57 UTC
  • mfrom: (6729.7.2 move-errors-knit)
  • Revision ID: jelmer@jelmer.uk-20170731223657-m1gjn4xvesat87v4
Merge lp:~jelmer/brz/move-errors-knit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
412
412
        # After a merge, a selected file commit is not supported.
413
413
        # See 'bzr help merge' for an explanation as to why.
414
414
        if len(self.parents) > 1 and self.specific_files is not None:
415
 
            raise errors.CannotCommitSelectedFileMerge(self.specific_files)
 
415
            raise CannotCommitSelectedFileMerge(self.specific_files)
416
416
        # Excludes are a form of selected file commit.
417
417
        if len(self.parents) > 1 and self.exclude:
418
 
            raise errors.CannotCommitSelectedFileMerge(self.exclude)
 
418
            raise CannotCommitSelectedFileMerge(self.exclude)
419
419
 
420
420
        # Collect the changes
421
421
        self._set_progress_stage("Collecting changes", counter=True)
771
771
                allow_pointless=self.allow_pointless,
772
772
                strict=self.strict, verbose=self.verbose,
773
773
                local=self.local, reporter=self.reporter)
774
 
        except errors.PointlessCommit:
 
774
        except PointlessCommit:
775
775
            return self.work_tree.get_reference_revision(file_id)
776
776
 
777
777
    def _set_progress_stage(self, name, counter=False):