/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
    ]
28
28
 
29
29
 
30
 
from bzrlib import (
 
30
from . import (
31
31
    cleanup,
32
32
    errors,
33
33
    revision as _mod_revision,
34
34
    ui,
35
35
    )
36
 
from bzrlib.trace import mutter
37
 
from bzrlib.tsort import topo_sort
38
 
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
39
 
from bzrlib.i18n import gettext
 
36
from .trace import mutter
 
37
from .tsort import topo_sort
 
38
from .versionedfile import AdapterFactory, FulltextContentFactory
 
39
from .i18n import gettext
40
40
 
41
41
 
42
42
def reconcile(dir, canonicalize_chks=False):
118
118
            ui.ui_factory.note(gettext(
119
119
                'Reconcile aborted: revision index has inconsistent parents.'))
120
120
            ui.ui_factory.note(gettext(
121
 
                'Run "bzr check" for more details.'))
 
121
                'Run "brz check" for more details.'))
122
122
        else:
123
123
            ui.ui_factory.note(gettext('Reconciliation complete.'))
124
124
 
235
235
        self.inventory = self.repo.inventories
236
236
        self.revisions = self.repo.revisions
237
237
        # the total set of revisions to process
238
 
        self.pending = set([key[-1] for key in self.revisions.keys()])
 
238
        self.pending = {key[-1] for key in self.revisions.keys()}
239
239
 
240
240
        # mapping from revision_id to parents
241
241
        self._rev_graph = {}
269
269
        # if this worked, the set of new_inventories.keys should equal
270
270
        # self.pending
271
271
        if not (set(new_inventories.keys()) ==
272
 
            set([(revid,) for revid in self.pending])):
 
272
            {(revid,) for revid in self.pending}):
273
273
            raise AssertionError()
274
274
        self.pb.update(gettext('Writing weave'))
275
275
        self.repo._activate_new_inventory()