Mercurial > hg-git

diff hggit/git_handler.py @ 298:6ad6945b6629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: make it possible to un-wedge the repo after stripping git revs This adds a new command, which is inelegant, but it lets you safely pick up pulling fairly quickly.
author Augie Fackler <durin42@gmail.com>
date Thu, 25 Mar 2010 20:24:00 -0500
parents 8aaae306d46f
children eec31dee258e
line wrap: on
line diff
--- a/hggit/git_handler.py	Thu Mar 25 20:23:00 2010 -0500
+++ b/hggit/git_handler.py	Thu Mar 25 20:24:00 2010 -0500
@@ -14,12 +14,12 @@
 
 
 class GitHandler(object):
+    mapfile = 'git-mapfile'
+    tagsfile = 'git-tags'
 
     def __init__(self, dest_repo, ui):
         self.repo = dest_repo
         self.ui = ui
-        self.mapfile = 'git-mapfile'
-        self.tagsfile = 'git-tags'
 
         if ui.config('git', 'intree'):
             self.gitdir = self.repo.wjoin('.git')
@@ -509,6 +509,8 @@
         if octopus:
             extra['hg-git'] ='octopus-done'
 
+        if p1 not in self.repo or p2 not in self.repo:
+            raise hgutil.Abort(_('you appear to have run strip - please run hg git-cleanup'))
         ctx = context.memctx(self.repo, (p1, p2), text, list(files), getfilectx,
                              author, date, extra)