| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| ) | ) | ||||
| from mercurial import ( | from mercurial import ( | ||||
| archival, | archival, | ||||
| cmdutil, | cmdutil, | ||||
| copies as copiesmod, | copies as copiesmod, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| extensions, | |||||
| exthelper, | exthelper, | ||||
| filemerge, | filemerge, | ||||
| hg, | hg, | ||||
| logcmdutil, | logcmdutil, | ||||
| match as matchmod, | match as matchmod, | ||||
| merge, | merge, | ||||
| pathutil, | pathutil, | ||||
| pycompat, | pycompat, | ||||
| def restorematchfn(): | def restorematchfn(): | ||||
| '''restores scmutil.match to what it was before installmatchfn | '''restores scmutil.match to what it was before installmatchfn | ||||
| was called. no-op if scmutil.match is its original function. | was called. no-op if scmutil.match is its original function. | ||||
| Note that n calls to installmatchfn will require n calls to | Note that n calls to installmatchfn will require n calls to | ||||
| restore the original matchfn.''' | restore the original matchfn.''' | ||||
| scmutil.match = getattr(scmutil.match, 'oldmatch') | scmutil.match = getattr(scmutil.match, 'oldmatch') | ||||
| def installmatchandpatsfn(f): | |||||
| oldmatchandpats = scmutil.matchandpats | |||||
| setattr(f, 'oldmatchandpats', oldmatchandpats) | |||||
| scmutil.matchandpats = f | |||||
| return oldmatchandpats | |||||
| def restorematchandpatsfn(): | |||||
| '''restores scmutil.matchandpats to what it was before | |||||
| installmatchandpatsfn was called. No-op if scmutil.matchandpats | |||||
| is its original function. | |||||
| Note that n calls to installmatchandpatsfn will require n calls | |||||
| to restore the original matchfn.''' | |||||
| scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats', | |||||
| scmutil.matchandpats) | |||||
| def addlargefiles(ui, repo, isaddremove, matcher, **opts): | def addlargefiles(ui, repo, isaddremove, matcher, **opts): | ||||
| large = opts.get(r'large') | large = opts.get(r'large') | ||||
| lfsize = lfutil.getminsize( | lfsize = lfutil.getminsize( | ||||
| ui, lfutil.islfilesrepo(repo), opts.get(r'lfsize')) | ui, lfutil.islfilesrepo(repo), opts.get(r'lfsize')) | ||||
| lfmatcher = None | lfmatcher = None | ||||
| if lfutil.islfilesrepo(repo): | if lfutil.islfilesrepo(repo): | ||||
| lfpats = ui.configlist(lfutil.longname, 'patterns') | lfpats = ui.configlist(lfutil.longname, 'patterns') | ||||
| try: | try: | ||||
| repo._repo.lfstatus = True | repo._repo.lfstatus = True | ||||
| return orig(repo, ignoreupdate=ignoreupdate, missing=missing) | return orig(repo, ignoreupdate=ignoreupdate, missing=missing) | ||||
| finally: | finally: | ||||
| repo._repo.lfstatus = False | repo._repo.lfstatus = False | ||||
| @eh.wrapcommand('log') | @eh.wrapcommand('log') | ||||
| def overridelog(orig, ui, repo, *pats, **opts): | def overridelog(orig, ui, repo, *pats, **opts): | ||||
| def overridematchandpats(ctx, pats=(), opts=None, globbed=False, | def overridematchandpats(orig, ctx, pats=(), opts=None, globbed=False, | ||||
| default='relpath', badfn=None): | default='relpath', badfn=None): | ||||
| """Matcher that merges root directory with .hglf, suitable for log. | """Matcher that merges root directory with .hglf, suitable for log. | ||||
| It is still possible to match .hglf directly. | It is still possible to match .hglf directly. | ||||
| For any listed files run log on the standin too. | For any listed files run log on the standin too. | ||||
| matchfn tries both the given filename and with .hglf stripped. | matchfn tries both the given filename and with .hglf stripped. | ||||
| """ | """ | ||||
| if opts is None: | if opts is None: | ||||
| opts = {} | opts = {} | ||||
| matchandpats = oldmatchandpats(ctx, pats, opts, globbed, default, | matchandpats = orig(ctx, pats, opts, globbed, default, badfn=badfn) | ||||
| badfn=badfn) | |||||
| m, p = copy.copy(matchandpats) | m, p = copy.copy(matchandpats) | ||||
| if m.always(): | if m.always(): | ||||
| # We want to match everything anyway, so there's no benefit trying | # We want to match everything anyway, so there's no benefit trying | ||||
| # to add standins. | # to add standins. | ||||
| return matchandpats | return matchandpats | ||||
| pats = set(p) | pats = set(p) | ||||
| ui.debug('updated patterns: %s\n' % ', '.join(sorted(pats))) | ui.debug('updated patterns: %s\n' % ', '.join(sorted(pats))) | ||||
| return m, pats | return m, pats | ||||
| # For hg log --patch, the match object is used in two different senses: | # For hg log --patch, the match object is used in two different senses: | ||||
| # (1) to determine what revisions should be printed out, and | # (1) to determine what revisions should be printed out, and | ||||
| # (2) to determine what files to print out diffs for. | # (2) to determine what files to print out diffs for. | ||||
| # The magic matchandpats override should be used for case (1) but not for | # The magic matchandpats override should be used for case (1) but not for | ||||
| # case (2). | # case (2). | ||||
| def overridemakefilematcher(repo, pats, opts, badfn=None): | oldmatchandpats = scmutil.matchandpats | ||||
| def overridemakefilematcher(orig, repo, pats, opts, badfn=None): | |||||
| wctx = repo[None] | wctx = repo[None] | ||||
| match, pats = oldmatchandpats(wctx, pats, opts, badfn=badfn) | match, pats = oldmatchandpats(wctx, pats, opts, badfn=badfn) | ||||
| return lambda ctx: match | return lambda ctx: match | ||||
| oldmatchandpats = installmatchandpatsfn(overridematchandpats) | wrappedmatchandpats = extensions.wrappedfunction(scmutil, 'matchandpats', | ||||
| oldmakefilematcher = logcmdutil._makenofollowfilematcher | overridematchandpats) | ||||
| setattr(logcmdutil, '_makenofollowfilematcher', overridemakefilematcher) | wrappedmakefilematcher = extensions.wrappedfunction( | ||||
| logcmdutil, '_makenofollowfilematcher', overridemakefilematcher) | |||||
| try: | with wrappedmatchandpats, wrappedmakefilematcher: | ||||
| return orig(ui, repo, *pats, **opts) | return orig(ui, repo, *pats, **opts) | ||||
| finally: | |||||
| restorematchandpatsfn() | |||||
| setattr(logcmdutil, '_makenofollowfilematcher', oldmakefilematcher) | |||||
| @eh.wrapcommand('verify', | @eh.wrapcommand('verify', | ||||
| opts=[('', 'large', None, | opts=[('', 'large', None, | ||||
| _('verify that all largefiles in current revision exists')), | _('verify that all largefiles in current revision exists')), | ||||
| ('', 'lfa', None, | ('', 'lfa', None, | ||||
| _('verify largefiles in all revisions, not just current')), | _('verify largefiles in all revisions, not just current')), | ||||
| ('', 'lfc', None, | ('', 'lfc', None, | ||||
| _('verify local largefile contents, not just existence'))]) | _('verify local largefile contents, not just existence'))]) | ||||