← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_hashcache.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-11 17:58:56 UTC
  • mto: This revision was merged to the branch mainline in revision 5662.
  • Revision ID: jelmer@samba.org-20110211175856-alncdirjmi75qr67
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_hashcache.py
22
22
from bzrlib.errors import BzrError
23
23
from bzrlib.hashcache import HashCache
24
24
from bzrlib.tests import (
 
25
    OsFifoFeature,
25
26
    TestCaseInTempDir,
26
27
    )
27
 
from bzrlib.tests.features import (
28
 
    OsFifoFeature,
29
 
    )
30
 
 
31
 
 
32
 
sha1 = osutils.sha_string
 
28
 
 
29
 
 
30
def sha1(t):
 
31
    return osutils.sha(t).hexdigest()
33
32
 
34
33
 
35
34
def pause():