← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
lazy_import(globals(), """
19
 
import cStringIO
20
 
import re
21
19
import time
22
20
 
23
21
from bzrlib import (
24
22
    bzrdir,
25
23
    check,
26
 
    chk_map,
27
24
    config,
28
25
    controldir,
29
26
    debug,
32
29
    generate_ids,
33
30
    gpg,
34
31
    graph,
35
 
    inventory,
36
32
    inventory_delta,
37
33
    lockable_files,
38
34
    lockdir,
39
35
    lru_cache,
40
36
    osutils,
41
 
    pyutils,
42
37
    revision as _mod_revision,
43
38
    static_tuple,
44
 
    trace,
45
39
    tsort,
46
40
    versionedfile,
47
41
    )
104
98
 
105
99
        :param repository: Repository to commit to.
106
100
        :param parents: Revision ids of the parents of the new revision.
107
 
        :param config: Configuration to use.
108
101
        :param timestamp: Optional timestamp recorded for commit.
109
102
        :param timezone: Optional timezone for timestamp.
110
103
        :param committer: Optional committer to set for commit.
4173
4166
                parse_result = deserialiser.parse_text_bytes(
4174
4167
                    inventory_delta_bytes)
4175
4168
            except inventory_delta.IncompatibleInventoryDelta, err:
4176
 
                trace.mutter("Incompatible delta: %s", err.msg)
 
4169
                mutter("Incompatible delta: %s", err.msg)
4177
4170
                raise errors.IncompatibleRevision(self.target_repo._format)
4178
4171
            basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4179
4172
            revision_id = new_id