Mercurial > hg > hg-git
diff hggit/git_handler.py @ 790:77416ddca136
git2hg: return a struct from find_incoming
We're going to return more data from find_incoming soon. Make that easier than
parsing a tuple.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 14 Oct 2014 16:35:37 -0700 |
| parents | e734d71cc558 |
| children | c19835c3c60d |
line wrap: on
line diff
--- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -369,7 +369,7 @@ else: reqrefs = refs - commits = [bin(c) for c in self.get_git_incoming(reqrefs)[1]] + commits = [bin(c) for c in self.get_git_incoming(reqrefs).commits] b = overlayrepo(self, commits, refs) @@ -667,7 +667,9 @@ return git2hg.find_incoming(self.git.object_store, self._map_git, refs) def import_git_objects(self, remote_name=None, refs=None): - commit_cache, commits = self.get_git_incoming(refs) + result = self.get_git_incoming(refs) + commits = result.commits + commit_cache = result.commit_cache # import each of the commits, oldest first total = len(commits) if total: