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

In dfetch, skip fetching pushed revisions back, as cmd_dpush will already take care of that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
148
148
        """Import the gist of the ancestry of a particular revision."""
149
149
        revidmap = {}
150
150
        mapping = self.target.get_mapping()
151
 
        self.source.lock_write()
 
151
        self.source.lock_read()
152
152
        try:
153
153
            todo = self.missing_revisions(stop_revision)
154
154
            object_generator = MissingObjectsIterator(self.source, mapping)
157
157
                new_bzr_revid = mapping.revision_id_foreign_to_bzr(git_commit)
158
158
                revidmap[old_bzr_revid] = new_bzr_revid
159
159
            self.target._git.object_store.add_objects(object_generator) 
160
 
            if revidmap != {}:
161
 
                self.source.fetch(self.target, 
162
 
                        revision_id=revidmap[stop_revision])
163
160
        finally:
164
161
            self.source.unlock()
165
162
        return revidmap