mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:19197fa4c41c
+:35c2cc322ba8
 A foo.c
 Returns 0 if all files are successfully added.
 """
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[None], pats, opts)
 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
 opts.get('subrepos'), prefix="")
 return rejected and 1 or 0
 @command('addremove',
 def bad(x, y):
 raise util.Abort("%s: %s" % (x, y))
 ctx = scmutil.revsingle(repo, opts.get('rev'))
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(ctx, pats, opts)
 m.bad = bad
 follow = not opts.get('no_follow')
 for abs in ctx.walk(m):
 fctx = ctx[abs]
 if not opts.get('text') and util.binary(fctx.data()):
 dest = ui.fout
 if not prefix:
 prefix = os.path.basename(repo.root) + '-%h'
 prefix = cmdutil.makefilename(repo, prefix, node)
-matchfn = scmutil.match(repo, [], opts)
+matchfn = scmutil.match(ctx, [], opts)
 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
 matchfn, prefix, subrepos=opts.get('subrepos'))
 @command('backout',
 [('', 'merge', None, _('merge with old dirstate parent after backout')),
 Returns 0 on success.
 """
 ctx = scmutil.revsingle(repo, opts.get('rev'))
 err = 1
-m = scmutil.match(repo, (file1,) + pats, opts)
+m = scmutil.match(ctx, (file1,) + pats, opts)
 for abs in ctx.walk(m):
 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
 pathname=abs)
 data = ctx[abs].data()
 if opts.get('decode'):
 branch = repo[None].branch()
 bheads = repo.branchheads(branch)
 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
 if not node:
-stat = repo.status(match=scmutil.match(repo, pats, opts))
+stat = repo.status(match=scmutil.match(repo[None], pats, opts))
 if stat[3]:
 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
 % len(stat[3]))
 else:
 ui.status(_("nothing changed\n"))
 def debugfileset(ui, repo, expr):
 '''parse and apply a fileset specification'''
 if ui.verbose:
 tree = fileset.parse(expr)[0]
 ui.note(tree, "\n")
-matcher = lambda x: scmutil.match(repo, x, default='glob')
+matcher = lambda x: scmutil.match(repo[None], x, default='glob')
 for f in fileset.getfileset(repo[None], matcher, expr):
 ui.write("%s\n" % f)
 @command('debugfsinfo', [], _('[PATH]'))
 _('[-r REV] FILE'))
 def debugrename(ui, repo, file1, *pats, **opts):
 """dump rename information"""
 ctx = scmutil.revsingle(repo, opts.get('rev'))
-m = scmutil.match(repo, (file1,) + pats, opts)
+m = scmutil.match(ctx, (file1,) + pats, opts)
 for abs in ctx.walk(m):
 fctx = ctx[abs]
 o = fctx.filelog().renamed(fctx.filenode())
 rel = m.rel(abs)
 if o:
 ui.write(' revision %s\n' % v[1])
 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
 def debugwalk(ui, repo, *pats, **opts):
 """show how files match on given patterns"""
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[None], pats, opts)
 items = list(repo.walk(m))
 if not items:
 return
 fmt = 'f  %%-%ds  %%-%ds  %%s' % (
 max([len(abs) for abs in items]),
 if reverse:
 node1, node2 = node2, node1
 diffopts = patch.diffopts(ui, opts)
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[node2], pats, opts)
 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
 listsubrepos=opts.get('subrepos'))
 @command('^export',
 [('o', 'output', '',
 """
 if not pats:
 raise util.Abort(_('no files specified'))
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[None], pats, opts)
 s = repo.status(match=m, clean=True)
 forget = sorted(s[0] + s[1] + s[3] + s[6])
 errs = 0
 for f in m.files():
 found = True
 return found
 skip = {}
 revfiles = {}
-matchfn = scmutil.match(repo, pats, opts)
+matchfn = scmutil.match(repo[None], pats, opts)
 found = False
 follow = opts.get('follow')
 def prep(ctx, fns):
 rev = ctx.rev()
 """
 end = opts.get('print0') and '\0' or '\n'
 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
 ret = 1
-m = scmutil.match(repo, pats, opts, default='relglob')
+m = scmutil.match(repo[rev], pats, opts, default='relglob')
 m.bad = lambda x, y: False
 for abs in repo[rev].walk(m):
 if not rev and abs not in repo.dirstate:
 continue
 if opts.get('fullpath'):
 will appear in files:.
 Returns 0 on success.
 """
-matchfn = scmutil.match(repo, pats, opts)
+matchfn = scmutil.match(repo[None], pats, opts)
 limit = cmdutil.loglimit(opts)
 count = 0
 endrev = None
 if opts.get('copies') and opts.get('rev'):
 revmatchfn = None
 if opts.get('patch') or opts.get('stat'):
 if opts.get('follow') or opts.get('follow_first'):
 # note: this might be wrong when following through merges
-revmatchfn = scmutil.match(repo, fns, default='path')
+revmatchfn = scmutil.match(repo[None], fns, default='path')
 else:
 revmatchfn = matchfn
 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
 """
 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
 if file_:
-m = scmutil.match(repo, (file_,), opts)
+m = scmutil.match(ctx, (file_,), opts)
 if m.anypats() or len(m.files()) != 1:
 raise util.Abort(_('can only specify an explicit filename'))
 file_ = m.files()[0]
 filenodes = []
 for cp in ctx.parents():
 ret = 0
 after, force = opts.get('after'), opts.get('force')
 if not pats and not after:
 raise util.Abort(_('no files specified'))
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[None], pats, opts)
 s = repo.status(match=m, clean=True)
 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
 for f in m.files():
 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
 if not (all or pats or show or mark or unmark):
 raise util.Abort(_('no files or directories specified; '
 'use --all to remerge all files'))
 ms = mergemod.mergestate(repo)
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[None], pats, opts)
 ret = 0
 for f in ms:
 if m(f):
 if show:
 wlock = repo.wlock()
 try:
 # walk dirstate.
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[None], pats, opts)
 m.bad = lambda x, y: False
 for abs in repo.walk(m):
 names[abs] = m.rel(abs), m.exact(abs)
 # walk target manifest.
 for f in names:
 if f.startswith(path_):
 return
 ui.warn("%s: %s\n" % (m.rel(path), msg))
-m = scmutil.match(repo, pats, opts)
+m = scmutil.match(repo[node], pats, opts)
 m.bad = badfn
 for abs in repo[node].walk(m):
 if abs not in names:
 names[abs] = m.rel(abs), m.exact(abs)
 if opts.get('all'):
 show += ui.quiet and (states[:4] + ['clean']) or states
 if not show:
 show = ui.quiet and states[:4] or states[:5]
-stat = repo.status(node1, node2, scmutil.match(repo, pats, opts),
+stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
 'ignored' in show, 'clean' in show, 'unknown' in show,
 opts.get('subrepos'))
 changestates = zip(states, 'MAR!?IC', stat)
 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):

changeset 14671	35c2cc322ba8
parent 14647	2e9f379de0ac
child 14673	b0566467c492