/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 server.py

Merge dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
105
105
 
106
106
        repo = Repository.open(self.directory)
107
107
 
 
108
        objects = set()
 
109
 
108
110
        repo.lock_read()
109
111
        try:
110
112
            have = graph_walker.next()
127
129
                for sha, obj in inventory_to_tree_and_blobs(repo, self.mapping, commit):
128
130
                    if sha not in obj_sent:
129
131
                        obj_sent.add(sha)
130
 
                        yield obj
 
132
                        objects.add(obj)
131
133
 
132
 
                yield revision_to_commit(rev, self.mapping, sha)
 
134
                objects.add(revision_to_commit(rev, self.mapping, sha))
133
135
 
134
136
        finally:
135
137
            repo.unlock()
136
138
 
 
139
        return (len(objects), iter(objects))
 
140
 
137
141
 
138
142
def revision_to_commit(rev, mapping, tree_sha):
139
143
    """