Mercurial > hg
diff hgext/convert/git.py @ 21868:3420346174b1 stable
convert: detect removal of ".gitmodules" at git source revisions correctly
Before this patch, all operations applied on ".gitmodules" at git
source revisions are treated as modification, even if they are
actually removal of it.
If removal of ".gitmodules" is treated as modification unexpectedly,
"hg convert" is aborted by the exception raised in
"retrievegitmodules()" for ".gitmodules" at the git source revision
removing it, because that revision doesn't have any information of
".gitmodules".
This patch detects removal of ".gitmodules" at git source revisions
correctly.
If ".gitmodules" is removed at the git source revision, this patch
records "hex(nullid)" as the contents hash value for ".hgsub" and
".hgsubstate" at the destination revision.
This patch makes "getfile()" raise IOError also for ".hgstatus" and
".hgsubstate" if the contents hash value is "hex(nullid)", and this
tells removal of ".hgstatus" and ".hgsubstate" at the destination
revision to "localrepository.commitctx()" correctly.
For files other than ".hgstatus" and ".hgsubstate", checking the
contents hash value in "getfile()" may be redundant, because
"catfile()" for them also does so.
But this patch chooses writing it only once at the beginning of
"getfile()", to avoid writing same code twice both for ".hgsub" and
".hgsubstate" separately.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 14 Jul 2014 23:33:59 +0900 |
parents | e8203629371b |
children | cf599f8a2da8 |
line wrap: on
line diff
--- a/hgext/convert/git.py Mon Jul 14 12:44:45 2014 -0500 +++ b/hgext/convert/git.py Mon Jul 14 23:33:59 2014 +0900 @@ -104,6 +104,8 @@ return data def getfile(self, name, rev): + if rev == hex(nullid): + raise IOError if name == '.hgsub': data = '\n'.join([m.hgsub() for m in self.submoditer()]) mode = '' @@ -155,6 +157,7 @@ seen = set() entry = None subexists = False + subdeleted = False for l in fh.read().split('\x00'): if not entry: if not l.startswith(':'): @@ -171,7 +174,11 @@ if f == '.gitmodules': subexists = True - changes.append(('.hgsub', '')) + if entry[4] == 'D': + subdeleted = True + changes.append(('.hgsub', hex(nullid))) + else: + changes.append(('.hgsub', '')) elif entry[1] == '160000' or entry[0] == ':160000': subexists = True else: @@ -182,8 +189,11 @@ raise util.Abort(_('cannot read changes in %s') % version) if subexists: - self.retrievegitmodules(version) - changes.append(('.hgsubstate', '')) + if subdeleted: + changes.append(('.hgsubstate', hex(nullid))) + else: + self.retrievegitmodules(version) + changes.append(('.hgsubstate', '')) return (changes, {}) def getcommit(self, version):