Show More
@@ -812,14 +812,18 b' class GitRemote(RemoteBase):' | |||||
812 | return repo.get_description() |
|
812 | return repo.get_description() | |
813 |
|
813 | |||
814 | @reraise_safe_exceptions |
|
814 | @reraise_safe_exceptions | |
815 |
def get_missing_revs(self, wire, rev1, rev2, path |
|
815 | def get_missing_revs(self, wire, rev1, rev2, other_repo_path): | |
|
816 | origin_repo_path = wire['path'] | |||
816 | repo = self._factory.repo(wire) |
|
817 | repo = self._factory.repo(wire) | |
817 | LocalGitClient(thin_packs=False).fetch(path2, repo) |
|
818 | # fetch from other_repo_path to our origin repo | |
|
819 | LocalGitClient(thin_packs=False).fetch(other_repo_path, repo) | |||
818 |
|
820 | |||
819 | wire_remote = wire.copy() |
|
821 | wire_remote = wire.copy() | |
820 |
wire_remote['path'] = path |
|
822 | wire_remote['path'] = other_repo_path | |
821 | repo_remote = self._factory.repo(wire_remote) |
|
823 | repo_remote = self._factory.repo(wire_remote) | |
822 | LocalGitClient(thin_packs=False).fetch(path2, repo_remote) |
|
824 | ||
|
825 | # fetch from origin_repo_path to our remote repo | |||
|
826 | LocalGitClient(thin_packs=False).fetch(origin_repo_path, repo_remote) | |||
823 |
|
827 | |||
824 | revs = [ |
|
828 | revs = [ | |
825 | x.commit.id |
|
829 | x.commit.id |
General Comments 0
You need to be logged in to leave comments.
Login now