← Back to branch summary

~abentley/bzrtools/bzrtools.dev

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to errors.py

Committer: Aaron Bentley
Date: 2008-11-05 14:02:52 UTC
mfrom: (676.1.3 bzrtools-1.9)
Revision ID: aaron@aaronbentley.com-20081105140252-aem9ee88p7m33ceg

Merge with bzrtools-1.9

files added:
clean_tree.py

tests/clean_tree.py

tests/is_clean.py

tests/test_rspush.py

files removed:
.the_kraken

.the_kraken/config

conflict_diff.py

mirror.py

tests/test_conflict_diff.py

tests/test_fetch_ghosts.py

tests/test_graph.py

tests/test_mirror.py

files renamed:
check-release.py => release.py

files modified:
.bzrignore

INSTALL

NEWS

README

__init__.py

branches.py

bzrtools.py

cbranch.py

colordiff.py

command.py

command_classes.py

errors.py

fetch_ghosts.py

graph.py

heads.py

hunk_selector.py

patch.py

patchsource.py

progress.py

rspush.py

setup.py

shelf.py

shell.py

terminal.py

tests/blackbox.py

tests/shelf_tests.py

tests/test_cbranch.py

tests/test_link_tree.py

tests/upstream_import.py

upstream_import.py

userinteractor.py

version.py

zap.py

Show diffs side-by-side

added added

removed removed

74

74

class ChangedBinaryFiles(BzrError):

75

75

76

76

_fmt = 'Changes involve binary files.'

77

78

79

class NoConflictFiles(CommandError):

80

81

_fmt = '%(base_name)s does not exist and there are no pending merges.'

82

83

def __init__(self, base_name):

84

CommandError.__init__(self, base_name=base_name)

85

86

87

class NotArchiveType(BzrError):

88

89

_fmt = '%(path)s is not an archive.'

90

91

def __init__(self, path):

92

BzrError.__init__(self)

93

self.path = path

Older »