mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:c27d1e1798a3
+:09e8aecd8016
 # of the GNU General Public License, incorporated herein by reference.
 from demandload import demandload
 from node import *
 from i18n import gettext as _
-demandload(globals(), "os re sys signal shutil imp urllib pdb")
+demandload(globals(), "os re sys signal shutil imp urllib pdb shlex")
 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
 demandload(globals(), "fnmatch difflib patch random signal tempfile time")
 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
 demandload(globals(), "archival cStringIO changegroup")
 demandload(globals(), "cmdutil hgweb.server sshserver")
 except IOError, inst:
 raise util.Abort(_("can't read commit message '%s': %s") %
 (logfile, inst.strerror))
 return message
+def defaultrev(repo, rev=None, default='tip'):
+"""returns rev if it is specified, otherwise the working dir
+parent if there is only one, or tip if there is no working
+dir"""
+if rev:
+return rev
+p1, p2 = repo.dirstate.parents()
+if p2 != nullid:
+raise util.Abort(_('uncommitted merge - please provide a '
+'specific revision'))
+if p1 != nullid:
+return hex(p1)
+return default
 def walkchangerevs(ui, repo, pats, opts):
 '''Iterate over files and the revs they changed in.
 Callers most commonly need to iterate backwards over the history
 it is interested in.  Doing so has awful (quadratic-looking)
 if repo.changelog.count() == 0:
 return [], False, matchfn
 if follow:
-p = repo.dirstate.parents()[0]
+defrange = '%s:0' % defaultrev(repo)
-if p == nullid:
-ui.warn(_('No working directory revision; defaulting to tip\n'))
-start = 'tip'
-else:
-start = repo.changelog.rev(p)
-defrange = '%s:0' % start
 else:
 defrange = 'tip:0'
-revs = map(int, revrange(ui, repo, opts['rev'] or [defrange]))
+revs = map(int, cmdutil.revrange(ui, repo, opts['rev'] or [defrange]))
 wanted = {}
 slowpath = anypats
 fncache = {}
 chcache = {}
 yield 'add', rev, fns
 for rev in nrevs:
 yield 'iter', rev, None
 return iterate(), getchange, matchfn
-revrangesep = ':'
-def revfix(repo, val, defval):
-'''turn user-level id of changeset into rev number.
-user-level id can be tag, changeset, rev number, or negative rev
-number relative to number of revs (-1 is tip, etc).'''
-if not val:
-return defval
-try:
-num = int(val)
-if str(num) != val:
-raise ValueError
-if num < 0:
-num += repo.changelog.count()
-if num < 0:
-num = 0
-elif num >= repo.changelog.count():
-raise ValueError
-except ValueError:
-try:
-num = repo.changelog.rev(repo.lookup(val))
-except KeyError:
-raise util.Abort(_('invalid revision identifier %s'), val)
-return num
-def revpair(ui, repo, revs):
-'''return pair of nodes, given list of revisions. second item can
-be None, meaning use working dir.'''
-if not revs:
-return repo.dirstate.parents()[0], None
-end = None
-if len(revs) == 1:
-start = revs[0]
-if revrangesep in start:
-start, end = start.split(revrangesep, 1)
-start = revfix(repo, start, 0)
-end = revfix(repo, end, repo.changelog.count() - 1)
-else:
-start = revfix(repo, start, None)
-elif len(revs) == 2:
-if revrangesep in revs[0] or revrangesep in revs[1]:
-raise util.Abort(_('too many revisions specified'))
-start = revfix(repo, revs[0], None)
-end = revfix(repo, revs[1], None)
-else:
-raise util.Abort(_('too many revisions specified'))
-if end is not None: end = repo.lookup(str(end))
-return repo.lookup(str(start)), end
-def revrange(ui, repo, revs):
-"""Yield revision as strings from a list of revision specifications."""
-seen = {}
-for spec in revs:
-if revrangesep in spec:
-start, end = spec.split(revrangesep, 1)
-start = revfix(repo, start, 0)
-end = revfix(repo, end, repo.changelog.count() - 1)
-step = start > end and -1 or 1
-for rev in xrange(start, end+step, step):
-if rev in seen:
-continue
-seen[rev] = 1
-yield str(rev)
-else:
-rev = revfix(repo, spec, None)
-if rev in seen:
-continue
-seen[rev] = 1
-yield str(rev)
 def write_bundle(cg, filename=None, compress=True):
 """Write a bundle file and return its filename.
 Existing files will not be overwritten.
 If no filename is specified, a temporary file is created.
 fh = None
 cleanup = None
 try:
 if filename:
 if os.path.exists(filename):
-raise util.Abort(_("file '%s' already exists"), filename)
+raise util.Abort(_("file '%s' already exists") % filename)
 fh = open(filename, "wb")
 else:
 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
 fh = os.fdopen(fd, "wb")
 cleanup = filename
 opmap = [['user', getname], ['number', str], ['changeset', getnode],
 ['date', getdate]]
 if not opts['user'] and not opts['changeset'] and not opts['date']:
 opts['number'] = 1
-ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0])
+ctx = repo.changectx(defaultrev(repo, opts['rev']))
 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
 node=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.
 '''
-if opts['rev']:
+node = repo.lookup(defaultrev(repo, opts['rev']))
-node = repo.lookup(opts['rev'])
-else:
-node, p2 = repo.dirstate.parents()
-if p2 != nullid:
-raise util.Abort(_('uncommitted merge - please provide a '
-'specific revision'))
 dest = cmdutil.make_filename(repo, dest, node)
 if os.path.realpath(dest) == repo.root:
 raise util.Abort(_('repository root cannot be destination'))
 dummy, matchfn, dummy = cmdutil.matchpats(repo, [], opts)
 kind = opts.get('type') or 'files'
 def cat(ui, repo, file1, *pats, **opts):
 """output the latest or given revisions of files
 Print the specified files as they were at the given revision.
-If no revision is given then the tip is used.
+If no revision is given then working dir parent is used, or tip
+if no revision is checked out.
 Output may be to a file, in which case the name of the file is
 given using a format string.  The formatting rules are the same as
 for the export command, with the following additions:
 %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'] or "-1")
+ctx = repo.changectx(defaultrev(repo, opts['rev']))
 for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts,
 ctx.node()):
 fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
 fp.write(ctx.filectx(abs).data())
 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
 file_[:-2] + ".i", file_, 0)
 try:
 ui.write(r.revision(r.lookup(rev)))
 except KeyError:
-raise util.Abort(_('invalid revision identifier %s'), rev)
+raise util.Abort(_('invalid revision identifier %s') % rev)
 def debugindex(ui, file_):
 """dump the contents of an index file"""
 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
 ui.write("   rev    offset  length   base linkrev" +
 Without the -a option, diff will avoid generating diffs of files
 it detects as binary. With -a, diff will generate a diff anyway,
 probably with undesirable results.
 """
-node1, node2 = revpair(ui, repo, opts['rev'])
+node1, node2 = cmdutil.revpair(ui, repo, opts['rev'])
 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
 patch.diff(repo, node1, node2, fns, match=matchfn,
 opts=patch.diffopts(ui, opts))
 With the --switch-parent option, the diff will be against the second
 parent. It can be useful to review a merge.
 """
 if not changesets:
 raise util.Abort(_("export requires at least one changeset"))
-revs = list(revrange(ui, repo, changesets))
+revs = list(cmdutil.revrange(ui, repo, changesets))
 if len(revs) > 1:
 ui.note(_('exporting patches:\n'))
 else:
 ui.note(_('exporting patch:\n'))
 patch.export(repo, map(repo.lookup, revs), template=opts['output'],
 head revision, and the repository contains exactly one other head,
 the other head is merged with by default.  Otherwise, an explicit
 revision to merge with must be provided.
 """
-if node:
+if node or branch:
 node = _lookup(repo, node, branch)
 else:
 heads = repo.heads()
 if len(heads) > 2:
 raise util.Abort(_('repo has %d heads - '
 explicitly specify the revision to revert to.
 Modified files are saved with a .orig suffix before reverting.
 To disable these backups, use --no-backup.
-Using the -r option, revert the given files or directories to
+Using the -r option, revert the given files or directories to their
-their contents as of a specific revision.  This can be helpful to"roll
+contents as of a specific revision. This can be helpful to "roll
 back" some or all of a change that should not have been committed.
 Revert modifies the working directory.  It does not commit any
 changes, or change the parent of the working directory.  If you
 revert to a revision other than the parent of the working
 If no arguments are given, no files are reverted.
 """
 if not pats and not opts['all']:
-raise util.Abort(_('no files or directories specified'))
+raise util.Abort(_('no files or directories specified; '
+'use --all to revert the whole repo'))
 parent, p2 = repo.dirstate.parents()
-if opts['rev']:
+node = repo.lookup(defaultrev(repo, opts['rev']))
-node = repo.lookup(opts['rev'])
-elif p2 != nullid:
-raise util.Abort(_('working dir has two parents; '
-'you must specify the revision to revert to'))
-else:
-node = parent
 mf = repo.manifest.read(repo.changelog.read(node)[0])
 if node == parent:
 pmf = mf
 else:
 pmf = None
 stderr.  Use the "-A" and "-E" options to log to files.
 """
 if opts["stdio"]:
 if repo is None:
-raise hg.RepoError(_('no repo found'))
+raise hg.RepoError(_("There is no Mercurial repository here"
+" (.hg not found)"))
 s = sshserver.sshserver(ui, repo)
 s.serve_forever()
 optlist = ("name templates style address port ipv6"
 " accesslog errorlog webdir_conf")
 for o in optlist.split():
 if opts[o]:
 ui.setconfig("web", o, opts[o])
 if repo is None and not ui.config("web", "webdir_conf"):
-raise hg.RepoError(_('no repo found'))
+raise hg.RepoError(_("There is no Mercurial repository here"
+" (.hg not found)"))
 if opts['daemon'] and not opts['daemon_pipefds']:
 rfd, wfd = os.pipe()
 args = sys.argv[:]
 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
 os._exit(0)
 try:
 httpd = hgweb.server.create_server(ui, repo)
 except socket.error, inst:
-raise util.Abort(_('cannot start server: ') + inst.args[1])
+raise util.Abort(_('cannot start server: %s') % inst.args[1])
 if ui.verbose:
 addr, port = httpd.socket.getsockname()
 if addr == '0.0.0.0':
 addr = socket.gethostname()
 "please use 'hg tag [-r REV] NAME' instead\n"))
 if opts['rev']:
 raise util.Abort(_("use only one form to specify the revision"))
 if opts['rev']:
 rev_ = opts['rev']
-if rev_:
+r = defaultrev(repo, rev_, nullid)
-r = repo.lookup(rev_)
+if r == nullid:
-else:
+raise util.Abort(_('no revision to tag'))
-p1, p2 = repo.dirstate.parents()
+r = repo.lookup(r)
-if p1 == nullid:
-raise util.Abort(_('no revision to tag'))
-if p2 != nullid:
-raise util.Abort(_('outstanding uncommitted merges'))
-r = p1
 message = opts['message']
 if not message:
 message = _('Added tag %s for changeset %s') % (name, short(r))
 if len(found) == 1:
 node = found[0]
 repo.ui.warn(_("Using head %s for branch %s\n")
 % (short(node), branch))
 else:
-raise util.Abort(_("branch %s not found\n") % (branch))
+raise util.Abort(_("branch %s not found") % branch)
 else:
 node = node and repo.lookup(node) or repo.changelog.tip()
 return node
 def verify(ui, repo):
 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
 "^export":
 (export,
 [('o', 'output', '', _('print output to file with formatted name')),
 ('a', 'text', None, _('treat all files as text')),
+('g', 'git', None, _('use git extended diff format')),
 ('', 'switch-parent', None, _('diff against the second parent'))],
 _('hg export [-a] [-o OUTFILESPEC] REV...')),
 "debugforget|forget":
 (forget,
 [('I', 'include', [], _('include names matching the given patterns')),
 cmd, args = args[0], args[1:]
 aliases, i = findcmd(ui, cmd)
 cmd = aliases[0]
 defaults = ui.config("defaults", cmd)
 if defaults:
-args = defaults.split() + args
+args = shlex.split(defaults) + args
 c = list(i[1])
 else:
 cmd = None
 c = []
 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
 num = getattr(signal, name, None)
 if num: signal.signal(num, catchterm)
 try:
-u = ui.ui(traceback='--traceback' in sys.argv[1:],
+u = ui.ui(traceback='--traceback' in sys.argv[1:])
-readhooks=[load_extensions])
 except util.Abort, inst:
 sys.stderr.write(_("abort: %s\n") % inst)
 return -1
+load_extensions(u)
+u.addreadhook(load_extensions)
 try:
 cmd, func, args, options, cmdoptions = parse(u, args)
 if options["time"]:
 def get_times():
 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
 except lock.LockUnavailable, inst:
 u.warn(_("abort: could not lock %s: %s\n") %
 (inst.desc or inst.filename, inst.strerror))
 except revlog.RevlogError, inst:
-u.warn(_("abort: "), inst, "!\n")
+u.warn(_("abort: %s!\n") % inst)
 except util.SignalInterrupt:
 u.warn(_("killed!\n"))
 except KeyboardInterrupt:
 try:
 u.warn(_("interrupted!\n"))
 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
 if u.debugflag:
 u.warn(_("broken pipe\n"))
 elif getattr(inst, "strerror", None):
 if getattr(inst, "filename", None):
-u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
+u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
 else:
 u.warn(_("abort: %s\n") % inst.strerror)
 else:
 raise
 except OSError, inst:
-if hasattr(inst, "filename"):
+if getattr(inst, "filename", None):
 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
 else:
 u.warn(_("abort: %s\n") % inst.strerror)
 except util.Abort, inst:
-u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
+u.warn(_("abort: %s\n") % inst)
 except TypeError, inst:
 # was this an argument error?
 tb = traceback.extract_tb(sys.exc_info()[2])
 if len(tb) > 2: # no
 raise

changeset 3100	09e8aecd8016
parent 3092	25857e00af8e
child 3127	81da3c45aabd