← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-05 14:12:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6348.
  • Revision ID: jelmer@samba.org-20111205141223-8qxae4h37satlzgq
Move more functionality to vf_search.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
28
28
    bencode,
29
29
    errors,
30
30
    estimate_compressed_size,
31
 
    graph,
32
31
    osutils,
33
32
    pack,
34
33
    trace,
35
34
    ui,
 
35
    vf_search,
36
36
    )
37
37
from bzrlib.bzrdir import BzrDir
38
38
from bzrlib.smart.request import (
85
85
            they expected and get it from elsewhere.
86
86
        """
87
87
        if search_bytes == 'everything':
88
 
            return graph.EverythingResult(repository), None
 
88
            return vf_search.EverythingResult(repository), None
89
89
        lines = search_bytes.split('\n')
90
90
        if lines[0] == 'ancestry-of':
91
91
            heads = lines[1:]
92
 
            search_result = graph.PendingAncestryResult(heads, repository)
 
92
            search_result = vf_search.PendingAncestryResult(heads, repository)
93
93
            return search_result, None
94
94
        elif lines[0] == 'search':
95
95
            return self.recreate_search_from_recipe(repository, lines[1:],