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

comparison mercurial/commands.py @ 24803:e89f909edffa stable 3.4-rc

merge default into stable for 3.4 freeze

author	Matt Mackall <mpm@selenic.com>
date	Thu, 16 Apr 2015 20:57:51 -0500
parents	077683371b7b
children	22c70c08d4af

comparison

equal deleted inserted replaced

-:612ed41ae359
+:e89f909edffa
 ('', 'reverse', None, _('produce a diff that undoes the changes')),
 ] + diffwsopts + [
 ('U', 'unified', '',
 _('number of lines of context to show'), _('NUM')),
 ('', 'stat', None, _('output diffstat-style summary of changes')),
+('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
 ]
 mergetoolopts = [
 ('t', 'tool', '', _('specify merge tool')),
 ]
 if opts.get('follow'):
 # --follow is deprecated and now just an alias for -f/--file
 # to mimic the behavior of Mercurial before version 1.5
 opts['file'] = True
+ctx = scmutil.revsingle(repo, opts.get('rev'))
 fm = ui.formatter('annotate', opts)
-datefunc = ui.quiet and util.shortdate or util.datestr
+if ui.quiet:
-hexfn = fm.hexfunc
+datefunc = util.shortdate
+else:
+datefunc = util.datestr
+if ctx.rev() is None:
+def hexfn(node):
+if node is None:
+return None
+else:
+return fm.hexfunc(node)
+if opts.get('changeset'):
+# omit "+" suffix which is appended to node hex
+def formatrev(rev):
+if rev is None:
+return '%d' % ctx.p1().rev()
+else:
+return '%d' % rev
+else:
+def formatrev(rev):
+if rev is None:
+return '%d+' % ctx.p1().rev()
+else:
+return '%d ' % rev
+def formathex(hex):
+if hex is None:
+return '%s+' % fm.hexfunc(ctx.p1().node())
+else:
+return '%s ' % hex
+else:
+hexfn = fm.hexfunc
+formatrev = formathex = str
 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
-('number', ' ', lambda x: x[0].rev(), str),
+('number', ' ', lambda x: x[0].rev(), formatrev),
-('changeset', ' ', lambda x: hexfn(x[0].node()), str),
+('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
 ('file', ' ', lambda x: x[0].path(), str),
 ('line_number', ':', lambda x: x[1], str),
 ]
 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
 if opts.get(op))
 def bad(x, y):
 raise util.Abort("%s: %s" % (x, y))
-ctx = scmutil.revsingle(repo, opts.get('rev'))
 m = scmutil.match(ctx, pats, opts)
 m.bad = bad
 follow = not opts.get('no_follow')
 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
 whitespace=True)
 def extendbisectrange(nodes, good):
 # bisect is incomplete when it ends on a merge node and
 # one of the parent was not checked.
 parents = repo[nodes[0]].parents()
 if len(parents) > 1:
-side = good and state['bad'] or state['good']
+if good:
+side = state['bad']
+else:
+side = state['good']
 num = len(set(i.node() for i in parents) & set(side))
 if num == 1:
 return parents[0].ancestor(parents[1])
 return None
 bundletype = opts.get('type', 'bzip2').lower()
 btypes = {'none': 'HG10UN',
 'bzip2': 'HG10BZ',
 'gzip': 'HG10GZ',
-'bundle2': 'HG2Y'}
+'bundle2': 'HG20'}
 bundletype = btypes.get(bundletype)
 if bundletype not in changegroup.bundletypes:
 raise util.Abort(_('unknown bundle type specified with --type'))
 if opts.get('all'):
 m = scmutil.match(ctx, (file1,) + pats, opts)
 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
 @command('^clone',
-[('U', 'noupdate', None,
+[('U', 'noupdate', None, _('the clone will include an empty working '
-_('the clone will include an empty working copy (only a repository)')),
+'directory (only a repository)')),
 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
 ('', 'pull', None, _('use pull protocol to copy metadata')),
 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
 @command('^commit|ci',
 [('A', 'addremove', None,
 _('mark new/missing files as added/removed before committing')),
 ('', 'close-branch', None,
 _('mark a branch as closed, hiding it from the branch list')),
-('', 'amend', None, _('amend the parent of the working dir')),
+('', 'amend', None, _('amend the parent of the working directory')),
 ('s', 'secret', None, _('use the secret phase for committing')),
 ('e', 'edit', None, _('invoke editor on commit messages')),
+('i', 'interactive', None, _('use interactive mode')),
 ] + walkopts + commitopts + commitopts2 + subrepoopts,
 _('[OPTION]... [FILE]...'),
 inferrepo=True)
 def commit(ui, repo, *pats, **opts):
 """commit the specified files or all outstanding changes
 See :hg:`help dates` for a list of formats valid for -d/--date.
 Returns 0 on success, 1 if nothing changed.
 """
+if opts.get('interactive'):
+opts.pop('interactive')
+cmdutil.dorecord(ui, repo, commit, 'commit', False,
+cmdutil.recordfilter, *pats, **opts)
+return
 if opts.get('subrepos'):
 if opts.get('amend'):
 raise util.Abort(_('cannot amend with --subrepos'))
 # Let --subrepos on the command line override config setting.
 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
 if not isinstance(gen, bundle2.unbundle20):
 raise util.Abort(_('not a bundle2 file'))
 ui.write(('Stream params: %s\n' % repr(gen.params)))
 for part in gen.iterparts():
 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
-if part.type == 'b2x:changegroup':
+if part.type == 'changegroup':
 version = part.params.get('version', '01')
 cg = changegroup.packermap[version][1](part, 'UN')
 chunkdata = cg.changelogheader()
 chain = None
 while True:
 options.append('-%s' % o[0])
 options.append('--%s' % o[1])
 ui.write("%s\n" % "\n".join(options))
 return
-cmdlist = cmdutil.findpossible(cmd, table)
+cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
 if ui.verbose:
 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
 @command('debugdag',
 bundletype = opts.get('type', 'bzip2').lower()
 btypes = {'none': 'HG10UN',
 'bzip2': 'HG10BZ',
 'gzip': 'HG10GZ',
-'bundle2': 'HG2Y'}
+'bundle2': 'HG20'}
 bundletype = btypes.get(bundletype)
 if bundletype not in changegroup.bundletypes:
 raise util.Abort(_('unknown bundle type specified with --type'))
 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
 deltatotal = deltasize[2]
 if numrevs - numfull > 0:
 deltasize[2] /= numrevs - numfull
 totalsize = fulltotal + deltatotal
 avgchainlen = sum(chainlengths) / numrevs
+maxchainlen = max(chainlengths)
 compratio = totalrawsize / totalsize
 basedfmtstr = '%%%dd\n'
 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
 ui.write(('    deltas    : ') + fmt % pcfmt(deltatotal, totalsize))
 ui.write('\n')
 fmt = dfmtstr(max(avgchainlen, compratio))
 ui.write(('avg chain length  : ') + fmt % avgchainlen)
+ui.write(('max chain length  : ') + fmt % maxchainlen)
 ui.write(('compression ratio : ') + fmt % compratio)
 if format > 0:
 ui.write('\n')
 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
 ui.note(revset.prettyformat(newtree), "\n")
 if opts["optimize"]:
 weight, optimizedtree = revset.optimize(newtree, True)
 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
 func = revset.match(ui, expr)
-for c in func(repo, revset.spanset(repo)):
+revs = func(repo)
+if ui.verbose:
+ui.note("* set:\n", revset.prettyformatset(revs), "\n")
+for c in revs:
 ui.write("%s\n" % c)
 @command('debugsetparents', [], _('REV1 [REV2]'))
 def debugsetparents(ui, repo, rev1, rev2=None):
 """manually set the parents of the current working directory
 This is useful for writing repository conversion tools, but should
-be used with care.
+be used with care. For example, neither the working directory nor the
+dirstate is updated, so file status may be incorrect after running this
+command.
 Returns 0 on success.
 """
 r1 = scmutil.revsingle(repo, rev1).node()
 node1, node2 = node2, node1
 diffopts = patch.diffallopts(ui, opts)
 m = scmutil.match(repo[node2], pats, opts)
 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
-listsubrepos=opts.get('subrepos'))
+listsubrepos=opts.get('subrepos'),
+root=opts.get('root'))
 @command('^export',
 [('o', 'output', '',
 _('print output to file with formatted name'), _('FORMAT')),
 ('', 'switch-parent', None, _('diff against the second parent')),
 opts=patch.diffallopts(ui, opts))
 @command('files',
 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
-] + walkopts + formatteropts,
+] + walkopts + formatteropts + subrepoopts,
 _('[OPTION]... [PATTERN]...'))
 def files(ui, repo, *pats, **opts):
 """list tracked files
 Print files under Mercurial control in the working directory or
 specified revision whose names match the given patterns (excluding
 removed files).
 If no patterns are given to match, this command prints the names
-of all files under Mercurial control in the working copy.
+of all files under Mercurial control in the working directory.
 .. container:: verbose
 Examples:
 Returns 0 if a match is found, 1 otherwise.
 """
 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
-rev = ctx.rev()
-ret = 1
 end = '\n'
 if opts.get('print0'):
 end = '\0'
 fm = ui.formatter('files', opts)
 fmt = '%s' + end
 m = scmutil.match(ctx, pats, opts)
-ds = repo.dirstate
+ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
-for f in ctx.matches(m):
-if rev is None and ds[f] == 'r':
-continue
-fm.startitem()
-if ui.verbose:
-fc = ctx[f]
-fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
-fm.data(abspath=f)
-fm.write('path', fmt, m.rel(f))
-ret = 0
 fm.end()
 return ret
 ui.status(_('grafting %s\n') % desc)
 if opts.get('dry_run'):
 continue
 source = ctx.extra().get('source')
-if not source:
+extra = {}
-source = ctx.hex()
+if source:
-extra = {'source': source}
+extra['source'] = source
+extra['intermediate-source'] = ctx.hex()
+else:
+extra['source'] = ctx.hex()
 user = ctx.user()
 if opts.get('user'):
 user = opts['user']
 date = ctx.date()
 if opts.get('date'):
 for i in xrange(blo, bhi):
 yield ('+', b[i])
 def display(fn, ctx, pstates, states):
 rev = ctx.rev()
-datefunc = ui.quiet and util.shortdate or util.datestr
+if ui.quiet:
+datefunc = util.shortdate
+else:
+datefunc = util.datestr
 found = False
 @util.cachefunc
 def binary():
 flog = getfile(fn)
 return util.binary(flog.read(ctx.filenode(fn)))
 ] + remoteopts,
 _('[-nibtB] [-r REV] [SOURCE]'),
 optionalrepo=True)
 def identify(ui, repo, source=None, rev=None,
 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
-"""identify the working copy or specified revision
+"""identify the working directory or specified revision
 Print a summary identifying the repository state at REV using one or
 two parent hash identifiers, followed by a "+" if the working
 directory has uncommitted changes, the branch name (if not default),
 a list of tags, and a list of bookmarks.
 if not repo and not source:
 raise util.Abort(_("there is no Mercurial repository here "
 "(.hg not found)"))
-hexfunc = ui.debugflag and hex or short
+if ui.debugflag:
+hexfunc = hex
+else:
+hexfunc = short
 default = not (num or id or branch or tags or bookmarks)
 output = []
 revs = []
 if source:
 _("apply patch without touching the working directory")),
 ('', 'partial', None,
 _('commit even if some hunks fail')),
 ('', 'exact', None,
 _('apply patch to the nodes from which it was generated')),
+('', 'prefix', '',
+_('apply patch to subdirectory'), _('DIR')),
 ('', 'import-branch', None,
 _('use any branch information in patch (implied by --exact)'))] +
 commitopts + commitopts2 + similarityopts,
 _('[OPTION]... PATCH...'))
 def import_(ui, repo, patch1=None, *patches, **opts):
 raise util.Abort(_('similarity must be between 0 and 100'))
 if sim and not update:
 raise util.Abort(_('cannot use --similarity with --bypass'))
 if opts.get('exact') and opts.get('edit'):
 raise util.Abort(_('cannot use --exact with --edit'))
+if opts.get('exact') and opts.get('prefix'):
+raise util.Abort(_('cannot use --exact with --prefix'))
 if update:
 cmdutil.checkunfinished(repo)
 if (opts.get('exact') or not opts.get('force')) and update:
 cmdutil.bailifchanged(repo)
 Show new changesets found in the specified path/URL or the default
 pull location. These are the changesets that would have been pulled
 if a pull at the time you issued this command.
-For remote repository, using --bundle avoids downloading the
-changesets twice if the incoming is followed by a pull.
 See pull for valid source format details.
 .. container:: verbose
+With -B/--bookmarks, the result of bookmark comparison between
+local and remote repositories is displayed. With -v/--verbose,
+status is also displayed for each bookmark like below::
+BM1               01234567890a added
+BM2               1234567890ab advanced
+BM3               234567890abc diverged
+BM4               34567890abcd changed
+The action taken locally when pulling depends on the
+status of each bookmark:
+:``added``: pull will create it
+:``advanced``: pull will update it
+:``diverged``: pull will create a divergent bookmark
+:``changed``: result depends on remote changesets
+From the point of view of pulling behavior, bookmark
+existing only in the remote repository are treated as ``added``,
+even if it is in fact locally deleted.
+.. container:: verbose
+For remote repository, using --bundle avoids downloading the
+changesets twice if the incoming is followed by a pull.
 Examples:
 - show incoming changes with patches and full description::
 other = hg.peer(repo, opts, source)
 if 'bookmarks' not in other.listkeys('namespaces'):
 ui.warn(_("remote doesn't support bookmarks\n"))
 return 0
 ui.status(_('comparing with %s\n') % util.hidepassword(source))
-return bookmarks.diff(ui, repo, other)
+return bookmarks.incoming(ui, repo, other)
 repo._subtoppath = ui.expandpath(source)
 try:
 return hg.incoming(ui, repo, source, opts)
 finally:
 See :hg:`help files` for a more versatile command.
 Returns 0 if a match is found, 1 otherwise.
 """
-end = opts.get('print0') and '\0' or '\n'
+if opts.get('print0'):
+end = '\0'
+else:
+end = '\n'
 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
 ret = 1
 ctx = repo[rev]
 m = scmutil.match(ctx, pats, opts, default='relglob')
 specifying custom templates.
 Returns 0 on success.
 """
+if opts.get('follow') and opts.get('rev'):
+opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
+del opts['follow']
 if opts.get('graph'):
 return cmdutil.graphlog(ui, repo, *pats, **opts)
 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
 limit = cmdutil.loglimit(opts)
 copies = []
 for fn in ctx.files():
 rename = getrenamed(fn, rev)
 if rename:
 copies.append((fn, rename[0]))
-revmatchfn = filematcher and filematcher(ctx.rev()) or None
+if filematcher:
+revmatchfn = filematcher(ctx.rev())
+else:
+revmatchfn = None
 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
 if displayer.flush(rev):
 count += 1
 displayer.close()
 or the default push location. These are the changesets that would
 be pushed if a push was requested.
 See pull for details of valid destination formats.
+.. container:: verbose
+With -B/--bookmarks, the result of bookmark comparison between
+local and remote repositories is displayed. With -v/--verbose,
+status is also displayed for each bookmark like below::
+BM1               01234567890a added
+BM2                            deleted
+BM3               234567890abc advanced
+BM4               34567890abcd diverged
+BM5               4567890abcde changed
+The action taken when pushing depends on the
+status of each bookmark:
+:``added``: push with ``-B`` will create it
+:``deleted``: push with ``-B`` will delete it
+:``advanced``: push will update it
+:``diverged``: push with ``-B`` will update it
+:``changed``: push with ``-B`` will update it
+From the point of view of pushing behavior, bookmarks
+existing only in the remote repository are treated as
+``deleted``, even if it is in fact added remotely.
 Returns 0 if there are outgoing changes, 1 otherwise.
 """
 if opts.get('graph'):
 cmdutil.checkunsupportedgraphflags([], opts)
 o, other = hg._outgoing(ui, repo, dest, opts)
 other = hg.peer(repo, opts, dest)
 if 'bookmarks' not in other.listkeys('namespaces'):
 ui.warn(_("remote doesn't support bookmarks\n"))
 return 0
 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
-return bookmarks.diff(ui, other, repo)
+return bookmarks.outgoing(ui, repo, other)
 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
 try:
 return hg.outgoing(ui, repo, dest, opts)
 finally:
 See :hg:`help urls` for more information.
 Returns 0 on success.
 """
 if search:
-for name, path in ui.configitems("paths"):
+for name, path in sorted(ui.paths.iteritems()):
 if name == search:
-ui.status("%s\n" % util.hidepassword(path))
+ui.status("%s\n" % util.hidepassword(path.loc))
 return
 if not ui.quiet:
 ui.warn(_("not found!\n"))
 return 1
 else:
-for name, path in ui.configitems("paths"):
+for name, path in sorted(ui.paths.iteritems()):
 if ui.quiet:
 ui.write("%s\n" % name)
 else:
-ui.write("%s = %s\n" % (name, util.hidepassword(path)))
+ui.write("%s = %s\n" % (name,
+util.hidepassword(path.loc)))
 @command('phase',
 [('p', 'public', False, _('set changeset phase to public')),
 ('d', 'draft', False, _('set changeset phase to draft')),
 ('s', 'secret', False, _('set changeset phase to secret')),
 See :hg:`help urls` for more information.
 Returns 0 on success, 1 if an update had unresolved files.
 """
 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
+ui.status(_('pulling from %s\n') % util.hidepassword(source))
 other = hg.peer(repo, opts, source)
 try:
-ui.status(_('pulling from %s\n') % util.hidepassword(source))
 revs, checkout = hg.addbranchrevs(repo, other, branches,
 opts.get('rev'))
 remotebookmarks = other.listkeys('bookmarks')
 else:
 raise
 if revs:
 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
+if not revs:
+raise util.Abort(_("specified revisions evaluate to an empty set"),
+hint=_("use different revision arguments"))
 repo._subtoppath = dest
 try:
 # push subrepos depth-first for coherent ordering
 c = repo['']
 [('a', 'all', None, _('select all unresolved files')),
 ('l', 'list', None, _('list state of files needing merge')),
 ('m', 'mark', None, _('mark files as resolved')),
 ('u', 'unmark', None, _('mark files as unresolved')),
 ('n', 'no-status', None, _('hide status prefix'))]
-+ mergetoolopts + walkopts,
++ mergetoolopts + walkopts + formatteropts,
 _('[OPTION]... [FILE]...'),
 inferrepo=True)
 def resolve(ui, repo, *pats, **opts):
 """redo merges or set/view the merge status of files
 raise util.Abort(_("can't specify --all and patterns"))
 if not (all or pats or show or mark or unmark):
 raise util.Abort(_('no files or directories specified'),
 hint=('use --all to remerge all files'))
+if show:
+fm = ui.formatter('resolve', opts)
+ms = mergemod.mergestate(repo)
+m = scmutil.match(repo[None], pats, opts)
+for f in ms:
+if not m(f):
+continue
+l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved'}[ms[f]]
+fm.startitem()
+fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
+fm.write('path', '%s\n', f, label=l)
+fm.end()
+return 0
 wlock = repo.wlock()
 try:
 ms = mergemod.mergestate(repo)
-if not (ms.active() or repo.dirstate.p2() != nullid) and not show:
+if not (ms.active() or repo.dirstate.p2() != nullid):
 raise util.Abort(
 _('resolve command not applicable when not merging'))
 m = scmutil.match(repo[None], pats, opts)
 ret = 0
 if not m(f):
 continue
 didwork = True
-if show:
+if mark:
-if nostatus:
-ui.write("%s\n" % f)
-else:
-ui.write("%s %s\n" % (ms[f].upper(), f),
-label='resolve.' +
-{'u': 'unresolved', 'r': 'resolved'}[ms[f]])
-elif mark:
 ms.mark(f, "r")
 elif unmark:
 ms.mark(f, "u")
 else:
 wctx = repo[None]
 ui.warn(_("arguments do not match paths that need resolving\n"))
 finally:
 wlock.release()
-# Nudge users into finishing an unfinished operation. We don't print
+# Nudge users into finishing an unfinished operation
-# this with the list/show operation because we want list/show to remain
+if not list(ms.unresolved()):
-# machine readable.
-if not list(ms.unresolved()) and not show:
 ui.status(_('(no more unresolved files)\n'))
 return ret
 @command('revert',
 [('a', 'all', None, _('revert all changes when no arguments given')),
 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
 ('C', 'no-backup', None, _('do not save backup copies of files')),
+('i', 'interactive', None, _('interactively select the changes')),
 ] + walkopts + dryrunopts,
 _('[OPTION]... [-r REV] [NAME]...'))
 def revert(ui, repo, *pats, **opts):
 """restore files to their checkout state
 raise util.Abort(_('uncommitted merge with no revision specified'),
 hint=_('use "hg update" or see "hg help revert"'))
 ctx = scmutil.revsingle(repo, opts.get('rev'))
-if not pats and not opts.get('all'):
+if not pats and not (opts.get('all') or opts.get('interactive')):
 msg = _("no files or directories specified")
 if p2 != nullid:
 hint = _("uncommitted merge, use --all to discard all changes,"
 " or 'hg update -C .' to abort the merge")
 raise util.Abort(msg, hint=hint)
 # this way we can check if something was given in the command-line
 if opts.get('port'):
 opts['port'] = util.getport(opts.get('port'))
-baseui = repo and repo.baseui or ui
+if repo:
+baseui = repo.baseui
+else:
+baseui = ui
 optlist = ("name templates style address port prefix ipv6"
 " accesslog errorlog certificate encoding")
 for o in optlist.split():
 val = opts.get(o, '')
 if val in (None, ''): # should check against default options instead
 - show changes in the working directory relative to a
 changeset::
 hg status --rev 9353
+- show changes in the working directory relative to the
+current directory (see :hg:`help patterns` for more information)::
+hg status re:
 - show all changes including copies in an existing changeset::
 hg status --copies --change 9353
 - get a NUL separated list of added files, suitable for xargs::
 node2 = scmutil.revsingle(repo, change, None).node()
 node1 = repo[node2].p1().node()
 else:
 node1, node2 = scmutil.revpair(repo, revs)
-cwd = (pats and repo.getcwd()) or ''
+if pats:
-end = opts.get('print0') and '\0' or '\n'
+cwd = repo.getcwd()
+else:
+cwd = ''
+if opts.get('print0'):
+end = '\0'
+else:
+end = '\n'
 copy = {}
 states = 'modified added removed deleted unknown ignored clean'.split()
 show = [k for k in states if opts.get(k)]
 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]
+if ui.quiet:
+show = states[:4]
+else:
+show = states[:5]
 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'):
+if (opts.get('all') or opts.get('copies')
+or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
 copy = copies.pathcopies(repo[node1], repo[node2])
 fm = ui.formatter('status', opts)
 fmt = '%s' + end
 showchar = not opts.get('no_status')
 o = outgoing.missing
 if o:
 t.append(_('%d outgoing') % len(o))
 other = dother or sother
 if 'bookmarks' in other.listkeys('namespaces'):
-lmarks = repo.listkeys('bookmarks')
+counts = bookmarks.summary(repo, other)
-rmarks = other.listkeys('bookmarks')
+if counts[0] > 0:
-diff = set(rmarks) - set(lmarks)
+t.append(_('%d incoming bookmarks') % counts[0])
-if len(diff) > 0:
+if counts[1] > 0:
-t.append(_('%d incoming bookmarks') % len(diff))
+t.append(_('%d outgoing bookmarks') % counts[1])
-diff = set(lmarks) - set(rmarks)
-if len(diff) > 0:
-t.append(_('%d outgoing bookmarks') % len(diff))
 if t:
 # i18n: column positioning for "hg summary"
 ui.write(_('remote: %s\n') % (', '.join(t)))
 else:
 raise util.Abort(_("--rev and --remove are incompatible"))
 if opts.get('rev'):
 rev_ = opts['rev']
 message = opts.get('message')
 if opts.get('remove'):
-expectedtype = opts.get('local') and 'local' or 'global'
+if opts.get('local'):
+expectedtype = 'local'
+else:
+expectedtype = 'global'
 for n in names:
 if not repo.tagtype(n):
 raise util.Abort(_("tag '%s' does not exist") % n)
 if repo.tagtype(n) != expectedtype:
 if expectedtype == 'global':
 if rev is not None:
 raise util.Abort(_("you can't specify a revision and a date"))
 rev = cmdutil.finddate(ui, repo, date)
 if check:
-c = repo[None]
+cmdutil.bailifchanged(repo, merge=False)
-if c.dirty(merge=False, branch=False, missing=True):
-raise util.Abort(_("uncommitted changes"))
 if rev is None:
 rev = repo[repo[None].branch()].rev()
 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
 """output version and copyright information"""
 ui.write(_("Mercurial Distributed SCM (version %s)\n")
 % util.version())
 ui.status(_(
 "(see http://mercurial.selenic.com for more information)\n"
-"\nCopyright (C) 2005-2014 Matt Mackall and others\n"
+"\nCopyright (C) 2005-2015 Matt Mackall and others\n"
 "This is free software; see the source for copying conditions. "
 "There is NO\nwarranty; "
 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 ))

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 24803:e89f909edffa stable 3.4-rc