← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/__init__.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/__init__.py
74
74
    from bzrlib.repofmt import (
75
75
        groupcompress_repo,
76
76
        knitrepo,
77
 
        pack_repo,
 
77
        knitpack_repo,
78
78
        )
79
79
    result = []
80
80
    def add_combo(interrepo_cls, from_format, to_format, extra_setup=None,
120
120
              knitrepo.RepositoryFormatKnit3())
121
121
    add_combo(knitrepo.InterKnitRepo,
122
122
              knitrepo.RepositoryFormatKnit1(),
123
 
              pack_repo.RepositoryFormatKnitPack1())
 
123
              knitpack_repo.RepositoryFormatKnitPack1())
124
124
    add_combo(knitrepo.InterKnitRepo,
125
 
              pack_repo.RepositoryFormatKnitPack1(),
 
125
              knitpack_repo.RepositoryFormatKnitPack1(),
126
126
              knitrepo.RepositoryFormatKnit1())
127
127
    add_combo(knitrepo.InterKnitRepo,
128
128
              knitrepo.RepositoryFormatKnit3(),
129
 
              pack_repo.RepositoryFormatKnitPack3())
 
129
              knitpack_repo.RepositoryFormatKnitPack3())
130
130
    add_combo(knitrepo.InterKnitRepo,
131
 
              pack_repo.RepositoryFormatKnitPack3(),
 
131
              knitpack_repo.RepositoryFormatKnitPack3(),
132
132
              knitrepo.RepositoryFormatKnit3())
133
133
    add_combo(knitrepo.InterKnitRepo,
134
 
              pack_repo.RepositoryFormatKnitPack3(),
135
 
              pack_repo.RepositoryFormatKnitPack4())
136
 
    add_combo(InterDifferingSerializer,
137
 
              pack_repo.RepositoryFormatKnitPack1(),
138
 
              pack_repo.RepositoryFormatKnitPack6RichRoot())
139
 
    add_combo(InterDifferingSerializer,
140
 
              pack_repo.RepositoryFormatKnitPack1(),
141
 
              pack_repo.RepositoryFormatKnitPack6RichRoot(),
 
134
              knitpack_repo.RepositoryFormatKnitPack3(),
 
135
              knitpack_repo.RepositoryFormatKnitPack4())
 
136
    add_combo(InterDifferingSerializer,
 
137
              knitpack_repo.RepositoryFormatKnitPack1(),
 
138
              knitpack_repo.RepositoryFormatKnitPack6RichRoot())
 
139
    add_combo(InterDifferingSerializer,
 
140
              knitpack_repo.RepositoryFormatKnitPack1(),
 
141
              knitpack_repo.RepositoryFormatKnitPack6RichRoot(),
142
142
              force_known_graph,
143
143
              label='InterDifferingSerializer+get_known_graph_ancestry')
144
144
    add_combo(InterDifferingSerializer,
145
 
              pack_repo.RepositoryFormatKnitPack6RichRoot(),
 
145
              knitpack_repo.RepositoryFormatKnitPack6RichRoot(),
146
146
              groupcompress_repo.RepositoryFormat2a())
147
147
    add_combo(InterDifferingSerializer,
148
148
              groupcompress_repo.RepositoryFormat2a(),
149
 
              pack_repo.RepositoryFormatKnitPack6RichRoot())
 
149
              knitpack_repo.RepositoryFormatKnitPack6RichRoot())
150
150
    return result
151
151
 
152
152