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

equal deleted inserted replaced

-:1dca460e7d1e
+:f6c00b17387c
 funcmap = [func for op, func in opmap if opts.get(op)]
 if linenumber:
 lastfunc = funcmap[-1]
 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
-ctx = repo.changectx(opts['rev'])
+ctx = repo[opts['rev']]
 m = cmdutil.match(repo, pats, opts)
 for abs in repo.walk(m, ctx.node()):
 fctx = ctx.filectx(abs)
 if not opts['text'] and util.binary(fctx.data()):
 Each member added to an archive file has a directory prefix
 prepended. Use "-p" to specify a format string for the prefix.
 The default is the basename of the archive, with suffixes removed.
 '''
-ctx = repo.changectx(opts['rev'])
+ctx = repo[opts['rev']]
 if not ctx:
 raise util.Abort(_('repository has no revisions'))
 node = ctx.node()
 dest = cmdutil.make_filename(repo, dest, node)
 if os.path.realpath(dest) == repo.root:
 Use the command 'hg update' to switch to an existing branch.
 """
 if label:
 if not opts.get('force') and label in repo.branchtags():
-if label not in [p.branch() for p in repo.changectx(None).parents()]:
+if label not in [p.branch() for p in repo.parents()]:
 raise util.Abort(_('a branch of the same name already exists'
 ' (use --force to override)'))
 repo.dirstate.setbranch(util.fromlocal(label))
 ui.status(_('marked working directory as branch %s\n') % label)
 else:
 A branch is considered active if it contains repository heads.
 Use the command 'hg update' to switch to an existing branch.
 """
 hexfunc = ui.debugflag and hex or short
-activebranches = [util.tolocal(repo.changectx(n).branch())
+activebranches = [util.tolocal(repo[n].branch())
 for n in repo.heads()]
 branches = [(tag in activebranches, repo.changelog.rev(node), tag)
 for tag, node in repo.branchtags().items()]
 branches.sort()
 branches.reverse()
 %s   basename of file being printed
 %d   dirname of file being printed, or '.' if in repo root
 %p   root-relative path name of file being printed
 """
-ctx = repo.changectx(opts['rev'])
+ctx = repo[opts['rev']]
 err = 1
 m = cmdutil.match(repo, (file1,) + pats, opts)
 for abs in repo.walk(m, ctx.node()):
 fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
 data = ctx.filectx(abs).data()
 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
 and 'yes' or 'no'))
 os.unlink('.debugfsinfo')
-def debugrebuildstate(ui, repo, rev=""):
+def debugrebuildstate(ui, repo, rev="tip"):
 """rebuild the dirstate as it would look like for the given revision"""
-if rev == "":
+ctx = repo[rev]
-rev = repo.changelog.tip()
-ctx = repo.changectx(rev)
-files = ctx.manifest()
 wlock = repo.wlock()
 try:
-repo.dirstate.rebuild(rev, files)
+repo.dirstate.rebuild(ctx.node(), ctx.manifest())
 finally:
 del wlock
 def debugcheckstate(ui, repo):
 """validate the correctness of the current dirstate"""
 parent1, parent2 = repo.dirstate.parents()
-m1 = repo.changectx(parent1).manifest()
+m1 = repo[parent1].manifest()
-m2 = repo.changectx(parent2).manifest()
+m2 = repo[parent2].manifest()
 errors = 0
 for f in repo.dirstate:
 state = repo.dirstate[f]
 if state in "nr" and f not in m1:
 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
 return problems
 def debugrename(ui, repo, file1, *pats, **opts):
 """dump rename information"""
-ctx = repo.changectx(opts.get('rev', 'tip'))
+ctx = repo[opts.get('rev', 'tip')]
 m = cmdutil.match(repo, (file1,) + pats, opts)
 for abs in repo.walk(m, ctx.node()):
 fctx = ctx.filectx(abs)
 o = fctx.filelog().renamed(fctx.filenode())
 rel = m.rel(abs)
 found = True
 return found
 fstate = {}
 skip = {}
-get = util.cachefunc(lambda r: repo.changectx(r).changeset())
+get = util.cachefunc(lambda r: repo[r].changeset())
 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
 found = False
 follow = opts.get('follow')
 for st, rev, fns in changeiter:
 if st == 'window':
 matches.clear()
 elif st == 'add':
-ctx = repo.changectx(rev)
+ctx = repo[rev]
 matches[rev] = {}
 for fn in fns:
 if fn in skip:
 continue
 try:
 heads = repo.heads(start)
 else:
 heads = []
 visitedset = util.set()
 for branchrev in branchrevs:
-branch = repo.changectx(branchrev).branch()
+branch = repo[branchrev].branch()
 if branch in visitedset:
 continue
 visitedset.add(branch)
 bheads = repo.branchheads(branch, start)
 if not bheads:
 if num or branch or tags:
 raise util.Abort(
 "can't query remote revision number, branch, or tags")
 output = [hexfunc(srepo.lookup(rev))]
 elif not rev:
-ctx = repo.changectx(None)
+ctx = repo[None]
 parents = ctx.parents()
 changed = False
 if default or id or num:
 changed = ctx.files() + ctx.deleted()
 if default or id:
 (changed) and "+" or "")]
 if num:
 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
 (changed) and "+" or ""))
 else:
-ctx = repo.changectx(rev)
+ctx = repo[rev]
 if default or id:
 output = [hexfunc(ctx.node())]
 if num:
 output.append(str(ctx.rev()))
 else:
 # launch the editor
 message = None
 ui.debug(_('message:\n%s\n') % message)
-wp = repo.changectx(None).parents()
+wp = repo.parents()
 if opts.get('exact'):
 if not nodeid or not p1:
 raise util.Abort(_('not a mercurial patch'))
 p1 = repo.lookup(p1)
 p2 = repo.lookup(p2 or hex(nullid))
 first parent only. Also, the files: list will only reflect files
 that are different from BOTH parents.
 """
-get = util.cachefunc(lambda r: repo.changectx(r).changeset())
+get = util.cachefunc(lambda r: repo[r].changeset())
 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
 limit = cmdutil.loglimit(opts)
 count = 0
 # If linkrev != rev (i.e. rev not found in rcache) fallback to
 # filectx logic.
 try:
-return repo.changectx(rev).filectx(fn).renamed()
+return repo[rev][fn].renamed()
 except revlog.LookupError:
 pass
 return None
 df = False
 raise util.Abort(_("please specify just one revision"))
 if not node:
 node = rev
-m = repo.changectx(node).manifest()
+m = repo[node].manifest()
 files = m.keys()
 files.sort()
 for f in files:
 if ui.debugflag:
 if len(repo.heads()) > 1:
 raise util.Abort(_("branch '%s' has one head - "
 "please merge with an explicit rev") %
 branch)
 msg = _('there is nothing to merge')
-if parent != repo.lookup(repo.changectx(None).branch()):
+if parent != repo.lookup(repo[None].branch()):
 msg = _('%s - use "hg update" instead') % msg
 raise util.Abort(msg)
 if parent not in bheads:
 raise util.Abort(_('working dir not at a head rev - '
 which the file was last changed (before the working directory
 revision or the argument to --rev if given) is printed.
 """
 rev = opts.get('rev')
 if rev:
-ctx = repo.changectx(rev)
+ctx = repo[rev]
 else:
-ctx = repo.changectx(None)
+ctx = repo[None]
 if file_:
 m = cmdutil.match(repo, (file_,), opts)
 if m.anypats() or len(m.files()) != 1:
 raise util.Abort(_('can only specify an explicit file name'))
 elif opts.get("mark"):
 ms.mark(f, "r")
 elif opts.get("unmark"):
 ms.mark(f, "u")
 else:
-wctx = repo.changectx(None)
+wctx = repo[None]
 mctx = wctx.parents()[-1]
 ms.resolve(f, wctx, mctx)
 def revert(ui, repo, *pats, **opts):
 """restore individual files or dirs to an earlier state
 parent, p2 = repo.dirstate.parents()
 if not opts['rev'] and p2 != nullid:
 raise util.Abort(_('uncommitted merge - please provide a '
 'specific revision'))
-ctx = repo.changectx(opts['rev'])
+ctx = repo[opts['rev']]
 node = ctx.node()
 mf = ctx.manifest()
 if node == parent:
 pmf = mf
 else:
 if exact: ui.warn(_('no changes needed to %s\n') % rel)
 continue
 if pmf is None:
 # only need parent manifest in this unlikely case,
 # so do not read by default
-pmf = repo.changectx(parent).manifest()
+pmf = repo[parent].manifest()
 if abs in pmf:
 if mfentry:
 # if version of file is same in parent and target
 # manifests, do nothing
 if (pmf[abs] != mfentry or
 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
 'ignored' in show, 'clean' in show, 'unknown' in show)
 changestates = zip(states, 'MAR!?IC', stat)
 if (opts['all'] or opts['copies']) and not opts['no_status']:
-ctxn = repo.changectx(nullid)
+ctxn = repo[nullid]
-ctx1 = repo.changectx(node1)
+ctx1 = repo[node1]
-ctx2 = repo.changectx(node2)
+ctx2 = repo[node2]
 added = stat[1]
 if node2 is None:
 added = stat[0] + stat[1] # merged?
 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items():
 raise util.Abort(_('tag \'%s\' already exists '
 '(use -f to force)') % n)
 if not rev_ and repo.dirstate.parents()[1] != nullid:
 raise util.Abort(_('uncommitted merge - please provide a '
 'specific revision'))
-r = repo.changectx(rev_).node()
+r = repo[rev_].node()
 if not message:
 message = (_('Added tag %s for changeset %s') %
 (', '.join(names), short(r)))

changeset 6747	f6c00b17387c
parent 6746	1dca460e7d1e
child 6748	c6cc35a3d1de