/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

Cope with tuples in refs dictionary.

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
 
from bzrlib.merge_directive import BaseMergeDirective
 
33
try:
 
34
    from bzrlib.merge_directive import BaseMergeDirective
 
35
except ImportError:
 
36
    from bzrlib.merge_directive import (
 
37
        _BaseMergeDirective as BaseMergeDirective,
 
38
        )
34
39
 
35
40
from bzrlib.plugins.git import (
36
41
    version_info as bzr_git_version_info,
126
131
    def _generate_commit(cls, repository, revision_id, num, total):
127
132
        s = StringIO()
128
133
        store = get_object_store(repository)
129
 
        store.lock_read()
130
 
        try:
131
 
            commit = store[store._lookup_revision_sha1(revision_id)]
132
 
        finally:
133
 
            store.unlock()
 
134
        commit = store[store._lookup_revision_sha1(revision_id)]
134
135
        from dulwich.patch import write_commit_patch, get_summary
135
136
        try:
136
137
            lhs_parent = repository.get_revision(revision_id).parent_ids[0]