Mercurial > hg > hg-git

changeset 642:5a17de2247bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git_handler: move check for gparents in repo to start of import_git_commit Also drop Mercurial < 1.5 support.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 14 Feb 2014 16:16:25 -0800
parents cacd98c7382e
children f492e4759e52
files hggit/git_handler.py
diffstat 1 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -677,6 +677,11 @@
 
         gparents = map(self.map_hg_get, commit.parents)
 
+        for parent in gparents:
+            if parent not in self.repo:
+                raise hgutil.Abort(_('you appear to have run strip - '
+                                     'please run hg git-cleanup'))
+
         # get a list of the changed, added, removed files and gitlinks
         files, gitlinks = self.get_files_changed(commit)
 
@@ -835,16 +840,6 @@
         if octopus:
             extra['hg-git'] ='octopus-done'
 
-        # TODO use 'n in self.repo' when we require hg 1.5
-        def repo_contains(n):
-            try:
-                return bool(self.repo.lookup(n))
-            except error.RepoLookupError:
-                return False
-
-        if not (repo_contains(p1) and repo_contains(p2)):
-            raise hgutil.Abort(_('you appear to have run strip - '
-                                 'please run hg git-cleanup'))
         ctx = context.memctx(self.repo, (p1, p2), text,
                              list(files) + findconvergedfiles(p1, p2),
                              getfilectx, author, date, extra)