/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-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
60
60
from .branch import Branch
61
61
from .cleanup import OperationWithCleanups
62
62
import breezy.config
63
 
from .errors import (BzrError, PointlessCommit,
 
63
from .errors import (BzrError,
64
64
                     ConflictsInTree,
65
65
                     StrictCommitFailed
66
66
                     )
75
75
from .i18n import gettext
76
76
 
77
77
 
 
78
class PointlessCommit(BzrError):
 
79
 
 
80
    _fmt = "No changes to commit"
 
81
 
 
82
 
 
83
class CannotCommitSelectedFileMerge(BzrError):
 
84
 
 
85
    _fmt = 'Selected-file commit of merges is not supported yet:'\
 
86
        ' files %(files_str)s'
 
87
 
 
88
    def __init__(self, files):
 
89
        files_str = ', '.join(files)
 
90
        BzrError.__init__(self, files=files, files_str=files_str)
 
91
 
 
92
 
 
93
class ExcludesUnsupported(BzrError):
 
94
 
 
95
    _fmt = ('Excluding paths during commit is not supported by '
 
96
            'repository at %(repository)r.')
 
97
 
 
98
    def __init__(self, repository):
 
99
        BzrError.__init__(self, repository=repository)
 
100
 
 
101
 
78
102
def filter_excluded(iter_changes, exclude):
79
103
    """Filter exclude filenames.
80
104