← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2010-07-04 06:22:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5332.
  • Revision ID: robertc@robertcollins.net-20100704062211-tk9hw6bnsn5x47fm
``bzrlib.lsprof.profile`` will no longer silently generate bad threaded
profiles when concurrent profile requests are made. Instead the profile
requests will be serialised. Reentrant requests will now deadlock.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
16
16
 
17
17
import warnings
18
18
 
 
19
from bzrlib.lazy_import import lazy_import
 
20
lazy_import(globals(), """
19
21
from bzrlib import (
20
22
    branch as _mod_branch,
21
23
    conflicts as _mod_conflicts,
22
24
    debug,
23
 
    decorators,
24
25
    errors,
25
26
    graph as _mod_graph,
26
 
    hooks,
27
27
    merge3,
28
28
    osutils,
29
29
    patiencediff,
34
34
    tree as _mod_tree,
35
35
    tsort,
36
36
    ui,
37
 
    versionedfile
 
37
    versionedfile,
38
38
    )
39
39
from bzrlib.cleanup import OperationWithCleanups
 
40
""")
 
41
from bzrlib import (
 
42
    decorators,
 
43
    hooks,
 
44
    )
40
45
from bzrlib.symbol_versioning import (
41
46
    deprecated_in,
42
47
    deprecated_method,
1455
1460
    def get_lines(self, tree, file_id):
1456
1461
        """Return the lines in a file, or an empty list."""
1457
1462
        if tree.has_id(file_id):
1458
 
            return tree.get_file(file_id).readlines()
 
1463
            return tree.get_file_lines(file_id)
1459
1464
        else:
1460
1465
            return []
1461
1466