equal
deleted
inserted
replaced
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 |
389 standin = f |
389 standin = f |
390 msg = _('%s has been turned into a largefile\n' |
390 msg = _('remote turned local normal file %s into a largefile\n' |
391 'use (l)argefile or keep as (n)ormal file?' |
391 'use (l)argefile or keep (n)ormal file?' |
392 '$$ &Largefile $$ &Normal file') % lfile |
392 '$$ &Largefile $$ &Normal file') % lfile |
393 if repo.ui.promptchoice(msg, 0) == 0: |
393 if repo.ui.promptchoice(msg, 0) == 0: |
394 processed.append((lfile, "r", None, msg)) |
394 processed.append((lfile, "r", None, msg)) |
395 processed.append((standin, "g", (p2.flags(standin),), msg)) |
395 processed.append((standin, "g", (p2.flags(standin),), msg)) |
396 else: |
396 else: |
399 lfutil.standin(f) in p1 and lfutil.standin(f) not in removes): |
399 lfutil.standin(f) in p1 and lfutil.standin(f) not in removes): |
400 # Case 2: largefile in the working copy, normal file in |
400 # Case 2: largefile in the working copy, normal file in |
401 # the second parent |
401 # the second parent |
402 standin = lfutil.standin(f) |
402 standin = lfutil.standin(f) |
403 lfile = f |
403 lfile = f |
404 msg = _('%s has been turned into a normal file\n' |
404 msg = _('remote turned local largefile %s into a normal file\n' |
405 'keep as (l)argefile or use (n)ormal file?' |
405 'keep (l)argefile or use (n)ormal file?' |
406 '$$ &Largefile $$ &Normal file') % lfile |
406 '$$ &Largefile $$ &Normal file') % lfile |
407 if repo.ui.promptchoice(msg, 0) == 0: |
407 if repo.ui.promptchoice(msg, 0) == 0: |
408 processed.append((lfile, "r", None, msg)) |
408 processed.append((lfile, "r", None, msg)) |
409 else: |
409 else: |
410 processed.append((standin, "r", None, msg)) |
410 processed.append((standin, "r", None, msg)) |