/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/bzr/weave.py

Move some more tests to breezy.bzr.

Merged from https://code.launchpad.net/~jelmer/brz/move-bzr-tests/+merge/386406

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/weave.py
81
81
from ..errors import (
82
82
    RevisionAlreadyPresent,
83
83
    RevisionNotPresent,
84
 
    UnavailableRepresentation,
85
84
    )
86
85
from ..osutils import dirname, sha, sha_strings, split_lines
87
86
from ..revision import NULL_REVISION
93
92
    AbsentContentFactory,
94
93
    adapter_registry,
95
94
    ContentFactory,
 
95
    ExistingContent,
96
96
    sort_groupcompress,
 
97
    UnavailableRepresentation,
97
98
    VersionedFile,
98
99
    )
99
100
from .weavefile import _read_weave_v5, write_weave_v5
488
489
        if not sha1:
489
490
            sha1 = sha_strings(lines)
490
491
        if sha1 == nostore_sha:
491
 
            raise errors.ExistingContent
 
492
            raise ExistingContent
492
493
        if version_id is None:
493
494
            version_id = b"sha1:" + sha1
494
495
        if version_id in self._name_map: