Mercurial > hg
comparison hgext/largefiles/overrides.py @ 23543:4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 17 Apr 2014 22:47:38 +0200 |
parents | 495bc1b65d25 |
children | a2f139d25845 |
comparison
equal
deleted
inserted
replaced
23542:8b5adc6b72ae | 23543:4dd8a6a1240d |
---|---|
52 def restorematchfn(): | 52 def restorematchfn(): |
53 '''restores scmutil.match to what it was before installmatchfn | 53 '''restores scmutil.match to what it was before installmatchfn |
54 was called. no-op if scmutil.match is its original function. | 54 was called. no-op if scmutil.match is its original function. |
55 | 55 |
56 Note that n calls to installmatchfn will require n calls to | 56 Note that n calls to installmatchfn will require n calls to |
57 restore matchfn to reverse''' | 57 restore the original matchfn.''' |
58 scmutil.match = getattr(scmutil.match, 'oldmatch') | 58 scmutil.match = getattr(scmutil.match, 'oldmatch') |
59 | 59 |
60 def installmatchandpatsfn(f): | 60 def installmatchandpatsfn(f): |
61 oldmatchandpats = scmutil.matchandpats | 61 oldmatchandpats = scmutil.matchandpats |
62 setattr(f, 'oldmatchandpats', oldmatchandpats) | 62 setattr(f, 'oldmatchandpats', oldmatchandpats) |
67 '''restores scmutil.matchandpats to what it was before | 67 '''restores scmutil.matchandpats to what it was before |
68 installmatchandpatsfn was called. No-op if scmutil.matchandpats | 68 installmatchandpatsfn was called. No-op if scmutil.matchandpats |
69 is its original function. | 69 is its original function. |
70 | 70 |
71 Note that n calls to installmatchandpatsfn will require n calls | 71 Note that n calls to installmatchandpatsfn will require n calls |
72 to restore matchfn to reverse''' | 72 to restore the original matchfn.''' |
73 scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats', | 73 scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats', |
74 scmutil.matchandpats) | 74 scmutil.matchandpats) |
75 | 75 |
76 def addlargefiles(ui, repo, matcher, **opts): | 76 def addlargefiles(ui, repo, matcher, **opts): |
77 large = opts.pop('large', None) | 77 large = opts.pop('large', None) |
374 return orig(ui, repo, *pats, **opts) | 374 return orig(ui, repo, *pats, **opts) |
375 finally: | 375 finally: |
376 wlock.release() | 376 wlock.release() |
377 | 377 |
378 # Before starting the manifest merge, merge.updates will call | 378 # Before starting the manifest merge, merge.updates will call |
379 # checkunknown to check if there are any files in the merged-in | 379 # _checkunknownfile to check if there are any files in the merged-in |
380 # changeset that collide with unknown files in the working copy. | 380 # changeset that collide with unknown files in the working copy. |
381 # | 381 # |
382 # The largefiles are seen as unknown, so this prevents us from merging | 382 # The largefiles are seen as unknown, so this prevents us from merging |
383 # in a file 'foo' if we already have a largefile with the same name. | 383 # in a file 'foo' if we already have a largefile with the same name. |
384 # | 384 # |