equal
deleted
inserted
replaced
334 # check case-folding collision in provisional merged manifest |
334 # check case-folding collision in provisional merged manifest |
335 foldmap = {} |
335 foldmap = {} |
336 for f in pmmf: |
336 for f in pmmf: |
337 fold = util.normcase(f) |
337 fold = util.normcase(f) |
338 if fold in foldmap: |
338 if fold in foldmap: |
339 raise error.StateError( |
339 msg = _(b"case-folding collision between %s and %s") |
340 _(b"case-folding collision between %s and %s") |
340 msg %= (f, foldmap[fold]) |
341 % (f, foldmap[fold]) |
341 raise error.StateError(msg) |
342 ) |
|
343 foldmap[fold] = f |
342 foldmap[fold] = f |
344 |
343 |
345 # check case-folding of directories |
344 # check case-folding of directories |
346 foldprefix = unfoldprefix = lastfull = b'' |
345 foldprefix = unfoldprefix = lastfull = b'' |
347 for fold, f in sorted(foldmap.items()): |
346 for fold, f in sorted(foldmap.items()): |