Mercurial > hg
comparison hgext/largefiles/overrides.py @ 19953:593207462618 stable
largefiles: remove extra check for file to get - it _is_ by definition in p2
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 25 Oct 2013 02:25:10 +0800 |
| parents | 8eb99e5cec4a |
| children | 427ce5633c1c |
comparison
equal
deleted
inserted
replaced
| 19952:8eb99e5cec4a | 19953:593207462618 |
|---|---|
| 379 for action in actions: | 379 for action in actions: |
| 380 f, m, args, msg = action | 380 f, m, args, msg = action |
| 381 | 381 |
| 382 splitstandin = lfutil.splitstandin(f) | 382 splitstandin = lfutil.splitstandin(f) |
| 383 if (m == "g" and splitstandin is not None and | 383 if (m == "g" and splitstandin is not None and |
| 384 splitstandin in p1 and f in p2): | 384 splitstandin in p1): |
| 385 # Case 1: normal file in the working copy, largefile in | 385 # Case 1: normal file in the working copy, largefile in |
| 386 # the second parent | 386 # the second parent |
| 387 lfile = splitstandin | 387 lfile = splitstandin |
| 388 standin = f | 388 standin = f |
| 389 msg = _('%s has been turned into a largefile\n' | 389 msg = _('%s has been turned into a largefile\n' |
| 392 if repo.ui.promptchoice(msg, 0) == 0: | 392 if repo.ui.promptchoice(msg, 0) == 0: |
| 393 processed.append((lfile, "r", None, msg)) | 393 processed.append((lfile, "r", None, msg)) |
| 394 processed.append((standin, "g", (p2.flags(standin),), msg)) | 394 processed.append((standin, "g", (p2.flags(standin),), msg)) |
| 395 else: | 395 else: |
| 396 processed.append((standin, "r", None, msg)) | 396 processed.append((standin, "r", None, msg)) |
| 397 elif m == "g" and lfutil.standin(f) in p1 and f in p2: | 397 elif m == "g" and lfutil.standin(f) in p1: |
| 398 # Case 2: largefile in the working copy, normal file in | 398 # Case 2: largefile in the working copy, normal file in |
| 399 # the second parent | 399 # the second parent |
| 400 standin = lfutil.standin(f) | 400 standin = lfutil.standin(f) |
| 401 lfile = f | 401 lfile = f |
| 402 msg = _('%s has been turned into a normal file\n' | 402 msg = _('%s has been turned into a normal file\n' |