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

convert: for git, factor out code to add entries to a separate function

Browse Source 
We're going to call this for multiple files in one iteration in upcoming
patches.
This commit is contained in:
Siddharth Agarwal 2014-09-11 23:57:49 -07:00
parent 02fa27546c
commit cff27af0c6
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hgext/convert/git.py
View File

@ -188,11 +188,31 @@ class convert_git(converter_source):
changes = []
seen = set()
entry = None
subexists = False
subdeleted = False
subexists = [False]
subdeleted = [False]
difftree = fh.read().split('\x00')
lcount = len(difftree)
i = 0
def add(entry, f):
seen.add(f)
h = entry[3]
p = (entry[1] == "100755")
s = (entry[1] == "120000")
if f == '.gitmodules':
subexists[0] = True
if entry[4] == 'D':
subdeleted[0] = True
changes.append(('.hgsub', hex(nullid)))
else:
changes.append(('.hgsub', ''))
elif entry[1] == '160000' or entry[0] == ':160000':
subexists[0] = True
else:
self.modecache[(f, h)] = (p and "x") or (s and "l") or ""
changes.append((f, h))
while i < lcount:
l = difftree[i]
i += 1
@ -203,29 +223,13 @@ class convert_git(converter_source):
continue
f = l
if f not in seen:
seen.add(f)
h = entry[3]
p = (entry[1] == "100755")
s = (entry[1] == "120000")
if f == '.gitmodules':
subexists = True
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:
self.modecache[(f, h)] = (p and "x") or (s and "l") or ""
changes.append((f, h))
add(entry, f)
entry = None
if fh.close():
raise util.Abort(_('cannot read changes in %s') % version)
if subexists:
if subdeleted:
if subexists[0]:
if subdeleted[0]:
changes.append(('.hgsubstate', hex(nullid)))
else:
self.retrievegitmodules(version)