Mercurial > hg
comparison hgext/convert/git.py @ 16295:ba42eb722bb3
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 Mar 2012 16:17:46 -0500 |
parents | 589aab2ca716 101c8a1befb1 |
children | 525fdb738975 |
comparison
equal
deleted
inserted
replaced
16291:9952ac7e0968 | 16295:ba42eb722bb3 |
---|---|
95 f = l | 95 f = l |
96 if f not in seen: | 96 if f not in seen: |
97 seen.add(f) | 97 seen.add(f) |
98 entry = entry.split() | 98 entry = entry.split() |
99 h = entry[3] | 99 h = entry[3] |
100 if entry[1] == '160000': | |
101 raise util.Abort('git submodules are not supported!') | |
100 p = (entry[1] == "100755") | 102 p = (entry[1] == "100755") |
101 s = (entry[1] == "120000") | 103 s = (entry[1] == "120000") |
102 self.modecache[(f, h)] = (p and "x") or (s and "l") or "" | 104 self.modecache[(f, h)] = (p and "x") or (s and "l") or "" |
103 changes.append((f, h)) | 105 changes.append((f, h)) |
104 entry = None | 106 entry = None |