/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to send.py

Fix unpeel map.

Show diffs side-by-side

added added

removed removed

Lines of Context:
send.py
30
30
    revision as _mod_revision,
31
31
    )
32
32
 
33
 
try:
34
 
    from bzrlib.merge_directive import BaseMergeDirective
35
 
except ImportError:
36
 
    from bzrlib.merge_directive import (
37
 
        _BaseMergeDirective as BaseMergeDirective,
38
 
        )
 
33
from bzrlib.merge_directive import BaseMergeDirective
39
34
 
40
35
from bzrlib.plugins.git import (
41
36
    version_info as bzr_git_version_info,
131
126
    def _generate_commit(cls, repository, revision_id, num, total):
132
127
        s = StringIO()
133
128
        store = get_object_store(repository)
134
 
        commit = store[store._lookup_revision_sha1(revision_id)]
 
129
        store.lock_read()
 
130
        try:
 
131
            commit = store[store._lookup_revision_sha1(revision_id)]
 
132
        finally:
 
133
            store.unlock()
135
134
        from dulwich.patch import write_commit_patch, get_summary
136
135
        try:
137
136
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]