facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

git_handler: move check for gparents in repo to start of import_git_commit

Browse Source 
Also drop Mercurial < 1.5 support.
This commit is contained in:
Siddharth Agarwal 2014-02-14 16:16:25 -08:00
parent 82b4618e1f
commit 94f67b719d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hggit/git_handler.py
View File

@ -677,6 +677,11 @@ class GitHandler(object):
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 @@ class GitHandler(object):
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)