← Back to branch summary

~malept/loggerhead/standalone-auth

« back to all changes in this revision

Viewing changes to loggerhead/history.py

  • Committer: Martin Albisetti
  • Date: 2008-07-17 04:20:22 UTC
  • mfrom: (128.10.33 loggerhead.search)
  • Revision ID: argentina@gmail.com-20080717042022-x0fw8v2jl5fq8hcr
Merge bzr-search integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/history.py
35
35
import time
36
36
from StringIO import StringIO
37
37
 
 
38
from loggerhead import search
38
39
from loggerhead import util
39
40
from loggerhead.wholehistory import compute_whole_history_data
40
41
 
47
48
import bzrlib.tsort
48
49
import bzrlib.ui
49
50
 
50
 
 
51
51
# bzrlib's UIFactory is not thread-safe
52
52
uihack = threading.local()
53
53
 
387
387
            revid_list = self.get_file_view(start_revid, file_id)
388
388
        else:
389
389
            revid_list = None
390
 
 
391
 
        revid_list = self.get_search_revid_list(query, revid_list)
 
390
        revid_list = search.search_revisions(self._branch, query)
392
391
        if revid_list and len(revid_list) > 0:
393
392
            if revid not in revid_list:
394
393
                revid = revid_list[0]
395
394
            return revid, start_revid, revid_list
396
395
        else:
 
396
            # XXX: This should return a message saying that the search could
 
397
            # not be completed due to either missing the plugin or missing a
 
398
            # search index.
397
399
            return None, None, []
398
400
 
399
401
    def get_inventory(self, revid):