Skip to content

Commit 8d69edb

Browse files
committed
legacy: move LegacyRepository, LegacyRemoteRepository, RepoObj1 into borg.legacy package, refs #9556
Create borg.legacy subpackage to isolate Borg 1.x code from the 2.x codebase. - Add src/borg/legacy/__init__.py - Move LegacyRepository + LoggedIO to borg.legacy.repository - Move LegacyRemoteRepository to borg.legacy.remote - Move RepoObj1 to borg.legacy.repoobj - Replace original files with backward-compatible re-export stubs - Update all consumer imports to use borg.legacy.* paths directly
1 parent 84fb1c9 commit 8d69edb

14 files changed

Lines changed: 2795 additions & 2753 deletions

src/borg/archiver/_common.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
from ..helpers.nanorst import rst_to_terminal
1414
from ..manifest import Manifest, AI_HUMAN_SORT_KEYS
1515
from ..patterns import PatternMatcher
16-
from ..legacyremote import LegacyRemoteRepository
16+
from ..legacy.remote import LegacyRemoteRepository
1717
from ..remote import RemoteRepository
18-
from ..legacyrepository import LegacyRepository
18+
from ..legacy.repository import LegacyRepository
1919
from ..repository import Repository
20-
from ..repoobj import RepoObj, RepoObj1
20+
from ..repoobj import RepoObj
21+
from ..legacy.repoobj import RepoObj1
2122
from ..patterns import (
2223
ArgparsePatternAction,
2324
ArgparseExcludeFileAction,

src/borg/archiver/transfer_cmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from ..helpers.argparsing import ArgumentParser, ArgumentTypeError
1111
from ..item import ChunkListEntry
1212
from ..manifest import Manifest
13-
from ..legacyrepository import LegacyRepository
13+
from ..legacy.repository import LegacyRepository
1414
from ..repository import Repository
1515

1616
from ..logger import create_logger

src/borg/helpers/parseformat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,9 +1335,9 @@ def ellipsis_truncate(msg, space):
13351335

13361336
class BorgJsonEncoder(json.JSONEncoder):
13371337
def default(self, o):
1338-
from ..legacyrepository import LegacyRepository
1338+
from ..legacy.repository import LegacyRepository
13391339
from ..repository import Repository
1340-
from ..legacyremote import LegacyRemoteRepository
1340+
from ..legacy.remote import LegacyRemoteRepository
13411341
from ..remote import RemoteRepository
13421342
from ..archive import Archive
13431343
from ..cache import AdHocWithFilesCache

src/borg/legacy/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"""
2+
Borg Legacy Package — Borg 1.x compatibility layer.
3+
4+
This package contains all code specific to reading/writing Borg 1.x repositories.
5+
It is required for ``borg transfer --from-borg1`` and ``borg serve`` (serving v1 clients).
6+
7+
This package can be removed entirely when Borg 1.x support is dropped.
8+
"""

0 commit comments

Comments
 (0)