Mercurial > hg
comparison hgext/largefiles/overrides.py @ 23307:9dd0d0d61a24
largefiles: update comments to refer to the right overridden method
This cleans up leftovers from b228ad1f79d7 (largefiles: override
calculateupdates instead of manifestmerge, 2014-03-02).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 14 Nov 2014 05:58:59 -0800 |
parents | 4be754832829 |
children | 3177d710630d |
comparison
equal
deleted
inserted
replaced
23306:f7a42f8e82bd | 23307:9dd0d0d61a24 |
---|---|
378 # The largefiles are seen as unknown, so this prevents us from merging | 378 # The largefiles are seen as unknown, so this prevents us from merging |
379 # in a file 'foo' if we already have a largefile with the same name. | 379 # in a file 'foo' if we already have a largefile with the same name. |
380 # | 380 # |
381 # The overridden function filters the unknown files by removing any | 381 # The overridden function filters the unknown files by removing any |
382 # largefiles. This makes the merge proceed and we can then handle this | 382 # largefiles. This makes the merge proceed and we can then handle this |
383 # case further in the overridden manifestmerge function below. | 383 # case further in the overridden calculateupdates function below. |
384 def overridecheckunknownfile(origfn, repo, wctx, mctx, f): | 384 def overridecheckunknownfile(origfn, repo, wctx, mctx, f): |
385 if lfutil.standin(repo.dirstate.normalize(f)) in wctx: | 385 if lfutil.standin(repo.dirstate.normalize(f)) in wctx: |
386 return False | 386 return False |
387 return origfn(repo, wctx, mctx, f) | 387 return origfn(repo, wctx, mctx, f) |
388 | 388 |
389 # The manifest merge handles conflicts on the manifest level. We want | 389 # The manifest merge handles conflicts on the manifest level. We want |
390 # to handle changes in largefile-ness of files at this level too. | 390 # to handle changes in largefile-ness of files at this level too. |
391 # | 391 # |
392 # The strategy is to run the original manifestmerge and then process | 392 # The strategy is to run the original calculateupdates and then process |
393 # the action list it outputs. There are two cases we need to deal with: | 393 # the action list it outputs. There are two cases we need to deal with: |
394 # | 394 # |
395 # 1. Normal file in p1, largefile in p2. Here the largefile is | 395 # 1. Normal file in p1, largefile in p2. Here the largefile is |
396 # detected via its standin file, which will enter the working copy | 396 # detected via its standin file, which will enter the working copy |
397 # with a "get" action. It is not "merge" since the standin is all | 397 # with a "get" action. It is not "merge" since the standin is all |