| quark |
| hg-reviewers |
We usually call matchers either "match" or "m" and reserve "matchfn"
for functions.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/lfcommands.py (5 lines) | |||
| M | hgext/mq.py (12 lines) | |||
| M | mercurial/cmdutil.py (12 lines) | |||
| M | mercurial/commands.py (8 lines) | |||
| M | mercurial/hgweb/webcommands.py (8 lines) |
| if toget: | if toget: | ||||
| store = storefactory.openstore(repo) | store = storefactory.openstore(repo) | ||||
| ret = store.get(toget) | ret = store.get(toget) | ||||
| return ret | return ret | ||||
| return ([], []) | return ([], []) | ||||
| def downloadlfiles(ui, repo, rev=None): | def downloadlfiles(ui, repo, rev=None): | ||||
| matchfn = scmutil.match(repo[None], | match = scmutil.match(repo[None], [repo.wjoin(lfutil.shortname)], {}) | ||||
| [repo.wjoin(lfutil.shortname)], {}) | |||||
| def prepare(ctx, fns): | def prepare(ctx, fns): | ||||
| pass | pass | ||||
| totalsuccess = 0 | totalsuccess = 0 | ||||
| totalmissing = 0 | totalmissing = 0 | ||||
| if rev != []: # walkchangerevs on empty list would return all revs | if rev != []: # walkchangerevs on empty list would return all revs | ||||
| for ctx in cmdutil.walkchangerevs(repo, matchfn, {'rev' : rev}, | for ctx in cmdutil.walkchangerevs(repo, match, {'rev' : rev}, | ||||
| prepare): | prepare): | ||||
| success, missing = cachelfiles(ui, repo, ctx.node()) | success, missing = cachelfiles(ui, repo, ctx.node()) | ||||
| totalsuccess += len(success) | totalsuccess += len(success) | ||||
| totalmissing += len(missing) | totalmissing += len(missing) | ||||
| ui.status(_("%d additional largefiles cached\n") % totalsuccess) | ui.status(_("%d additional largefiles cached\n") % totalsuccess) | ||||
| if totalmissing > 0: | if totalmissing > 0: | ||||
| ui.status(_("%d largefiles failed to download\n") % totalmissing) | ui.status(_("%d largefiles failed to download\n") % totalmissing) | ||||
| return totalsuccess, totalmissing | return totalsuccess, totalmissing | ||||
| # this should really read: | # this should really read: | ||||
| # mm, dd, aa = repo.status(top, patchparent)[:3] | # mm, dd, aa = repo.status(top, patchparent)[:3] | ||||
| # but we do it backwards to take advantage of manifest/changelog | # but we do it backwards to take advantage of manifest/changelog | ||||
| # caching against the next repo.status call | # caching against the next repo.status call | ||||
| mm, aa, dd = repo.status(patchparent, top)[:3] | mm, aa, dd = repo.status(patchparent, top)[:3] | ||||
| changes = repo.changelog.read(top) | changes = repo.changelog.read(top) | ||||
| man = repo.manifestlog[changes[0]].read() | man = repo.manifestlog[changes[0]].read() | ||||
| aaa = aa[:] | aaa = aa[:] | ||||
| matchfn = scmutil.match(repo[None], pats, opts) | match1 = scmutil.match(repo[None], pats, opts) | ||||
| # in short mode, we only diff the files included in the | # in short mode, we only diff the files included in the | ||||
| # patch already plus specified files | # patch already plus specified files | ||||
| if opts.get('short'): | if opts.get('short'): | ||||
| # if amending a patch, we start with existing | # if amending a patch, we start with existing | ||||
| # files plus specified files - unfiltered | # files plus specified files - unfiltered | ||||
| match = scmutil.matchfiles(repo, mm + aa + dd + matchfn.files()) | match = scmutil.matchfiles(repo, mm + aa + dd + match1.files()) | ||||
| # filter with include/exclude options | # filter with include/exclude options | ||||
| matchfn = scmutil.match(repo[None], opts=opts) | match1 = scmutil.match(repo[None], opts=opts) | ||||
| else: | else: | ||||
| match = scmutil.matchall(repo) | match = scmutil.matchall(repo) | ||||
| m, a, r, d = repo.status(match=match)[:4] | m, a, r, d = repo.status(match=match)[:4] | ||||
| mm = set(mm) | mm = set(mm) | ||||
| aa = set(aa) | aa = set(aa) | ||||
| dd = set(dd) | dd = set(dd) | ||||
| # we might end up with files that were added between | # we might end up with files that were added between | ||||
| mm.discard(x) | mm.discard(x) | ||||
| dd.add(x) | dd.add(x) | ||||
| m = list(mm) | m = list(mm) | ||||
| r = list(dd) | r = list(dd) | ||||
| a = list(aa) | a = list(aa) | ||||
| # create 'match' that includes the files to be recommitted. | # create 'match' that includes the files to be recommitted. | ||||
| # apply matchfn via repo.status to ensure correct case handling. | # apply match1 via repo.status to ensure correct case handling. | ||||
| cm, ca, cr, cd = repo.status(patchparent, match=matchfn)[:4] | cm, ca, cr, cd = repo.status(patchparent, match=match1)[:4] | ||||
| allmatches = set(cm + ca + cr + cd) | allmatches = set(cm + ca + cr + cd) | ||||
| refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)] | refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)] | ||||
| files = set(inclsubs) | files = set(inclsubs) | ||||
| for x in refreshchanges: | for x in refreshchanges: | ||||
| files.update(x) | files.update(x) | ||||
| match = scmutil.matchfiles(repo, files) | match = scmutil.matchfiles(repo, files) | ||||
| for f in list(repo.dirstate.copies()): | for f in list(repo.dirstate.copies()): | ||||
| repo.dirstate.copy(None, f) | repo.dirstate.copy(None, f) | ||||
| for f in r: | for f in r: | ||||
| repo.dirstate.remove(f) | repo.dirstate.remove(f) | ||||
| # if the patch excludes a modified file, mark that | # if the patch excludes a modified file, mark that | ||||
| # file with mtime=0 so status can see it. | # file with mtime=0 so status can see it. | ||||
| mm = [] | mm = [] | ||||
| for i in xrange(len(m) - 1, -1, -1): | for i in xrange(len(m) - 1, -1, -1): | ||||
| if not matchfn(m[i]): | if not match1(m[i]): | ||||
| mm.append(m[i]) | mm.append(m[i]) | ||||
| del m[i] | del m[i] | ||||
| for f in m: | for f in m: | ||||
| repo.dirstate.normal(f) | repo.dirstate.normal(f) | ||||
| for f in mm: | for f in mm: | ||||
| repo.dirstate.normallookup(f) | repo.dirstate.normallookup(f) | ||||
| for f in forget: | for f in forget: | ||||
| repo.dirstate.drop(f) | repo.dirstate.drop(f) | ||||
| 1. option 'template' | 1. option 'template' | ||||
| 2. option 'style' | 2. option 'style' | ||||
| 3. [ui] setting 'logtemplate' | 3. [ui] setting 'logtemplate' | ||||
| 4. [ui] setting 'style' | 4. [ui] setting 'style' | ||||
| If all of these values are either the unset or the empty string, | If all of these values are either the unset or the empty string, | ||||
| regular display via changeset_printer() is done. | regular display via changeset_printer() is done. | ||||
| """ | """ | ||||
| # options | # options | ||||
| matchfn = None | match = None | ||||
| if opts.get('patch') or opts.get('stat'): | if opts.get('patch') or opts.get('stat'): | ||||
| matchfn = scmutil.matchall(repo) | match = scmutil.matchall(repo) | ||||
| if opts.get('template') == 'json': | if opts.get('template') == 'json': | ||||
| return jsonchangeset(ui, repo, matchfn, opts, buffered) | return jsonchangeset(ui, repo, match, opts, buffered) | ||||
| spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style')) | spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style')) | ||||
| if not spec.ref and not spec.tmpl and not spec.mapfile: | if not spec.ref and not spec.tmpl and not spec.mapfile: | ||||
| return changeset_printer(ui, repo, matchfn, opts, buffered) | return changeset_printer(ui, repo, match, opts, buffered) | ||||
| return changeset_templater(ui, repo, spec, matchfn, opts, buffered) | return changeset_templater(ui, repo, spec, match, opts, buffered) | ||||
| def showmarker(fm, marker, index=None): | def showmarker(fm, marker, index=None): | ||||
| """utility function to display obsolescence marker in a readable way | """utility function to display obsolescence marker in a readable way | ||||
| To be used by debug function.""" | To be used by debug function.""" | ||||
| if index is not None: | if index is not None: | ||||
| fm.write('index', '%i ', index) | fm.write('index', '%i ', index) | ||||
| fm.write('prednode', '%s ', hex(marker.prednode())) | fm.write('prednode', '%s ', hex(marker.prednode())) | ||||
| if dest == '-': | if dest == '-': | ||||
| if kind == 'files': | if kind == 'files': | ||||
| raise error.Abort(_('cannot archive plain files to stdout')) | raise error.Abort(_('cannot archive plain files to stdout')) | ||||
| dest = cmdutil.makefileobj(repo, dest) | dest = cmdutil.makefileobj(repo, dest) | ||||
| if not prefix: | if not prefix: | ||||
| prefix = os.path.basename(repo.root) + '-%h' | prefix = os.path.basename(repo.root) + '-%h' | ||||
| prefix = cmdutil.makefilename(repo, prefix, node) | prefix = cmdutil.makefilename(repo, prefix, node) | ||||
| matchfn = scmutil.match(ctx, [], opts) | match = scmutil.match(ctx, [], opts) | ||||
| archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | ||||
| matchfn, prefix, subrepos=opts.get('subrepos')) | match, prefix, subrepos=opts.get('subrepos')) | ||||
| @command('backout', | @command('backout', | ||||
| [('', 'merge', None, _('merge with old dirstate parent after backout')), | [('', 'merge', None, _('merge with old dirstate parent after backout')), | ||||
| ('', 'commit', None, | ('', 'commit', None, | ||||
| _('commit if no conflicts were encountered (DEPRECATED)')), | _('commit if no conflicts were encountered (DEPRECATED)')), | ||||
| ('', 'no-commit', None, _('do not commit')), | ('', 'no-commit', None, _('do not commit')), | ||||
| ('', 'parent', '', | ('', 'parent', '', | ||||
| _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | ||||
| if p < len(l.line): | if p < len(l.line): | ||||
| fm.startitem() | fm.startitem() | ||||
| fm.write('text', '%s', l.line[p:]) | fm.write('text', '%s', l.line[p:]) | ||||
| fm.data(matched=False) | fm.data(matched=False) | ||||
| fm.end() | fm.end() | ||||
| skip = {} | skip = {} | ||||
| revfiles = {} | revfiles = {} | ||||
| matchfn = scmutil.match(repo[None], pats, opts) | match = scmutil.match(repo[None], pats, opts) | ||||
| found = False | found = False | ||||
| follow = opts.get('follow') | follow = opts.get('follow') | ||||
| def prep(ctx, fns): | def prep(ctx, fns): | ||||
| rev = ctx.rev() | rev = ctx.rev() | ||||
| pctx = ctx.p1() | pctx = ctx.p1() | ||||
| parent = pctx.rev() | parent = pctx.rev() | ||||
| matches.setdefault(rev, {}) | matches.setdefault(rev, {}) | ||||
| try: | try: | ||||
| fnode = pctx.filenode(pfn) | fnode = pctx.filenode(pfn) | ||||
| grepbody(pfn, parent, flog.read(fnode)) | grepbody(pfn, parent, flog.read(fnode)) | ||||
| except error.LookupError: | except error.LookupError: | ||||
| pass | pass | ||||
| ui.pager('grep') | ui.pager('grep') | ||||
| fm = ui.formatter('grep', opts) | fm = ui.formatter('grep', opts) | ||||
| for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): | ||||
| rev = ctx.rev() | rev = ctx.rev() | ||||
| parent = ctx.p1().rev() | parent = ctx.p1().rev() | ||||
| for fn in sorted(revfiles.get(rev, [])): | for fn in sorted(revfiles.get(rev, [])): | ||||
| states = matches[rev][fn] | states = matches[rev][fn] | ||||
| copy = copies.get(rev, {}).get(fn) | copy = copies.get(rev, {}).get(fn) | ||||
| if fn in skip: | if fn in skip: | ||||
| if copy: | if copy: | ||||
| skip[copy] = True | skip[copy] = True | ||||
| cnode = web.repo.lookup(key) | cnode = web.repo.lookup(key) | ||||
| arch_version = key | arch_version = key | ||||
| if cnode == key or key == 'tip': | if cnode == key or key == 'tip': | ||||
| arch_version = short(cnode) | arch_version = short(cnode) | ||||
| name = "%s-%s" % (reponame, arch_version) | name = "%s-%s" % (reponame, arch_version) | ||||
| ctx = webutil.changectx(web.repo, req) | ctx = webutil.changectx(web.repo, req) | ||||
| pats = [] | pats = [] | ||||
| matchfn = scmutil.match(ctx, []) | match = scmutil.match(ctx, []) | ||||
| file = req.form.get('file', None) | file = req.form.get('file', None) | ||||
| if file: | if file: | ||||
| pats = ['path:' + file[0]] | pats = ['path:' + file[0]] | ||||
| matchfn = scmutil.match(ctx, pats, default='path') | match = scmutil.match(ctx, pats, default='path') | ||||
| if pats: | if pats: | ||||
| files = [f for f in ctx.manifest().keys() if matchfn(f)] | files = [f for f in ctx.manifest().keys() if match(f)] | ||||
| if not files: | if not files: | ||||
| raise ErrorResponse(HTTP_NOT_FOUND, | raise ErrorResponse(HTTP_NOT_FOUND, | ||||
| 'file(s) not found: %s' % file[0]) | 'file(s) not found: %s' % file[0]) | ||||
| mimetype, artype, extension, encoding = web.archivespecs[type_] | mimetype, artype, extension, encoding = web.archivespecs[type_] | ||||
| headers = [ | headers = [ | ||||
| ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension)) | ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension)) | ||||
| ] | ] | ||||
| if encoding: | if encoding: | ||||
| headers.append(('Content-Encoding', encoding)) | headers.append(('Content-Encoding', encoding)) | ||||
| req.headers.extend(headers) | req.headers.extend(headers) | ||||
| req.respond(HTTP_OK, mimetype) | req.respond(HTTP_OK, mimetype) | ||||
| archival.archive(web.repo, req, cnode, artype, prefix=name, | archival.archive(web.repo, req, cnode, artype, prefix=name, | ||||
| matchfn=matchfn, | matchfn=match, | ||||
| subrepos=web.configbool("web", "archivesubrepos")) | subrepos=web.configbool("web", "archivesubrepos")) | ||||
| return [] | return [] | ||||
| @webcommand('static') | @webcommand('static') | ||||
| def static(web, req, tmpl): | def static(web, req, tmpl): | ||||
| fname = req.form['file'][0] | fname = req.form['file'][0] | ||||
| # a repo owner may set web.static in .hg/hgrc to get any file | # a repo owner may set web.static in .hg/hgrc to get any file | ||||