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

equal deleted inserted replaced

-:1f46be4689ed
+:b33f3e35efb0
 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
 def bad(x, y):
 raise util.Abort("%s: %s" % (x, y))
-ctx = cmdutil.revsingle(repo, opts.get('rev'))
+ctx = scmutil.revsingle(repo, opts.get('rev'))
 m = cmdutil.match(repo, pats, opts)
 m.bad = bad
 follow = not opts.get('no_follow')
 for abs in ctx.walk(m):
 fctx = ctx[abs]
 removed.
 Returns 0 on success.
 '''
-ctx = cmdutil.revsingle(repo, opts.get('rev'))
+ctx = scmutil.revsingle(repo, opts.get('rev'))
 if not ctx:
 raise util.Abort(_('no working directory: please specify a revision'))
 node = ctx.node()
 dest = cmdutil.makefilename(repo, dest, node)
 if os.path.realpath(dest) == repo.root:
 date = opts.get('date')
 if date:
 opts['date'] = util.parsedate(date)
 cmdutil.bailifchanged(repo)
-node = cmdutil.revsingle(repo, rev).node()
+node = scmutil.revsingle(repo, rev).node()
 op1, op2 = repo.dirstate.parents()
 a = repo.changelog.ancestor(op1, node)
 if a != node:
 raise util.Abort(_('cannot backout change on a different branch'))
 raise util.Abort(_("failed to execute %s") % command)
 elif status < 0:
 raise util.Abort(_("%s killed") % command)
 else:
 transition = "bad"
-ctx = cmdutil.revsingle(repo, rev)
+ctx = scmutil.revsingle(repo, rev)
 rev = None # clear for future iterations
 state[transition].append(ctx.node())
 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
 check_state(state, interactive=False)
 # bisect
 return
 # update state
 if rev:
-nodes = [repo.lookup(i) for i in cmdutil.revrange(repo, [rev])]
+nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
 else:
 nodes = [repo.lookup('.')]
 if good or bad or skip:
 if good:
 Returns 0 on success, 1 if no changes found.
 """
 revs = None
 if 'rev' in opts:
-revs = cmdutil.revrange(repo, opts['rev'])
+revs = scmutil.revrange(repo, opts['rev'])
 if opts.get('all'):
 base = ['null']
 else:
-base = cmdutil.revrange(repo, opts.get('base'))
+base = scmutil.revrange(repo, opts.get('base'))
 if base:
 if dest:
 raise util.Abort(_("--base is incompatible with specifying "
 "a destination"))
 common = [repo.lookup(rev) for rev in base]
 :``%d``: dirname of file being printed, or '.' if in repository root
 :``%p``: root-relative path name of file being printed
 Returns 0 on success.
 """
-ctx = cmdutil.revsingle(repo, opts.get('rev'))
+ctx = scmutil.revsingle(repo, opts.get('rev'))
 err = 1
 m = cmdutil.match(repo, (file1,) + pats, opts)
 for abs in ctx.walk(m):
 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
 pathname=abs)
 @command('debugrebuildstate',
 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
 _('[-r REV] [REV]'))
 def debugrebuildstate(ui, repo, rev="tip"):
 """rebuild the dirstate as it would look like for the given revision"""
-ctx = cmdutil.revsingle(repo, rev)
+ctx = scmutil.revsingle(repo, rev)
 wlock = repo.wlock()
 try:
 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
 finally:
 wlock.release()
 [('r', 'rev', '', _('revision to debug'), _('REV'))],
 _('[-r REV] FILE'))
 def debugrename(ui, repo, file1, *pats, **opts):
 """dump rename information"""
-ctx = cmdutil.revsingle(repo, opts.get('rev'))
+ctx = scmutil.revsingle(repo, opts.get('rev'))
 m = cmdutil.match(repo, (file1,) + pats, opts)
 for abs in ctx.walk(m):
 fctx = ctx[abs]
 o = fctx.filelog().renamed(fctx.filenode())
 rel = m.rel(abs)
 be used with care.
 Returns 0 on success.
 """
-r1 = cmdutil.revsingle(repo, rev1).node()
+r1 = scmutil.revsingle(repo, rev1).node()
-r2 = cmdutil.revsingle(repo, rev2, 'null').node()
+r2 = scmutil.revsingle(repo, rev2, 'null').node()
 wlock = repo.wlock()
 try:
 repo.dirstate.setparents(r1, r2)
 finally:
 @command('debugsub',
 [('r', 'rev', '',
 _('revision to check'), _('REV'))],
 _('[-r REV] [REV]'))
 def debugsub(ui, repo, rev=None):
-ctx = cmdutil.revsingle(repo, rev, None)
+ctx = scmutil.revsingle(repo, rev, None)
 for k, v in sorted(ctx.substate.items()):
 ui.write('path %s\n' % k)
 ui.write(' source   %s\n' % v[0])
 ui.write(' revision %s\n' % v[1])
 if revs and change:
 msg = _('cannot specify --rev and --change at the same time')
 raise util.Abort(msg)
 elif change:
-node2 = cmdutil.revsingle(repo, change, None).node()
+node2 = scmutil.revsingle(repo, change, None).node()
 node1 = repo[node2].p1().node()
 else:
-node1, node2 = cmdutil.revpair(repo, revs)
+node1, node2 = scmutil.revpair(repo, revs)
 if reverse:
 node1, node2 = node2, node1
 diffopts = patch.diffopts(ui, opts)
 Returns 0 on success.
 """
 changesets += tuple(opts.get('rev', []))
 if not changesets:
 raise util.Abort(_("export requires at least one changeset"))
-revs = cmdutil.revrange(repo, changesets)
+revs = scmutil.revrange(repo, changesets)
 if len(revs) > 1:
 ui.note(_('exporting patches:\n'))
 else:
 ui.note(_('exporting patch:\n'))
 cmdutil.export(repo, revs, template=opts.get('output'),
 Returns 0 if matching heads are found, 1 if not.
 """
 start = None
 if 'rev' in opts:
-start = cmdutil.revsingle(repo, opts['rev'], None).node()
+start = scmutil.revsingle(repo, opts['rev'], None).node()
 if opts.get('topo'):
 heads = [repo[h] for h in repo.heads(start)]
 else:
 heads = []
 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
 if num:
 output.append("%s%s" %
 ('+'.join([str(p.rev()) for p in parents]), changed))
 else:
-ctx = cmdutil.revsingle(repo, rev)
+ctx = scmutil.revsingle(repo, rev)
 if default or id:
 output = [hexfunc(ctx.node())]
 if num:
 output.append(str(ctx.rev()))
 contain whitespace as multiple filenames.
 Returns 0 if a match is found, 1 otherwise.
 """
 end = opts.get('print0') and '\0' or '\n'
-rev = cmdutil.revsingle(repo, opts.get('rev'), None).node()
+rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
 ret = 1
 m = cmdutil.match(repo, pats, opts, default='relglob')
 m.bad = lambda x, y: False
 for abs in repo[rev].walk(m):
 limit = cmdutil.loglimit(opts)
 count = 0
 endrev = None
 if opts.get('copies') and opts.get('rev'):
-endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
+endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
 df = False
 if opts["date"]:
 df = util.matchdate(opts["date"])
 if not node:
 node = rev
 decor = {'l':'644 @ ', 'x':'755 * ', '':'644   '}
-ctx = cmdutil.revsingle(repo, node)
+ctx = scmutil.revsingle(repo, node)
 for f in ctx:
 if ui.debugflag:
 ui.write("%40s " % hex(ctx.manifest()[f]))
 if ui.verbose:
 ui.write(decor[ctx.flags(f)])
 raise util.Abort(_('working directory not at a head revision'),
 hint=_("use 'hg update' or merge with an "
 "explicit revision"))
 node = parent == bheads[0] and bheads[-1] or bheads[0]
 else:
-node = cmdutil.revsingle(repo, node).node()
+node = scmutil.revsingle(repo, node).node()
 if opts.get('preview'):
 # find nodes that are ancestors of p2 but not of p1
 p1 = repo.lookup('.')
 p2 = repo.lookup(node)
 argument to --rev if given) is printed.
 Returns 0 on success.
 """
-ctx = cmdutil.revsingle(repo, opts.get('rev'), None)
+ctx = scmutil.revsingle(repo, opts.get('rev'), 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 filename'))
 if not pats and not opts.get('all'):
 raise util.Abort(_('no files or directories specified; '
 'use --all to revert the whole repo'))
-ctx = cmdutil.revsingle(repo, opts.get('rev'))
+ctx = scmutil.revsingle(repo, opts.get('rev'))
 node = ctx.node()
 mf = ctx.manifest()
 if node == parent:
 pmf = mf
 else:
 raise util.Abort(msg)
 elif change:
 node2 = repo.lookup(change)
 node1 = repo[node2].p1().node()
 else:
-node1, node2 = cmdutil.revpair(repo, revs)
+node1, node2 = scmutil.revpair(repo, revs)
 cwd = (pats and repo.getcwd()) or ''
 end = opts.get('print0') and '\0' or '\n'
 copy = {}
 states = 'modified added removed deleted unknown ignored clean'.split()
 if p2 != nullid:
 raise util.Abort(_('uncommitted merge'))
 bheads = repo.branchheads()
 if not opts.get('force') and bheads and p1 not in bheads:
 raise util.Abort(_('not at a branch head (use -f to force)'))
-r = cmdutil.revsingle(repo, rev_).node()
+r = scmutil.revsingle(repo, rev_).node()
 if not message:
 # we don't translate commit messages
 message = ('Added tag %s for changeset %s' %
 (', '.join(names), short(r)))
 if rev is None or rev == '':
 rev = node
 # if we defined a bookmark, we have to remember the original bookmark name
 brev = rev
-rev = cmdutil.revsingle(repo, rev, rev).rev()
+rev = scmutil.revsingle(repo, rev, rev).rev()
 if check and clean:
 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
 if check:

changeset 14319	b33f3e35efb0
parent 14318	1f46be4689ed
child 14321	003d63bb4fa5