comparison hgext/largefiles/overrides.py @ 20148:7ac03bfa1369 stable

largefiles: don't crash on 'local renamed directory' actions a12798938721 introduced splitstandin on all action filenames. It would however crash on 'd' actions where the filename is None. Fix that and add test coverage for that case.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Nov 2013 15:38:33 +0100
parents e92c6524a76d
children 28fe5abc906f
comparison
equal deleted inserted replaced
20147:7547bcc1a3ad 20148:7ac03bfa1369
378 processed = [] 378 processed = []
379 379
380 for action in actions: 380 for action in actions:
381 f, m, args, msg = action 381 f, m, args, msg = action
382 382
383 splitstandin = lfutil.splitstandin(f) 383 splitstandin = f and lfutil.splitstandin(f)
384 if (m == "g" and splitstandin is not None and 384 if (m == "g" and splitstandin is not None and
385 splitstandin in p1 and splitstandin not in removes): 385 splitstandin in p1 and splitstandin not in removes):
386 # Case 1: normal file in the working copy, largefile in 386 # Case 1: normal file in the working copy, largefile in
387 # the second parent 387 # the second parent
388 lfile = splitstandin 388 lfile = splitstandin