| hg-reviewers |
We previously used the '^' prefix to indicate that a command
should be shown on the short list (shown for just "hg"), but
that's a horrible hack, so I'm removing it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (2 lines) | |||
| M | hgext/absorb.py (5 lines) | |||
| M | hgext/blackbox.py (5 lines) | |||
| M | hgext/fastannotate/commands.py (4 lines) | |||
| M | hgext/githelp.py (4 lines) | |||
| M | hgext/mq.py (29 lines) | |||
| M | hgext/record.py (4 lines) | |||
| M | hgext/sparse.py (11 lines) | |||
| M | hgext/split.py (4 lines) | |||
| M | hgext/uncommit.py (3 lines) | |||
| M | mercurial/cmdutil.py (4 lines) | |||
| M | mercurial/commands.py (75 lines) | |||
| M | mercurial/help.py (10 lines) | |||
| M | mercurial/hgweb/webcommands.py (4 lines) | |||
| M | mercurial/registrar.py (3 lines) | |||
| M | tests/test-completion.t (32 lines) |
| ])) | ])) | ||||
| cmdtable = {} | cmdtable = {} | ||||
| # for "historical portability": | # for "historical portability": | ||||
| # define parsealiases locally, because cmdutil.parsealiases has been | # define parsealiases locally, because cmdutil.parsealiases has been | ||||
| # available since 1.5 (or 6252852b4332) | # available since 1.5 (or 6252852b4332) | ||||
| def parsealiases(cmd): | def parsealiases(cmd): | ||||
| return cmd.lstrip(b"^").split(b"|") | return cmd.split(b"|") | ||||
| if safehasattr(registrar, 'command'): | if safehasattr(registrar, 'command'): | ||||
| command = registrar.command(cmdtable) | command = registrar.command(cmdtable) | ||||
| elif safehasattr(cmdutil, 'command'): | elif safehasattr(cmdutil, 'command'): | ||||
| command = cmdutil.command(cmdtable) | command = cmdutil.command(cmdtable) | ||||
| if b'norepo' not in getargspec(command).args: | if b'norepo' not in getargspec(command).args: | ||||
| # for "historical portability": | # for "historical portability": | ||||
| # wrap original cmdutil.command, because "norepo" option has | # wrap original cmdutil.command, because "norepo" option has | ||||
| state.apply() | state.apply() | ||||
| if state.commit(): | if state.commit(): | ||||
| state.printchunkstats() | state.printchunkstats() | ||||
| elif not ui.quiet: | elif not ui.quiet: | ||||
| ui.write(_('nothing applied\n')) | ui.write(_('nothing applied\n')) | ||||
| return state | return state | ||||
| @command('^absorb', | @command('absorb', | ||||
| [('a', 'apply-changes', None, | [('a', 'apply-changes', None, | ||||
| _('apply changes without prompting for confirmation')), | _('apply changes without prompting for confirmation')), | ||||
| ('p', 'print-changes', None, | ('p', 'print-changes', None, | ||||
| _('always print which changesets are modified by which changes')), | _('always print which changesets are modified by which changes')), | ||||
| ('i', 'interactive', None, | ('i', 'interactive', None, | ||||
| _('interactively select which chunks to apply (EXPERIMENTAL)')), | _('interactively select which chunks to apply (EXPERIMENTAL)')), | ||||
| ('e', 'edit-lines', None, | ('e', 'edit-lines', None, | ||||
| _('edit what lines belong to which changesets before commit ' | _('edit what lines belong to which changesets before commit ' | ||||
| '(EXPERIMENTAL)')), | '(EXPERIMENTAL)')), | ||||
| ] + commands.dryrunopts + commands.templateopts + commands.walkopts, | ] + commands.dryrunopts + commands.templateopts + commands.walkopts, | ||||
| _('hg absorb [OPTION] [FILE]...'), | _('hg absorb [OPTION] [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING) | helpcategory=command.CATEGORY_COMMITTING, | ||||
| helpbasic=True) | |||||
| def absorbcmd(ui, repo, *pats, **opts): | def absorbcmd(ui, repo, *pats, **opts): | ||||
| """incorporate corrections into the stack of draft changesets | """incorporate corrections into the stack of draft changesets | ||||
| absorb analyzes each change in your working directory and attempts to | absorb analyzes each change in your working directory and attempts to | ||||
| amend the changed lines into the changesets in your stack that first | amend the changed lines into the changesets in your stack that first | ||||
| introduced those lines. | introduced those lines. | ||||
| If absorb cannot find an unambiguous changeset to amend for a change, | If absorb cannot find an unambiguous changeset to amend for a change, | ||||
| # Set lastui even if ui.log is not called. This gives blackbox a | # Set lastui even if ui.log is not called. This gives blackbox a | ||||
| # fallback place to log. | # fallback place to log. | ||||
| global lastui | global lastui | ||||
| if lastui is None: | if lastui is None: | ||||
| lastui = ui | lastui = ui | ||||
| repo._wlockfreeprefix.add('blackbox.log') | repo._wlockfreeprefix.add('blackbox.log') | ||||
| @command('^blackbox', | @command('blackbox', | ||||
| [('l', 'limit', 10, _('the number of events to show')), | [('l', 'limit', 10, _('the number of events to show')), | ||||
| ], | ], | ||||
| _('hg blackbox [OPTION]...'), | _('hg blackbox [OPTION]...'), | ||||
| helpcategory=command.CATEGORY_MAINTENANCE) | helpcategory=command.CATEGORY_MAINTENANCE, | ||||
| helpbasic=True) | |||||
| def blackbox(ui, repo, *revs, **opts): | def blackbox(ui, repo, *revs, **opts): | ||||
| '''view the recent repository events | '''view the recent repository events | ||||
| ''' | ''' | ||||
| if not repo.vfs.exists('blackbox.log'): | if not repo.vfs.exists('blackbox.log'): | ||||
| return | return | ||||
| limit = opts.get(r'limit') | limit = opts.get(r'limit') | ||||
| if util.safehasattr(repo, 'prefetchfastannotate') and rev is not None: | if util.safehasattr(repo, 'prefetchfastannotate') and rev is not None: | ||||
| paths = list(_matchpaths(repo, rev, pats, pycompat.byteskwargs(opts))) | paths = list(_matchpaths(repo, rev, pats, pycompat.byteskwargs(opts))) | ||||
| repo.prefetchfastannotate(paths) | repo.prefetchfastannotate(paths) | ||||
| return orig(ui, repo, *pats, **opts) | return orig(ui, repo, *pats, **opts) | ||||
| def registercommand(): | def registercommand(): | ||||
| """register the fastannotate command""" | """register the fastannotate command""" | ||||
| name = '^fastannotate|fastblame|fa' | name = 'fastannotate|fastblame|fa' | ||||
| command(name, **fastannotatecommandargs)(fastannotate) | command(name, helpbasic=True, **fastannotatecommandargs)(fastannotate) | ||||
| def wrapdefault(): | def wrapdefault(): | ||||
| """wrap the default annotate command, to be aware of the protocol""" | """wrap the default annotate command, to be aware of the protocol""" | ||||
| extensions.wrapcommand(commands.table, 'annotate', _annotatewrapper) | extensions.wrapcommand(commands.table, 'annotate', _annotatewrapper) | ||||
| @command('debugbuildannotatecache', | @command('debugbuildannotatecache', | ||||
| [('r', 'rev', '', _('build up to the specific revision'), _('REV')) | [('r', 'rev', '', _('build up to the specific revision'), _('REV')) | ||||
| ] + commands.walkopts, | ] + commands.walkopts, | ||||
| if s.startswith("origin/"): | if s.startswith("origin/"): | ||||
| return s[7:] | return s[7:] | ||||
| if 'HEAD' in s: | if 'HEAD' in s: | ||||
| s = s.replace('HEAD', '.') | s = s.replace('HEAD', '.') | ||||
| # HEAD~ in git is .~1 in mercurial | # HEAD~ in git is .~1 in mercurial | ||||
| s = re.sub('~$', '~1', s) | s = re.sub('~$', '~1', s) | ||||
| return s | return s | ||||
| @command('^githelp|git', [ | @command('githelp|git', [ | ||||
| ], _('hg githelp'), | ], _('hg githelp'), | ||||
| helpcategory=command.CATEGORY_HELP) | helpcategory=command.CATEGORY_HELP, helpbasic=True) | ||||
| def githelp(ui, repo, *args, **kwargs): | def githelp(ui, repo, *args, **kwargs): | ||||
| '''suggests the Mercurial equivalent of the given git command | '''suggests the Mercurial equivalent of the given git command | ||||
| Usage: hg githelp -- <git command> | Usage: hg githelp -- <git command> | ||||
| ''' | ''' | ||||
| if len(args) == 0 or (len(args) == 1 and args[0] =='git'): | if len(args) == 0 or (len(args) == 1 and args[0] =='git'): | ||||
| raise error.Abort(_('missing git command - ' | raise error.Abort(_('missing git command - ' | ||||
| fp.write('guards\n') | fp.write('guards\n') | ||||
| fp.close() | fp.close() | ||||
| if not os.path.exists(r.wjoin('series')): | if not os.path.exists(r.wjoin('series')): | ||||
| r.wvfs('series', 'w').close() | r.wvfs('series', 'w').close() | ||||
| r[None].add(['.hgignore', 'series']) | r[None].add(['.hgignore', 'series']) | ||||
| commands.add(ui, r) | commands.add(ui, r) | ||||
| return 0 | return 0 | ||||
| @command("^qinit", | @command("qinit", | ||||
| [('c', 'create-repo', None, _('create queue repository'))], | [('c', 'create-repo', None, _('create queue repository'))], | ||||
| _('hg qinit [-c]'), | _('hg qinit [-c]'), | ||||
| helpcategory=command.CATEGORY_REPO_CREATION) | helpcategory=command.CATEGORY_REPO_CREATION, | ||||
| helpbasic=True) | |||||
| def init(ui, repo, **opts): | def init(ui, repo, **opts): | ||||
| """init a new queue repository (DEPRECATED) | """init a new queue repository (DEPRECATED) | ||||
| The queue repository is unversioned by default. If | The queue repository is unversioned by default. If | ||||
| -c/--create-repo is specified, qinit will create a separate nested | -c/--create-repo is specified, qinit will create a separate nested | ||||
| repository for patches (qinit -c may also be run later to convert | repository for patches (qinit -c may also be run later to convert | ||||
| an unversioned patch repository into a versioned one). You can use | an unversioned patch repository into a versioned one). You can use | ||||
| qcommit to commit changes to this queue repository. | qcommit to commit changes to this queue repository. | ||||
| ui.note(_('stripping applied patches from destination ' | ui.note(_('stripping applied patches from destination ' | ||||
| 'repository\n')) | 'repository\n')) | ||||
| strip(ui, repo, [qbase], update=False, backup=None) | strip(ui, repo, [qbase], update=False, backup=None) | ||||
| if not opts.get('noupdate'): | if not opts.get('noupdate'): | ||||
| ui.note(_('updating destination repository\n')) | ui.note(_('updating destination repository\n')) | ||||
| hg.update(repo, repo.changelog.tip()) | hg.update(repo, repo.changelog.tip()) | ||||
| @command("qcommit|qci", | @command("qcommit|qci", | ||||
| commands.table["^commit|ci"][1], | commands.table["commit|ci"][1], | ||||
| _('hg qcommit [OPTION]... [FILE]...'), | _('hg qcommit [OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING, | helpcategory=command.CATEGORY_COMMITTING, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def commit(ui, repo, *pats, **opts): | def commit(ui, repo, *pats, **opts): | ||||
| """commit changes in the queue repository (DEPRECATED) | """commit changes in the queue repository (DEPRECATED) | ||||
| This command is deprecated; use :hg:`commit --mq` instead.""" | This command is deprecated; use :hg:`commit --mq` instead.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| summary=opts.get(r'summary')) | summary=opts.get(r'summary')) | ||||
| def setupheaderopts(ui, opts): | def setupheaderopts(ui, opts): | ||||
| if not opts.get('user') and opts.get('currentuser'): | if not opts.get('user') and opts.get('currentuser'): | ||||
| opts['user'] = ui.username() | opts['user'] = ui.username() | ||||
| if not opts.get('date') and opts.get('currentdate'): | if not opts.get('date') and opts.get('currentdate'): | ||||
| opts['date'] = "%d %d" % dateutil.makedate() | opts['date'] = "%d %d" % dateutil.makedate() | ||||
| @command("^qnew", | @command("qnew", | ||||
| [('e', 'edit', None, _('invoke editor on commit messages')), | [('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), | ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), | ||||
| ('g', 'git', None, _('use git extended diff format')), | ('g', 'git', None, _('use git extended diff format')), | ||||
| ('U', 'currentuser', None, _('add "From: <current user>" to patch')), | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), | ||||
| ('u', 'user', '', | ('u', 'user', '', | ||||
| _('add "From: <USER>" to patch'), _('USER')), | _('add "From: <USER>" to patch'), _('USER')), | ||||
| ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | ||||
| ('d', 'date', '', | ('d', 'date', '', | ||||
| _('add "Date: <DATE>" to patch'), _('DATE')) | _('add "Date: <DATE>" to patch'), _('DATE')) | ||||
| ] + cmdutil.walkopts + cmdutil.commitopts, | ] + cmdutil.walkopts + cmdutil.commitopts, | ||||
| _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'), | _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING, | helpcategory=command.CATEGORY_COMMITTING, helpbasic=True, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def new(ui, repo, patch, *args, **opts): | def new(ui, repo, patch, *args, **opts): | ||||
| """create a new patch | """create a new patch | ||||
| qnew creates a new patch on top of the currently-applied patch (if | qnew creates a new patch on top of the currently-applied patch (if | ||||
| any). The patch will be initialized with any outstanding changes | any). The patch will be initialized with any outstanding changes | ||||
| in the working directory. You may also use -I/--include, | in the working directory. You may also use -I/--include, | ||||
| -X/--exclude, and/or a list of files after the patch name to add | -X/--exclude, and/or a list of files after the patch name to add | ||||
| msg = cmdutil.logmessage(ui, opts) | msg = cmdutil.logmessage(ui, opts) | ||||
| q = repo.mq | q = repo.mq | ||||
| opts['msg'] = msg | opts['msg'] = msg | ||||
| setupheaderopts(ui, opts) | setupheaderopts(ui, opts) | ||||
| q.new(repo, patch, *args, **pycompat.strkwargs(opts)) | q.new(repo, patch, *args, **pycompat.strkwargs(opts)) | ||||
| q.savedirty() | q.savedirty() | ||||
| return 0 | return 0 | ||||
| @command("^qrefresh", | @command("qrefresh", | ||||
| [('e', 'edit', None, _('invoke editor on commit messages')), | [('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('g', 'git', None, _('use git extended diff format')), | ('g', 'git', None, _('use git extended diff format')), | ||||
| ('s', 'short', None, | ('s', 'short', None, | ||||
| _('refresh only files already in the patch and specified files')), | _('refresh only files already in the patch and specified files')), | ||||
| ('U', 'currentuser', None, | ('U', 'currentuser', None, | ||||
| _('add/update author field in patch with current user')), | _('add/update author field in patch with current user')), | ||||
| ('u', 'user', '', | ('u', 'user', '', | ||||
| _('add/update author field in patch with given user'), _('USER')), | _('add/update author field in patch with given user'), _('USER')), | ||||
| ('D', 'currentdate', None, | ('D', 'currentdate', None, | ||||
| _('add/update date field in patch with current date')), | _('add/update date field in patch with current date')), | ||||
| ('d', 'date', '', | ('d', 'date', '', | ||||
| _('add/update date field in patch with given date'), _('DATE')) | _('add/update date field in patch with given date'), _('DATE')) | ||||
| ] + cmdutil.walkopts + cmdutil.commitopts, | ] + cmdutil.walkopts + cmdutil.commitopts, | ||||
| _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'), | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING, | helpcategory=command.CATEGORY_COMMITTING, helpbasic=True, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def refresh(ui, repo, *pats, **opts): | def refresh(ui, repo, *pats, **opts): | ||||
| """update the current patch | """update the current patch | ||||
| If any file patterns are provided, the refreshed patch will | If any file patterns are provided, the refreshed patch will | ||||
| contain only the modifications that match those patterns; the | contain only the modifications that match those patterns; the | ||||
| remaining modifications will remain in the working directory. | remaining modifications will remain in the working directory. | ||||
| q = repo.mq | q = repo.mq | ||||
| message = cmdutil.logmessage(ui, opts) | message = cmdutil.logmessage(ui, opts) | ||||
| setupheaderopts(ui, opts) | setupheaderopts(ui, opts) | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| ret = q.refresh(repo, pats, msg=message, **pycompat.strkwargs(opts)) | ret = q.refresh(repo, pats, msg=message, **pycompat.strkwargs(opts)) | ||||
| q.savedirty() | q.savedirty() | ||||
| return ret | return ret | ||||
| @command("^qdiff", | @command("qdiff", | ||||
| cmdutil.diffopts + cmdutil.diffopts2 + cmdutil.walkopts, | cmdutil.diffopts + cmdutil.diffopts2 + cmdutil.walkopts, | ||||
| _('hg qdiff [OPTION]... [FILE]...'), | _('hg qdiff [OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_FILE_CONTENTS, | helpcategory=command.CATEGORY_FILE_CONTENTS, helpbasic=True, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def diff(ui, repo, *pats, **opts): | def diff(ui, repo, *pats, **opts): | ||||
| """diff of the current patch and subsequent modifications | """diff of the current patch and subsequent modifications | ||||
| Shows a diff which includes the current patch as well as any | Shows a diff which includes the current patch as well as any | ||||
| changes which have been made in the working directory since the | changes which have been made in the working directory since the | ||||
| last refresh (thus showing what the current patch would become | last refresh (thus showing what the current patch would become | ||||
| after a qrefresh). | after a qrefresh). | ||||
| def savename(path): | def savename(path): | ||||
| (last, index) = lastsavename(path) | (last, index) = lastsavename(path) | ||||
| if last is None: | if last is None: | ||||
| index = 0 | index = 0 | ||||
| newpath = path + ".%d" % (index + 1) | newpath = path + ".%d" % (index + 1) | ||||
| return newpath | return newpath | ||||
| @command("^qpush", | @command("qpush", | ||||
| [('', 'keep-changes', None, | [('', 'keep-changes', None, | ||||
| _('tolerate non-conflicting local changes')), | _('tolerate non-conflicting local changes')), | ||||
| ('f', 'force', None, _('apply on top of local changes')), | ('f', 'force', None, _('apply on top of local changes')), | ||||
| ('e', 'exact', None, | ('e', 'exact', None, | ||||
| _('apply the target patch to its recorded parent')), | _('apply the target patch to its recorded parent')), | ||||
| ('l', 'list', None, _('list patch name in commit text')), | ('l', 'list', None, _('list patch name in commit text')), | ||||
| ('a', 'all', None, _('apply all patches')), | ('a', 'all', None, _('apply all patches')), | ||||
| ('m', 'merge', None, _('merge from another queue (DEPRECATED)')), | ('m', 'merge', None, _('merge from another queue (DEPRECATED)')), | ||||
| ('n', 'name', '', | ('n', 'name', '', | ||||
| _('merge queue name (DEPRECATED)'), _('NAME')), | _('merge queue name (DEPRECATED)'), _('NAME')), | ||||
| ('', 'move', None, | ('', 'move', None, | ||||
| _('reorder patch series and apply only the patch')), | _('reorder patch series and apply only the patch')), | ||||
| ('', 'no-backup', None, _('do not save backup copies of files'))], | ('', 'no-backup', None, _('do not save backup copies of files'))], | ||||
| _('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]'), | _('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]'), | ||||
| helpcategory=command.CATEGORY_CHANGE_ORGANIZATION) | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, | ||||
| helpbasic=True) | |||||
| def push(ui, repo, patch=None, **opts): | def push(ui, repo, patch=None, **opts): | ||||
| """push the next patch onto the stack | """push the next patch onto the stack | ||||
| By default, abort if the working directory contains uncommitted | By default, abort if the working directory contains uncommitted | ||||
| changes. With --keep-changes, abort only if the uncommitted files | changes. With --keep-changes, abort only if the uncommitted files | ||||
| overlap with patched files. With -f/--force, backup and patch over | overlap with patched files. With -f/--force, backup and patch over | ||||
| uncommitted changes. | uncommitted changes. | ||||
| mergeq = queue(ui, repo.baseui, repo.path, newpath) | mergeq = queue(ui, repo.baseui, repo.path, newpath) | ||||
| ui.warn(_("merging with queue at: %s\n") % mergeq.path) | ui.warn(_("merging with queue at: %s\n") % mergeq.path) | ||||
| ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'), | ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'), | ||||
| mergeq=mergeq, all=opts.get('all'), move=opts.get('move'), | mergeq=mergeq, all=opts.get('all'), move=opts.get('move'), | ||||
| exact=opts.get('exact'), nobackup=opts.get('no_backup'), | exact=opts.get('exact'), nobackup=opts.get('no_backup'), | ||||
| keepchanges=opts.get('keep_changes')) | keepchanges=opts.get('keep_changes')) | ||||
| return ret | return ret | ||||
| @command("^qpop", | @command("qpop", | ||||
| [('a', 'all', None, _('pop all patches')), | [('a', 'all', None, _('pop all patches')), | ||||
| ('n', 'name', '', | ('n', 'name', '', | ||||
| _('queue name to pop (DEPRECATED)'), _('NAME')), | _('queue name to pop (DEPRECATED)'), _('NAME')), | ||||
| ('', 'keep-changes', None, | ('', 'keep-changes', None, | ||||
| _('tolerate non-conflicting local changes')), | _('tolerate non-conflicting local changes')), | ||||
| ('f', 'force', None, _('forget any local changes to patched files')), | ('f', 'force', None, _('forget any local changes to patched files')), | ||||
| ('', 'no-backup', None, _('do not save backup copies of files'))], | ('', 'no-backup', None, _('do not save backup copies of files'))], | ||||
| _('hg qpop [-a] [-f] [PATCH | INDEX]'), | _('hg qpop [-a] [-f] [PATCH | INDEX]'), | ||||
| helpcategory=command.CATEGORY_CHANGE_ORGANIZATION) | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, | ||||
| helpbasic=True) | |||||
| def pop(ui, repo, patch=None, **opts): | def pop(ui, repo, patch=None, **opts): | ||||
| """pop the current patch off the stack | """pop the current patch off the stack | ||||
| Without argument, pops off the top of the patch stack. If given a | Without argument, pops off the top of the patch stack. If given a | ||||
| patch name, keeps popping off patches until the named patch is at | patch name, keeps popping off patches until the named patch is at | ||||
| the top of the stack. | the top of the stack. | ||||
| By default, abort if the working directory contains uncommitted | By default, abort if the working directory contains uncommitted | ||||
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| testedwith = 'ships-with-hg-core' | testedwith = 'ships-with-hg-core' | ||||
| @command("record", | @command("record", | ||||
| # same options as commit + white space diff options | # same options as commit + white space diff options | ||||
| [c for c in commands.table['^commit|ci'][1][:] | [c for c in commands.table['commit|ci'][1][:] | ||||
| if c[1] != "interactive"] + cmdutil.diffwsopts, | if c[1] != "interactive"] + cmdutil.diffwsopts, | ||||
| _('hg record [OPTION]... [FILE]...'), | _('hg record [OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING) | helpcategory=command.CATEGORY_COMMITTING) | ||||
| def record(ui, repo, *pats, **opts): | def record(ui, repo, *pats, **opts): | ||||
| '''interactively select changes to commit | '''interactively select changes to commit | ||||
| If a list of files is omitted, all changes reported by :hg:`status` | If a list of files is omitted, all changes reported by :hg:`status` | ||||
| will be candidates for recording. | will be candidates for recording. | ||||
| mq = extensions.find('mq') | mq = extensions.find('mq') | ||||
| except KeyError: | except KeyError: | ||||
| return | return | ||||
| cmdtable["qrecord"] = \ | cmdtable["qrecord"] = \ | ||||
| (qrecord, | (qrecord, | ||||
| # same options as qnew, but copy them so we don't get | # same options as qnew, but copy them so we don't get | ||||
| # -i/--interactive for qrecord and add white space diff options | # -i/--interactive for qrecord and add white space diff options | ||||
| mq.cmdtable['^qnew'][1][:] + cmdutil.diffwsopts, | mq.cmdtable['qnew'][1][:] + cmdutil.diffwsopts, | ||||
| _('hg qrecord [OPTION]... PATCH [FILE]...')) | _('hg qrecord [OPTION]... PATCH [FILE]...')) | ||||
| _wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch")) | _wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch")) | ||||
| _wrapcmd('qrefresh', mq.cmdtable, qrefresh, | _wrapcmd('qrefresh', mq.cmdtable, qrefresh, | ||||
| _("interactively select changes to refresh")) | _("interactively select changes to refresh")) | ||||
| def _wrapcmd(cmd, table, wrapfn, msg): | def _wrapcmd(cmd, table, wrapfn, msg): | ||||
| entry = extensions.wrapcommand(table, cmd, wrapfn) | entry = extensions.wrapcommand(table, cmd, wrapfn) | ||||
| entry[1].append(('i', 'interactive', None, msg)) | entry[1].append(('i', 'interactive', None, msg)) | ||||
| break | break | ||||
| cls = cls.__bases__[0] | cls = cls.__bases__[0] | ||||
| if cls is object: | if cls is object: | ||||
| raise AttributeError(_("type '%s' has no property '%s'") % (origcls, | raise AttributeError(_("type '%s' has no property '%s'") % (origcls, | ||||
| propname)) | propname)) | ||||
| def _setuplog(ui): | def _setuplog(ui): | ||||
| entry = commands.table['^log|history'] | entry = commands.table['log|history'] | ||||
| entry[1].append(('', 'sparse', None, | entry[1].append(('', 'sparse', None, | ||||
| "limit to changesets affecting the sparse checkout")) | "limit to changesets affecting the sparse checkout")) | ||||
| def _initialrevs(orig, repo, opts): | def _initialrevs(orig, repo, opts): | ||||
| revs = orig(repo, opts) | revs = orig(repo, opts) | ||||
| if opts.get('sparse'): | if opts.get('sparse'): | ||||
| sparsematch = sparse.matcher(repo) | sparsematch = sparse.matcher(repo) | ||||
| def ctxmatch(rev): | def ctxmatch(rev): | ||||
| sparse.updateconfig(self.unfiltered(), pat, {}, include=include, | sparse.updateconfig(self.unfiltered(), pat, {}, include=include, | ||||
| exclude=exclude, enableprofile=enableprofile, | exclude=exclude, enableprofile=enableprofile, | ||||
| usereporootpaths=True) | usereporootpaths=True) | ||||
| return orig(self, node, overwrite, *args, **kwargs) | return orig(self, node, overwrite, *args, **kwargs) | ||||
| extensions.wrapfunction(hg, 'updaterepo', clonesparse) | extensions.wrapfunction(hg, 'updaterepo', clonesparse) | ||||
| return orig(ui, repo, *args, **opts) | return orig(ui, repo, *args, **opts) | ||||
| def _setupclone(ui): | def _setupclone(ui): | ||||
| entry = commands.table['^clone'] | entry = commands.table['clone'] | ||||
| entry[1].append(('', 'enable-profile', [], | entry[1].append(('', 'enable-profile', [], | ||||
| 'enable a sparse profile')) | 'enable a sparse profile')) | ||||
| entry[1].append(('', 'include', [], | entry[1].append(('', 'include', [], | ||||
| 'include sparse pattern')) | 'include sparse pattern')) | ||||
| entry[1].append(('', 'exclude', [], | entry[1].append(('', 'exclude', [], | ||||
| 'exclude sparse pattern')) | 'exclude sparse pattern')) | ||||
| extensions.wrapcommand(commands.table, 'clone', _clonesparsecmd) | extensions.wrapcommand(commands.table, 'clone', _clonesparsecmd) | ||||
| def _setupadd(ui): | def _setupadd(ui): | ||||
| entry = commands.table['^add'] | entry = commands.table['add'] | ||||
| entry[1].append(('s', 'sparse', None, | entry[1].append(('s', 'sparse', None, | ||||
| 'also include directories of added files in sparse config')) | 'also include directories of added files in sparse config')) | ||||
| def _add(orig, ui, repo, *pats, **opts): | def _add(orig, ui, repo, *pats, **opts): | ||||
| if opts.get(r'sparse'): | if opts.get(r'sparse'): | ||||
| dirs = set() | dirs = set() | ||||
| for pat in pats: | for pat in pats: | ||||
| dirname, basename = util.split(pat) | dirname, basename = util.split(pat) | ||||
| if (f is not None and not sparsematch(f) and | if (f is not None and not sparsematch(f) and | ||||
| f not in self): | f not in self): | ||||
| raise error.Abort(_("cannot add '%s' - it is outside " | raise error.Abort(_("cannot add '%s' - it is outside " | ||||
| "the sparse checkout") % f, | "the sparse checkout") % f, | ||||
| hint=hint) | hint=hint) | ||||
| return orig(self, *args) | return orig(self, *args) | ||||
| extensions.wrapfunction(dirstate.dirstate, func, _wrapper) | extensions.wrapfunction(dirstate.dirstate, func, _wrapper) | ||||
| @command('^debugsparse', [ | @command('debugsparse', [ | ||||
| ('I', 'include', False, _('include files in the sparse checkout')), | ('I', 'include', False, _('include files in the sparse checkout')), | ||||
| ('X', 'exclude', False, _('exclude files in the sparse checkout')), | ('X', 'exclude', False, _('exclude files in the sparse checkout')), | ||||
| ('d', 'delete', False, _('delete an include/exclude rule')), | ('d', 'delete', False, _('delete an include/exclude rule')), | ||||
| ('f', 'force', False, _('allow changing rules even with pending changes')), | ('f', 'force', False, _('allow changing rules even with pending changes')), | ||||
| ('', 'enable-profile', False, _('enables the specified profile')), | ('', 'enable-profile', False, _('enables the specified profile')), | ||||
| ('', 'disable-profile', False, _('disables the specified profile')), | ('', 'disable-profile', False, _('disables the specified profile')), | ||||
| ('', 'import-rules', False, _('imports rules from a file')), | ('', 'import-rules', False, _('imports rules from a file')), | ||||
| ('', 'clear-rules', False, _('clears local include/exclude rules')), | ('', 'clear-rules', False, _('clears local include/exclude rules')), | ||||
| ('', 'refresh', False, _('updates the working after sparseness changes')), | ('', 'refresh', False, _('updates the working after sparseness changes')), | ||||
| ('', 'reset', False, _('makes the repo full again')), | ('', 'reset', False, _('makes the repo full again')), | ||||
| ] + commands.templateopts, | ] + commands.templateopts, | ||||
| _('[--OPTION] PATTERN...')) | _('[--OPTION] PATTERN...'), | ||||
| helpbasic=True) | |||||
| def debugsparse(ui, repo, *pats, **opts): | def debugsparse(ui, repo, *pats, **opts): | ||||
| """make the current checkout sparse, or edit the existing checkout | """make the current checkout sparse, or edit the existing checkout | ||||
| The sparse command is used to make the current checkout sparse. | The sparse command is used to make the current checkout sparse. | ||||
| This means files that don't meet the sparse condition will not be | This means files that don't meet the sparse condition will not be | ||||
| written to disk, or show up in any working copy operations. It does | written to disk, or show up in any working copy operations. It does | ||||
| not affect files in history in any way. | not affect files in history in any way. | ||||
| command = registrar.command(cmdtable) | command = registrar.command(cmdtable) | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| testedwith = 'ships-with-hg-core' | testedwith = 'ships-with-hg-core' | ||||
| @command('^split', | @command('split', | ||||
| [('r', 'rev', '', _("revision to split"), _('REV')), | [('r', 'rev', '', _("revision to split"), _('REV')), | ||||
| ('', 'rebase', True, _('rebase descendants after split')), | ('', 'rebase', True, _('rebase descendants after split')), | ||||
| ] + cmdutil.commitopts2, | ] + cmdutil.commitopts2, | ||||
| _('hg split [--no-rebase] [[-r] REV]'), | _('hg split [--no-rebase] [[-r] REV]'), | ||||
| helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True) | ||||
| def split(ui, repo, *revs, **opts): | def split(ui, repo, *revs, **opts): | ||||
| """split a changeset into smaller ones | """split a changeset into smaller ones | ||||
| Repeatedly prompt changes and commit message for new changesets until there | Repeatedly prompt changes and commit message for new changesets until there | ||||
| is nothing left in the original changeset. | is nothing left in the original changeset. | ||||
| If --rev was not given, split the working directory parent. | If --rev was not given, split the working directory parent. | ||||
| s = old.p1().status(old, match=match) | s = old.p1().status(old, match=match) | ||||
| _fixdirstate(repo, old, repo[newid], s) | _fixdirstate(repo, old, repo[newid], s) | ||||
| def predecessormarkers(ctx): | def predecessormarkers(ctx): | ||||
| """yields the obsolete markers marking the given changeset as a successor""" | """yields the obsolete markers marking the given changeset as a successor""" | ||||
| for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): | for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): | ||||
| yield obsutil.marker(ctx.repo(), data) | yield obsutil.marker(ctx.repo(), data) | ||||
| @command('^unamend', [], helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | @command('unamend', [], helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, | ||||
| helpbasic=True) | |||||
| def unamend(ui, repo, **opts): | def unamend(ui, repo, **opts): | ||||
| """undo the most recent amend operation on a current changeset | """undo the most recent amend operation on a current changeset | ||||
| This command will roll back to the previous version of a changeset, | This command will roll back to the previous version of a changeset, | ||||
| leaving working directory in state in which it was before running | leaving working directory in state in which it was before running | ||||
| `hg amend` (e.g. files modified as part of an amend will be | `hg amend` (e.g. files modified as part of an amend will be | ||||
| marked as modified `hg status`) | marked as modified `hg status`) | ||||
| """ | """ | ||||
| newlyaddedandmodifiedfiles = set() | newlyaddedandmodifiedfiles = set() | ||||
| for chunk in chunks: | for chunk in chunks: | ||||
| if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \ | if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \ | ||||
| originalchunks: | originalchunks: | ||||
| newlyaddedandmodifiedfiles.add(chunk.header.filename()) | newlyaddedandmodifiedfiles.add(chunk.header.filename()) | ||||
| return newlyaddedandmodifiedfiles | return newlyaddedandmodifiedfiles | ||||
| def parsealiases(cmd): | def parsealiases(cmd): | ||||
| return cmd.lstrip("^").split("|") | return cmd.split("|") | ||||
| def setupwrapcolorwrite(ui): | def setupwrapcolorwrite(ui): | ||||
| # wrap ui.write so diff output can be labeled/colorized | # wrap ui.write so diff output can be labeled/colorized | ||||
| def wrapwrite(orig, *args, **kw): | def wrapwrite(orig, *args, **kw): | ||||
| label = kw.pop(r'label', '') | label = kw.pop(r'label', '') | ||||
| for chunk, l in patch.difflabel(lambda: args): | for chunk, l in patch.difflabel(lambda: args): | ||||
| orig(chunk, label=label + l) | orig(chunk, label=label + l) | ||||
| Return cmd -> (aliases, command table entry) | Return cmd -> (aliases, command table entry) | ||||
| for each matching command. | for each matching command. | ||||
| Return debug commands (or their aliases) only if no normal command matches. | Return debug commands (or their aliases) only if no normal command matches. | ||||
| """ | """ | ||||
| choice = {} | choice = {} | ||||
| debugchoice = {} | debugchoice = {} | ||||
| if cmd in table: | if cmd in table: | ||||
| # short-circuit exact matches, "log" alias beats "^log|history" | # short-circuit exact matches, "log" alias beats "log|history" | ||||
| keys = [cmd] | keys = [cmd] | ||||
| else: | else: | ||||
| keys = table.keys() | keys = table.keys() | ||||
| allcmds = [] | allcmds = [] | ||||
| for e in keys: | for e in keys: | ||||
| aliases = parsealiases(e) | aliases = parsealiases(e) | ||||
| allcmds.extend(aliases) | allcmds.extend(aliases) | ||||
| diffopts2 = cmdutil.diffopts2 | diffopts2 = cmdutil.diffopts2 | ||||
| mergetoolopts = cmdutil.mergetoolopts | mergetoolopts = cmdutil.mergetoolopts | ||||
| similarityopts = cmdutil.similarityopts | similarityopts = cmdutil.similarityopts | ||||
| subrepoopts = cmdutil.subrepoopts | subrepoopts = cmdutil.subrepoopts | ||||
| debugrevlogopts = cmdutil.debugrevlogopts | debugrevlogopts = cmdutil.debugrevlogopts | ||||
| # Commands start here, listed alphabetically | # Commands start here, listed alphabetically | ||||
| @command('^add', | @command('add', | ||||
| walkopts + subrepoopts + dryrunopts, | walkopts + subrepoopts + dryrunopts, | ||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_WORKING_DIRECTORY, | helpcategory=command.CATEGORY_WORKING_DIRECTORY, | ||||
| inferrepo=True) | helpbasic=True, inferrepo=True) | ||||
| def add(ui, repo, *pats, **opts): | def add(ui, repo, *pats, **opts): | ||||
| """add the specified files on the next commit | """add the specified files on the next commit | ||||
| Schedule files to be version controlled and added to the | Schedule files to be version controlled and added to the | ||||
| repository. | repository. | ||||
| The files will be added to the repository at the next commit. To | The files will be added to the repository at the next commit. To | ||||
| undo an add before that, see :hg:`forget`. | undo an add before that, see :hg:`forget`. | ||||
| Returns 0 if all files are successfully added. | Returns 0 if all files are successfully added. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if not opts.get('similarity'): | if not opts.get('similarity'): | ||||
| opts['similarity'] = '100' | opts['similarity'] = '100' | ||||
| matcher = scmutil.match(repo[None], pats, opts) | matcher = scmutil.match(repo[None], pats, opts) | ||||
| return scmutil.addremove(repo, matcher, "", opts) | return scmutil.addremove(repo, matcher, "", opts) | ||||
| @command('^annotate|blame', | @command('annotate|blame', | ||||
| [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | ||||
| ('', 'follow', None, | ('', 'follow', None, | ||||
| _('follow copies/renames and list the filename (DEPRECATED)')), | _('follow copies/renames and list the filename (DEPRECATED)')), | ||||
| ('', 'no-follow', None, _("don't follow copies and renames")), | ('', 'no-follow', None, _("don't follow copies and renames")), | ||||
| ('a', 'text', None, _('treat all files as text')), | ('a', 'text', None, _('treat all files as text')), | ||||
| ('u', 'user', None, _('list the author (long with -v)')), | ('u', 'user', None, _('list the author (long with -v)')), | ||||
| ('f', 'file', None, _('list the filename')), | ('f', 'file', None, _('list the filename')), | ||||
| ('d', 'date', None, _('list the date (short with -q)')), | ('d', 'date', None, _('list the date (short with -q)')), | ||||
| ('n', 'number', None, _('list the revision number (default)')), | ('n', 'number', None, _('list the revision number (default)')), | ||||
| ('c', 'changeset', None, _('list the changeset')), | ('c', 'changeset', None, _('list the changeset')), | ||||
| ('l', 'line-number', None, _('show line number at the first appearance')), | ('l', 'line-number', None, _('show line number at the first appearance')), | ||||
| ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), | ||||
| ] + diffwsopts + walkopts + formatteropts, | ] + diffwsopts + walkopts + formatteropts, | ||||
| _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), | ||||
| helpcategory=command.CATEGORY_FILE_CONTENTS, | helpcategory=command.CATEGORY_FILE_CONTENTS, | ||||
| inferrepo=True) | helpbasic=True, inferrepo=True) | ||||
| def annotate(ui, repo, *pats, **opts): | def annotate(ui, repo, *pats, **opts): | ||||
| """show changeset information by line for each file | """show changeset information by line for each file | ||||
| List changes in files, showing the revision id responsible for | List changes in files, showing the revision id responsible for | ||||
| each line. | each line. | ||||
| This command is useful for discovering when a change was made and | This command is useful for discovering when a change was made and | ||||
| by whom. | by whom. | ||||
| fm = formatter.nullformatter(ui, 'cat', opts) | fm = formatter.nullformatter(ui, 'cat', opts) | ||||
| else: | else: | ||||
| ui.pager('cat') | ui.pager('cat') | ||||
| fm = ui.formatter('cat', opts) | fm = ui.formatter('cat', opts) | ||||
| with fm: | with fm: | ||||
| return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', | ||||
| **pycompat.strkwargs(opts)) | **pycompat.strkwargs(opts)) | ||||
| @command('^clone', | @command('clone', | ||||
| [('U', 'noupdate', None, _('the clone will include an empty working ' | [('U', 'noupdate', None, _('the clone will include an empty working ' | ||||
| 'directory (only a repository)')), | 'directory (only a repository)')), | ||||
| ('u', 'updaterev', '', _('revision, tag, or branch to check out'), | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), | ||||
| _('REV')), | _('REV')), | ||||
| ('r', 'rev', [], _('do not clone everything, but include this changeset' | ('r', 'rev', [], _('do not clone everything, but include this changeset' | ||||
| ' and its ancestors'), _('REV')), | ' and its ancestors'), _('REV')), | ||||
| ('b', 'branch', [], _('do not clone everything, but include this branch\'s' | ('b', 'branch', [], _('do not clone everything, but include this branch\'s' | ||||
| ' changesets and their ancestors'), _('BRANCH')), | ' changesets and their ancestors'), _('BRANCH')), | ||||
| ('', 'pull', None, _('use pull protocol to copy metadata')), | ('', 'pull', None, _('use pull protocol to copy metadata')), | ||||
| ('', 'uncompressed', None, | ('', 'uncompressed', None, | ||||
| _('an alias to --stream (DEPRECATED)')), | _('an alias to --stream (DEPRECATED)')), | ||||
| ('', 'stream', None, | ('', 'stream', None, | ||||
| _('clone with minimal data processing')), | _('clone with minimal data processing')), | ||||
| ] + remoteopts, | ] + remoteopts, | ||||
| _('[OPTION]... SOURCE [DEST]'), | _('[OPTION]... SOURCE [DEST]'), | ||||
| helpcategory=command.CATEGORY_REPO_CREATION, | helpcategory=command.CATEGORY_REPO_CREATION, | ||||
| norepo=True) | helpbasic=True, norepo=True) | ||||
| def clone(ui, source, dest=None, **opts): | def clone(ui, source, dest=None, **opts): | ||||
| """make a copy of an existing repository | """make a copy of an existing repository | ||||
| Create a copy of an existing repository in a new directory. | Create a copy of an existing repository in a new directory. | ||||
| If no destination directory name is specified, it defaults to the | If no destination directory name is specified, it defaults to the | ||||
| basename of the source. | basename of the source. | ||||
| update=opts.get('updaterev') or not opts.get('noupdate'), | update=opts.get('updaterev') or not opts.get('noupdate'), | ||||
| branch=opts.get('branch'), | branch=opts.get('branch'), | ||||
| shareopts=opts.get('shareopts'), | shareopts=opts.get('shareopts'), | ||||
| storeincludepats=includepats, | storeincludepats=includepats, | ||||
| storeexcludepats=excludepats) | storeexcludepats=excludepats) | ||||
| return r is None | return r is None | ||||
| @command('^commit|ci', | @command('commit|ci', | ||||
| [('A', 'addremove', None, | [('A', 'addremove', None, | ||||
| _('mark new/missing files as added/removed before committing')), | _('mark new/missing files as added/removed before committing')), | ||||
| ('', 'close-branch', None, | ('', 'close-branch', None, | ||||
| _('mark a branch head as closed')), | _('mark a branch head as closed')), | ||||
| ('', 'amend', None, _('amend the parent of the working directory')), | ('', 'amend', None, _('amend the parent of the working directory')), | ||||
| ('s', 'secret', None, _('use the secret phase for committing')), | ('s', 'secret', None, _('use the secret phase for committing')), | ||||
| ('e', 'edit', None, _('invoke editor on commit messages')), | ('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('i', 'interactive', None, _('use interactive mode')), | ('i', 'interactive', None, _('use interactive mode')), | ||||
| ] + walkopts + commitopts + commitopts2 + subrepoopts, | ] + walkopts + commitopts + commitopts2 + subrepoopts, | ||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING, | helpcategory=command.CATEGORY_COMMITTING, helpbasic=True, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def commit(ui, repo, *pats, **opts): | def commit(ui, repo, *pats, **opts): | ||||
| """commit the specified files or all outstanding changes | """commit the specified files or all outstanding changes | ||||
| Commit changes to the given files into the repository. Unlike a | Commit changes to the given files into the repository. Unlike a | ||||
| centralized SCM, this operation is a local operation. See | centralized SCM, this operation is a local operation. See | ||||
| :hg:`push` for a way to actively distribute your changes. | :hg:`push` for a way to actively distribute your changes. | ||||
| @command( | @command( | ||||
| 'debugcommands', [], _('[COMMAND]'), | 'debugcommands', [], _('[COMMAND]'), | ||||
| helpcategory=command.CATEGORY_HELP, | helpcategory=command.CATEGORY_HELP, | ||||
| norepo=True) | norepo=True) | ||||
| def debugcommands(ui, cmd='', *args): | def debugcommands(ui, cmd='', *args): | ||||
| """list all available commands and options""" | """list all available commands and options""" | ||||
| for cmd, vals in sorted(table.iteritems()): | for cmd, vals in sorted(table.iteritems()): | ||||
| cmd = cmd.split('|')[0].strip('^') | cmd = cmd.split('|')[0] | ||||
| opts = ', '.join([i[1] for i in vals[1]]) | opts = ', '.join([i[1] for i in vals[1]]) | ||||
| ui.write('%s: %s\n' % (cmd, opts)) | ui.write('%s: %s\n' % (cmd, opts)) | ||||
| @command('debugcomplete', | @command('debugcomplete', | ||||
| [('o', 'options', None, _('show the command options'))], | [('o', 'options', None, _('show the command options'))], | ||||
| _('[-o] CMD'), | _('[-o] CMD'), | ||||
| helpcategory=command.CATEGORY_HELP, | helpcategory=command.CATEGORY_HELP, | ||||
| norepo=True) | norepo=True) | ||||
| ui.write("%s\n" % "\n".join(options)) | ui.write("%s\n" % "\n".join(options)) | ||||
| return | return | ||||
| cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) | ||||
| if ui.verbose: | if ui.verbose: | ||||
| cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | ||||
| ui.write("%s\n" % "\n".join(sorted(cmdlist))) | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | ||||
| @command('^diff', | @command('diff', | ||||
| [('r', 'rev', [], _('revision'), _('REV')), | [('r', 'rev', [], _('revision'), _('REV')), | ||||
| ('c', 'change', '', _('change made by revision'), _('REV')) | ('c', 'change', '', _('change made by revision'), _('REV')) | ||||
| ] + diffopts + diffopts2 + walkopts + subrepoopts, | ] + diffopts + diffopts2 + walkopts + subrepoopts, | ||||
| _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | ||||
| helpcategory=command.CATEGORY_FILE_CONTENTS, | helpcategory=command.CATEGORY_FILE_CONTENTS, | ||||
| inferrepo=True, | helpbasic=True, inferrepo=True, intents={INTENT_READONLY}) | ||||
| intents={INTENT_READONLY}) | |||||
| def diff(ui, repo, *pats, **opts): | def diff(ui, repo, *pats, **opts): | ||||
| """diff repository (or selected files) | """diff repository (or selected files) | ||||
| Show differences between revisions for the specified files. | Show differences between revisions for the specified files. | ||||
| Differences between files are shown using the unified diff format. | Differences between files are shown using the unified diff format. | ||||
| .. note:: | .. note:: | ||||
| diffopts = patch.diffallopts(ui, opts) | diffopts = patch.diffallopts(ui, opts) | ||||
| m = scmutil.match(ctx2, pats, opts) | m = scmutil.match(ctx2, pats, opts) | ||||
| m = repo.narrowmatch(m) | m = repo.narrowmatch(m) | ||||
| ui.pager('diff') | ui.pager('diff') | ||||
| logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | ||||
| listsubrepos=opts.get('subrepos'), | listsubrepos=opts.get('subrepos'), | ||||
| root=opts.get('root')) | root=opts.get('root')) | ||||
| @command('^export', | @command('export', | ||||
| [('B', 'bookmark', '', | [('B', 'bookmark', '', | ||||
| _('export changes only reachable by given bookmark')), | _('export changes only reachable by given bookmark')), | ||||
| ('o', 'output', '', | ('o', 'output', '', | ||||
| _('print output to file with formatted name'), _('FORMAT')), | _('print output to file with formatted name'), _('FORMAT')), | ||||
| ('', 'switch-parent', None, _('diff against the second parent')), | ('', 'switch-parent', None, _('diff against the second parent')), | ||||
| ('r', 'rev', [], _('revisions to export'), _('REV')), | ('r', 'rev', [], _('revisions to export'), _('REV')), | ||||
| ] + diffopts + formatteropts, | ] + diffopts + formatteropts, | ||||
| _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), | ||||
| helpcategory=command.CATEGORY_IMPORT_EXPORT, | helpcategory=command.CATEGORY_IMPORT_EXPORT, | ||||
| intents={INTENT_READONLY}) | helpbasic=True, intents={INTENT_READONLY}) | ||||
| def export(ui, repo, *changesets, **opts): | def export(ui, repo, *changesets, **opts): | ||||
| """dump the header and diffs for one or more changesets | """dump the header and diffs for one or more changesets | ||||
| Print the changeset header and diffs for one or more revisions. | Print the changeset header and diffs for one or more revisions. | ||||
| If no revision is given, the parent of the working directory is used. | If no revision is given, the parent of the working directory is used. | ||||
| The information shown in the changeset header is: author, date, | The information shown in the changeset header is: author, date, | ||||
| branch name (if non-default), changeset hash, parent(s) and commit | branch name (if non-default), changeset hash, parent(s) and commit | ||||
| fmt = '%s' + end | fmt = '%s' + end | ||||
| m = scmutil.match(ctx, pats, opts) | m = scmutil.match(ctx, pats, opts) | ||||
| ui.pager('files') | ui.pager('files') | ||||
| with ui.formatter('files', opts) as fm: | with ui.formatter('files', opts) as fm: | ||||
| return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) | ||||
| @command( | @command( | ||||
| '^forget', | 'forget', | ||||
| [('i', 'interactive', None, _('use interactive mode')), | [('i', 'interactive', None, _('use interactive mode')), | ||||
| ] + walkopts + dryrunopts, | ] + walkopts + dryrunopts, | ||||
| _('[OPTION]... FILE...'), | _('[OPTION]... FILE...'), | ||||
| helpcategory=command.CATEGORY_WORKING_DIRECTORY, | helpcategory=command.CATEGORY_WORKING_DIRECTORY, | ||||
| inferrepo=True) | helpbasic=True, inferrepo=True) | ||||
| def forget(ui, repo, *pats, **opts): | def forget(ui, repo, *pats, **opts): | ||||
| """forget the specified files on the next commit | """forget the specified files on the next commit | ||||
| Mark the specified files so they will no longer be tracked | Mark the specified files so they will no longer be tracked | ||||
| after the next commit. | after the next commit. | ||||
| This only removes files from the current branch, not from the | This only removes files from the current branch, not from the | ||||
| entire project history, and it does not delete them from the | entire project history, and it does not delete them from the | ||||
| repo._subtoppath = ui.expandpath(source) | repo._subtoppath = ui.expandpath(source) | ||||
| try: | try: | ||||
| return hg.incoming(ui, repo, source, opts) | return hg.incoming(ui, repo, source, opts) | ||||
| finally: | finally: | ||||
| del repo._subtoppath | del repo._subtoppath | ||||
| @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), | @command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), | ||||
| helpcategory=command.CATEGORY_REPO_CREATION, | helpcategory=command.CATEGORY_REPO_CREATION, | ||||
| norepo=True) | helpbasic=True, norepo=True) | ||||
| def init(ui, dest=".", **opts): | def init(ui, dest=".", **opts): | ||||
| """create a new repository in the given directory | """create a new repository in the given directory | ||||
| Initialize a new repository in the given directory. If the given | Initialize a new repository in the given directory. If the given | ||||
| directory does not exist, it will be created. | directory does not exist, it will be created. | ||||
| If no directory is given, the current directory is used. | If no directory is given, the current directory is used. | ||||
| if opts.get('fullpath'): | if opts.get('fullpath'): | ||||
| ui.write(repo.wjoin(abs), end) | ui.write(repo.wjoin(abs), end) | ||||
| else: | else: | ||||
| ui.write(((pats and m.rel(abs)) or abs), end) | ui.write(((pats and m.rel(abs)) or abs), end) | ||||
| ret = 0 | ret = 0 | ||||
| return ret | return ret | ||||
| @command('^log|history', | @command('log|history', | ||||
| [('f', 'follow', None, | [('f', 'follow', None, | ||||
| _('follow changeset history, or file history across copies and renames')), | _('follow changeset history, or file history across copies and renames')), | ||||
| ('', 'follow-first', None, | ('', 'follow-first', None, | ||||
| _('only follow the first parent of merge changesets (DEPRECATED)')), | _('only follow the first parent of merge changesets (DEPRECATED)')), | ||||
| ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | ||||
| ('C', 'copies', None, _('show copied files')), | ('C', 'copies', None, _('show copied files')), | ||||
| ('k', 'keyword', [], | ('k', 'keyword', [], | ||||
| _('do case-insensitive search for a given text'), _('TEXT')), | _('do case-insensitive search for a given text'), _('TEXT')), | ||||
| _('BRANCH')), | _('BRANCH')), | ||||
| ('b', 'branch', [], | ('b', 'branch', [], | ||||
| _('show changesets within the given named branch'), _('BRANCH')), | _('show changesets within the given named branch'), _('BRANCH')), | ||||
| ('P', 'prune', [], | ('P', 'prune', [], | ||||
| _('do not display revision or any of its ancestors'), _('REV')), | _('do not display revision or any of its ancestors'), _('REV')), | ||||
| ] + logopts + walkopts, | ] + logopts + walkopts, | ||||
| _('[OPTION]... [FILE]'), | _('[OPTION]... [FILE]'), | ||||
| helpcategory=command.CATEGORY_CHANGE_NAVIGATION, | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, | ||||
| inferrepo=True, | helpbasic=True, inferrepo=True, | ||||
| intents={INTENT_READONLY}) | intents={INTENT_READONLY}) | ||||
| def log(ui, repo, *pats, **opts): | def log(ui, repo, *pats, **opts): | ||||
| """show revision history of entire repository or files | """show revision history of entire repository or files | ||||
| Print the revision history of the specified files or the entire | Print the revision history of the specified files or the entire | ||||
| project. | project. | ||||
| If no revision range is specified, the default is ``tip:0`` unless | If no revision range is specified, the default is ``tip:0`` unless | ||||
| fm.startitem() | fm.startitem() | ||||
| fm.context(ctx=ctx) | fm.context(ctx=ctx) | ||||
| fl = ctx[f].flags() | fl = ctx[f].flags() | ||||
| fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | ||||
| fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | ||||
| fm.write('path', '%s\n', f) | fm.write('path', '%s\n', f) | ||||
| fm.end() | fm.end() | ||||
| @command('^merge', | @command('merge', | ||||
| [('f', 'force', None, | [('f', 'force', None, | ||||
| _('force a merge including outstanding changes (DEPRECATED)')), | _('force a merge including outstanding changes (DEPRECATED)')), | ||||
| ('r', 'rev', '', _('revision to merge'), _('REV')), | ('r', 'rev', '', _('revision to merge'), _('REV')), | ||||
| ('P', 'preview', None, | ('P', 'preview', None, | ||||
| _('review revisions to merge (no merge is performed)')), | _('review revisions to merge (no merge is performed)')), | ||||
| ('', 'abort', None, _('abort the ongoing merge')), | ('', 'abort', None, _('abort the ongoing merge')), | ||||
| ] + mergetoolopts, | ] + mergetoolopts, | ||||
| _('[-P] [[-r] REV]'), | _('[-P] [[-r] REV]'), | ||||
| helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True) | ||||
| def merge(ui, repo, node=None, **opts): | def merge(ui, repo, node=None, **opts): | ||||
| """merge another revision into working directory | """merge another revision into working directory | ||||
| The current working directory is updated with all changes made in | The current working directory is updated with all changes made in | ||||
| the requested revision since the last common predecessor revision. | the requested revision since the last common predecessor revision. | ||||
| Files that changed between either parent are marked as changed for | Files that changed between either parent are marked as changed for | ||||
| the next commit and a commit must be performed before any further | the next commit and a commit must be performed before any further | ||||
| elif currentbranchheads > 1: | elif currentbranchheads > 1: | ||||
| ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | ||||
| "merge)\n")) | "merge)\n")) | ||||
| else: | else: | ||||
| ui.status(_("(run 'hg heads' to see heads)\n")) | ui.status(_("(run 'hg heads' to see heads)\n")) | ||||
| elif not ui.configbool('commands', 'update.requiredest'): | elif not ui.configbool('commands', 'update.requiredest'): | ||||
| ui.status(_("(run 'hg update' to get a working copy)\n")) | ui.status(_("(run 'hg update' to get a working copy)\n")) | ||||
| @command('^pull', | @command('pull', | ||||
| [('u', 'update', None, | [('u', 'update', None, | ||||
| _('update to new branch head if new descendants were pulled')), | _('update to new branch head if new descendants were pulled')), | ||||
| ('f', 'force', None, _('run even when remote repository is unrelated')), | ('f', 'force', None, _('run even when remote repository is unrelated')), | ||||
| ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | ||||
| ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | ||||
| ('b', 'branch', [], _('a specific branch you would like to pull'), | ('b', 'branch', [], _('a specific branch you would like to pull'), | ||||
| _('BRANCH')), | _('BRANCH')), | ||||
| ] + remoteopts, | ] + remoteopts, | ||||
| _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'), | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'), | ||||
| helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT) | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, | ||||
| helpbasic=True) | |||||
| def pull(ui, repo, source="default", **opts): | def pull(ui, repo, source="default", **opts): | ||||
| """pull changes from the specified source | """pull changes from the specified source | ||||
| Pull changes from a remote repository to a local one. | Pull changes from a remote repository to a local one. | ||||
| This finds all changes from the repository at the specified path | This finds all changes from the repository at the specified path | ||||
| or URL and adds them to a local repository (the current one unless | or URL and adds them to a local repository (the current one unless | ||||
| -R is specified). By default, this does not update the copy of the | -R is specified). By default, this does not update the copy of the | ||||
| finally: | finally: | ||||
| del repo._subtoppath | del repo._subtoppath | ||||
| finally: | finally: | ||||
| other.close() | other.close() | ||||
| return ret | return ret | ||||
| @command('^push', | @command('push', | ||||
| [('f', 'force', None, _('force push')), | [('f', 'force', None, _('force push')), | ||||
| ('r', 'rev', [], | ('r', 'rev', [], | ||||
| _('a changeset intended to be included in the destination'), | _('a changeset intended to be included in the destination'), | ||||
| _('REV')), | _('REV')), | ||||
| ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | ||||
| ('b', 'branch', [], | ('b', 'branch', [], | ||||
| _('a specific branch you would like to push'), _('BRANCH')), | _('a specific branch you would like to push'), _('BRANCH')), | ||||
| ('', 'new-branch', False, _('allow pushing a new branch')), | ('', 'new-branch', False, _('allow pushing a new branch')), | ||||
| ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), | ||||
| ] + remoteopts, | ] + remoteopts, | ||||
| _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'), | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'), | ||||
| helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT) | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, | ||||
| helpbasic=True) | |||||
| def push(ui, repo, dest=None, **opts): | def push(ui, repo, dest=None, **opts): | ||||
| """push changes to the specified destination | """push changes to the specified destination | ||||
| Push changesets from the local repository to the specified | Push changesets from the local repository to the specified | ||||
| destination. | destination. | ||||
| This operation is symmetrical to pull: it is identical to a pull | This operation is symmetrical to pull: it is identical to a pull | ||||
| in the destination repository from the current one. | in the destination repository from the current one. | ||||
| suggests it. | suggests it. | ||||
| Returns 0 if successful, 1 if nothing to recover or verify fails. | Returns 0 if successful, 1 if nothing to recover or verify fails. | ||||
| """ | """ | ||||
| if repo.recover(): | if repo.recover(): | ||||
| return hg.verify(repo) | return hg.verify(repo) | ||||
| return 1 | return 1 | ||||
| @command('^remove|rm', | @command('remove|rm', | ||||
| [('A', 'after', None, _('record delete for missing files')), | [('A', 'after', None, _('record delete for missing files')), | ||||
| ('f', 'force', None, | ('f', 'force', None, | ||||
| _('forget added files, delete modified files')), | _('forget added files, delete modified files')), | ||||
| ] + subrepoopts + walkopts + dryrunopts, | ] + subrepoopts + walkopts + dryrunopts, | ||||
| _('[OPTION]... FILE...'), | _('[OPTION]... FILE...'), | ||||
| helpcategory=command.CATEGORY_WORKING_DIRECTORY, | helpcategory=command.CATEGORY_WORKING_DIRECTORY, | ||||
| inferrepo=True) | helpbasic=True, inferrepo=True) | ||||
| def remove(ui, repo, *pats, **opts): | def remove(ui, repo, *pats, **opts): | ||||
| """remove the specified files on the next commit | """remove the specified files on the next commit | ||||
| Schedule the indicated files for removal from the current branch. | Schedule the indicated files for removal from the current branch. | ||||
| This command schedules the files to be removed at the next commit. | This command schedules the files to be removed at the next commit. | ||||
| To undo a remove before that, see :hg:`revert`. To undo added | To undo a remove before that, see :hg:`revert`. To undo added | ||||
| files, see :hg:`forget`. | files, see :hg:`forget`. | ||||
| """print the root (top) of the current working directory | """print the root (top) of the current working directory | ||||
| Print the root directory of the current repository. | Print the root directory of the current repository. | ||||
| Returns 0 on success. | Returns 0 on success. | ||||
| """ | """ | ||||
| ui.write(repo.root + "\n") | ui.write(repo.root + "\n") | ||||
| @command('^serve', | @command('serve', | ||||
| [('A', 'accesslog', '', _('name of access log file to write to'), | [('A', 'accesslog', '', _('name of access log file to write to'), | ||||
| _('FILE')), | _('FILE')), | ||||
| ('d', 'daemon', None, _('run server in background')), | ('d', 'daemon', None, _('run server in background')), | ||||
| ('', 'daemon-postexec', [], _('used internally by daemon mode')), | ('', 'daemon-postexec', [], _('used internally by daemon mode')), | ||||
| ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | ||||
| # use string type, then we can check if something was passed | # use string type, then we can check if something was passed | ||||
| ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | ||||
| ('a', 'address', '', _('address to listen on (default: all interfaces)'), | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | ||||
| ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | ||||
| ('', 'style', '', _('template style to use'), _('STYLE')), | ('', 'style', '', _('template style to use'), _('STYLE')), | ||||
| ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | ||||
| ('', 'certificate', '', _('SSL certificate file'), _('FILE')), | ('', 'certificate', '', _('SSL certificate file'), _('FILE')), | ||||
| ('', 'print-url', None, _('start and print only the URL'))] | ('', 'print-url', None, _('start and print only the URL'))] | ||||
| + subrepoopts, | + subrepoopts, | ||||
| _('[OPTION]...'), | _('[OPTION]...'), | ||||
| helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, | ||||
| optionalrepo=True) | helpbasic=True, optionalrepo=True) | ||||
| def serve(ui, repo, **opts): | def serve(ui, repo, **opts): | ||||
| """start stand-alone webserver | """start stand-alone webserver | ||||
| Start a local HTTP repository browser and pull server. You can use | Start a local HTTP repository browser and pull server. You can use | ||||
| this for ad-hoc sharing and browsing of repositories. It is | this for ad-hoc sharing and browsing of repositories. It is | ||||
| recommended to use a real web server to serve a repository for | recommended to use a real web server to serve a repository for | ||||
| longer periods of time. | longer periods of time. | ||||
| s = wireprotoserver.sshserver(ui, repo) | s = wireprotoserver.sshserver(ui, repo) | ||||
| s.serve_forever() | s.serve_forever() | ||||
| service = server.createservice(ui, repo, opts) | service = server.createservice(ui, repo, opts) | ||||
| return server.runservice(opts, initfn=service.init, runfn=service.run) | return server.runservice(opts, initfn=service.init, runfn=service.run) | ||||
| _NOTTERSE = 'nothing' | _NOTTERSE = 'nothing' | ||||
| @command('^status|st', | @command('status|st', | ||||
| [('A', 'all', None, _('show status of all files')), | [('A', 'all', None, _('show status of all files')), | ||||
| ('m', 'modified', None, _('show only modified files')), | ('m', 'modified', None, _('show only modified files')), | ||||
| ('a', 'added', None, _('show only added files')), | ('a', 'added', None, _('show only added files')), | ||||
| ('r', 'removed', None, _('show only removed files')), | ('r', 'removed', None, _('show only removed files')), | ||||
| ('d', 'deleted', None, _('show only deleted (but tracked) files')), | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | ||||
| ('c', 'clean', None, _('show only files without changes')), | ('c', 'clean', None, _('show only files without changes')), | ||||
| ('u', 'unknown', None, _('show only unknown (not tracked) files')), | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | ||||
| ('i', 'ignored', None, _('show only ignored files')), | ('i', 'ignored', None, _('show only ignored files')), | ||||
| ('n', 'no-status', None, _('hide status prefix')), | ('n', 'no-status', None, _('hide status prefix')), | ||||
| ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')), | ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')), | ||||
| ('C', 'copies', None, _('show source of copied files')), | ('C', 'copies', None, _('show source of copied files')), | ||||
| ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | ||||
| ('', 'rev', [], _('show difference from revision'), _('REV')), | ('', 'rev', [], _('show difference from revision'), _('REV')), | ||||
| ('', 'change', '', _('list the changed files of a revision'), _('REV')), | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | ||||
| ] + walkopts + subrepoopts + formatteropts, | ] + walkopts + subrepoopts + formatteropts, | ||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_WORKING_DIRECTORY, | helpcategory=command.CATEGORY_WORKING_DIRECTORY, | ||||
| inferrepo=True, | helpbasic=True, inferrepo=True, | ||||
| intents={INTENT_READONLY}) | intents={INTENT_READONLY}) | ||||
| def status(ui, repo, *pats, **opts): | def status(ui, repo, *pats, **opts): | ||||
| """show changed files in the working directory | """show changed files in the working directory | ||||
| Show status of files in the repository. If names are given, only | Show status of files in the repository. If names are given, only | ||||
| files that match are shown. Files that are clean or ignored or | files that match are shown. Files that are clean or ignored or | ||||
| the source of a copy/move operation, are not listed unless | the source of a copy/move operation, are not listed unless | ||||
| -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | ||||
| fm.plain((' %s' + end) % repo.pathto(copy[f], cwd), | fm.plain((' %s' + end) % repo.pathto(copy[f], cwd), | ||||
| label='status.copied') | label='status.copied') | ||||
| if ((ui.verbose or ui.configbool('commands', 'status.verbose')) | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) | ||||
| and not ui.plain()): | and not ui.plain()): | ||||
| cmdutil.morestatus(repo, fm) | cmdutil.morestatus(repo, fm) | ||||
| fm.end() | fm.end() | ||||
| @command('^summary|sum', | @command('summary|sum', | ||||
| [('', 'remote', None, _('check for push and pull'))], | [('', 'remote', None, _('check for push and pull'))], | ||||
| '[--remote]', | '[--remote]', | ||||
| helpcategory=command.CATEGORY_WORKING_DIRECTORY, | helpcategory=command.CATEGORY_WORKING_DIRECTORY, | ||||
| helpbasic=True, | |||||
| intents={INTENT_READONLY}) | intents={INTENT_READONLY}) | ||||
| def summary(ui, repo, **opts): | def summary(ui, repo, **opts): | ||||
| """summarize working directory state | """summarize working directory state | ||||
| This generates a brief summary of the working directory state, | This generates a brief summary of the working directory state, | ||||
| including parents, branch, commit status, phase and available updates. | including parents, branch, commit status, phase and available updates. | ||||
| With the --remote option, this will check the default paths for | With the --remote option, this will check the default paths for | ||||
| _('%s: unknown bundle feature, %s') % (fname, exc), | _('%s: unknown bundle feature, %s') % (fname, exc), | ||||
| hint=_("see https://mercurial-scm.org/" | hint=_("see https://mercurial-scm.org/" | ||||
| "wiki/BundleFeature for more " | "wiki/BundleFeature for more " | ||||
| "information")) | "information")) | ||||
| modheads = bundle2.combinechangegroupresults(op) | modheads = bundle2.combinechangegroupresults(op) | ||||
| return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) | ||||
| @command('^update|up|checkout|co', | @command('update|up|checkout|co', | ||||
| [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | ||||
| ('c', 'check', None, _('require clean working directory')), | ('c', 'check', None, _('require clean working directory')), | ||||
| ('m', 'merge', None, _('merge uncommitted changes')), | ('m', 'merge', None, _('merge uncommitted changes')), | ||||
| ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | ||||
| ('r', 'rev', '', _('revision'), _('REV')) | ('r', 'rev', '', _('revision'), _('REV')) | ||||
| ] + mergetoolopts, | ] + mergetoolopts, | ||||
| _('[-C|-c|-m] [-d DATE] [[-r] REV]'), | _('[-C|-c|-m] [-d DATE] [[-r] REV]'), | ||||
| helpcategory=command.CATEGORY_WORKING_DIRECTORY) | helpcategory=command.CATEGORY_WORKING_DIRECTORY, | ||||
| helpbasic=True) | |||||
| def update(ui, repo, node=None, **opts): | def update(ui, repo, node=None, **opts): | ||||
| """update working directory (or switch revisions) | """update working directory (or switch revisions) | ||||
| Update the repository's working directory to the specified | Update the repository's working directory to the specified | ||||
| changeset. If no changeset is specified, update to the tip of the | changeset. If no changeset is specified, update to the tip of the | ||||
| current named branch and move the active bookmark (see :hg:`help | current named branch and move the active bookmark (see :hg:`help | ||||
| bookmarks`). | bookmarks`). | ||||
| h = {} | h = {} | ||||
| # Command -> string showing synonyms | # Command -> string showing synonyms | ||||
| syns = {} | syns = {} | ||||
| for c, e in commands.table.iteritems(): | for c, e in commands.table.iteritems(): | ||||
| fs = cmdutil.parsealiases(c) | fs = cmdutil.parsealiases(c) | ||||
| f = fs[0] | f = fs[0] | ||||
| syns[f] = ', '.join(fs) | syns[f] = ', '.join(fs) | ||||
| func = e[0] | func = e[0] | ||||
| p = '' | if select and not select(f): | ||||
| if c.startswith("^"): | |||||
| p = '^' | |||||
| if select and not select(p + f): | |||||
| continue | continue | ||||
| if (not select and name != 'shortlist' and | if (not select and name != 'shortlist' and | ||||
| func.__module__ != commands.__name__): | func.__module__ != commands.__name__): | ||||
| continue | continue | ||||
| if name == "shortlist" and not p: | if name == "shortlist": | ||||
| if not getattr(func, 'helpbasic', False): | |||||
| continue | continue | ||||
| doc = pycompat.getdoc(func) | doc = pycompat.getdoc(func) | ||||
| if filtercmd(ui, f, name, doc): | if filtercmd(ui, f, name, doc): | ||||
| continue | continue | ||||
| doc = gettext(doc) | doc = gettext(doc) | ||||
| if not doc: | if not doc: | ||||
| doc = _("(no help text available)") | doc = _("(no help text available)") | ||||
| h[f] = doc.splitlines()[0].rstrip() | h[f] = doc.splitlines()[0].rstrip() | ||||
| early, other = [], [] | early, other = [], [] | ||||
| primary = lambda s: s.partition('|')[0] | primary = lambda s: s.partition('|')[0] | ||||
| for c, e in commands.table.iteritems(): | for c, e in commands.table.iteritems(): | ||||
| doc = _getdoc(e) | doc = _getdoc(e) | ||||
| if 'DEPRECATED' in doc or c.startswith('debug'): | if 'DEPRECATED' in doc or c.startswith('debug'): | ||||
| continue | continue | ||||
| cmd = primary(c) | cmd = primary(c) | ||||
| if cmd.startswith('^'): | if getattr(e[0], 'helpbasic', False): | ||||
| early.append((cmd[1:], doc)) | early.append((cmd, doc)) | ||||
| else: | else: | ||||
| other.append((cmd, doc)) | other.append((cmd, doc)) | ||||
| early.sort() | early.sort() | ||||
| other.sort() | other.sort() | ||||
| def earlycommands(context): | def earlycommands(context): | ||||
| for c, doc in early: | for c, doc in early: | ||||
| CATEGORY_IMPORT_EXPORT = 'import' | CATEGORY_IMPORT_EXPORT = 'import' | ||||
| CATEGORY_MAINTENANCE = 'maintenance' | CATEGORY_MAINTENANCE = 'maintenance' | ||||
| CATEGORY_HELP = 'help' | CATEGORY_HELP = 'help' | ||||
| CATEGORY_MISC = 'misc' | CATEGORY_MISC = 'misc' | ||||
| CATEGORY_NONE = 'none' | CATEGORY_NONE = 'none' | ||||
| def _doregister(self, func, name, options=(), synopsis=None, | def _doregister(self, func, name, options=(), synopsis=None, | ||||
| norepo=False, optionalrepo=False, inferrepo=False, | norepo=False, optionalrepo=False, inferrepo=False, | ||||
| intents=None, helpcategory=None): | intents=None, helpcategory=None, helpbasic=False): | ||||
| func.norepo = norepo | func.norepo = norepo | ||||
| func.optionalrepo = optionalrepo | func.optionalrepo = optionalrepo | ||||
| func.inferrepo = inferrepo | func.inferrepo = inferrepo | ||||
| func.intents = intents or set() | func.intents = intents or set() | ||||
| func.helpcategory = helpcategory | func.helpcategory = helpcategory | ||||
| func.helpbasic = helpbasic | |||||
| if synopsis: | if synopsis: | ||||
| self._table[name] = func, list(options), synopsis | self._table[name] = func, list(options), synopsis | ||||
| else: | else: | ||||
| self._table[name] = func, list(options) | self._table[name] = func, list(options) | ||||
| return func | return func | ||||
| INTENT_READONLY = b'readonly' | INTENT_READONLY = b'readonly' | ||||
| $ hg debugcomplete --options s | $ hg debugcomplete --options s | ||||
| hg: command 's' is ambiguous: | hg: command 's' is ambiguous: | ||||
| serve showconfig status summary | serve showconfig status summary | ||||
| [255] | [255] | ||||
| Show all commands + options | Show all commands + options | ||||
| $ hg debugcommands | $ hg debugcommands | ||||
| add: include, exclude, subrepos, dry-run | add: include, exclude, subrepos, dry-run | ||||
| annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template | |||||
| clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure | |||||
| commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos | |||||
| diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos | |||||
| export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template | |||||
| forget: interactive, include, exclude, dry-run | |||||
| init: ssh, remotecmd, insecure | |||||
| log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude | |||||
| merge: force, rev, preview, abort, tool | |||||
| pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure | |||||
| push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure | |||||
| remove: after, force, subrepos, include, exclude, dry-run | |||||
| serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos | |||||
| status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template | |||||
| summary: remote | |||||
| update: clean, check, merge, date, rev, tool | |||||
| addremove: similarity, subrepos, include, exclude, dry-run | addremove: similarity, subrepos, include, exclude, dry-run | ||||
| annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template | |||||
| archive: no-decode, prefix, rev, type, subrepos, include, exclude | archive: no-decode, prefix, rev, type, subrepos, include, exclude | ||||
| backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user | backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user | ||||
| bisect: reset, good, bad, skip, extend, command, noupdate | bisect: reset, good, bad, skip, extend, command, noupdate | ||||
| bookmarks: force, rev, delete, rename, inactive, list, template | bookmarks: force, rev, delete, rename, inactive, list, template | ||||
| branch: force, clean, rev | branch: force, clean, rev | ||||
| branches: active, closed, template | branches: active, closed, template | ||||
| bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure | bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure | ||||
| cat: output, rev, decode, include, exclude, template | cat: output, rev, decode, include, exclude, template | ||||
| clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure | |||||
| commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos | |||||
| config: untrusted, edit, local, global, template | config: untrusted, edit, local, global, template | ||||
| copy: after, force, include, exclude, dry-run | copy: after, force, include, exclude, dry-run | ||||
| debugancestor: | debugancestor: | ||||
| debugapplystreamclonebundle: | debugapplystreamclonebundle: | ||||
| debugbuilddag: mergeable-file, overwritten-file, new-file | debugbuilddag: mergeable-file, overwritten-file, new-file | ||||
| debugbundle: all, part-type, spec | debugbundle: all, part-type, spec | ||||
| debugcapabilities: | debugcapabilities: | ||||
| debugcheckstate: | debugcheckstate: | ||||
| debuguigetpass: prompt | debuguigetpass: prompt | ||||
| debuguiprompt: prompt | debuguiprompt: prompt | ||||
| debugupdatecaches: | debugupdatecaches: | ||||
| debugupgraderepo: optimize, run | debugupgraderepo: optimize, run | ||||
| debugwalk: include, exclude | debugwalk: include, exclude | ||||
| debugwhyunstable: | debugwhyunstable: | ||||
| debugwireargs: three, four, five, ssh, remotecmd, insecure | debugwireargs: three, four, five, ssh, remotecmd, insecure | ||||
| debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure | debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure | ||||
| diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos | |||||
| export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template | |||||
| files: rev, print0, include, exclude, template, subrepos | files: rev, print0, include, exclude, template, subrepos | ||||
| forget: interactive, include, exclude, dry-run | |||||
| graft: rev, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run | graft: rev, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run | ||||
| grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude | grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude | ||||
| heads: rev, topo, active, closed, style, template | heads: rev, topo, active, closed, style, template | ||||
| help: extension, command, keyword, system | help: extension, command, keyword, system | ||||
| identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template | identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template | ||||
| import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity | import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity | ||||
| incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos | incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos | ||||
| init: ssh, remotecmd, insecure | |||||
| locate: rev, print0, fullpath, include, exclude | locate: rev, print0, fullpath, include, exclude | ||||
| log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude | |||||
| manifest: rev, all, template | manifest: rev, all, template | ||||
| merge: force, rev, preview, abort, tool | |||||
| outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos | outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos | ||||
| parents: rev, style, template | parents: rev, style, template | ||||
| paths: template | paths: template | ||||
| phase: public, draft, secret, force, rev | phase: public, draft, secret, force, rev | ||||
| pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure | |||||
| push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure | |||||
| recover: | recover: | ||||
| remove: after, force, subrepos, include, exclude, dry-run | |||||
| rename: after, force, include, exclude, dry-run | rename: after, force, include, exclude, dry-run | ||||
| resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template | resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template | ||||
| revert: all, date, rev, no-backup, interactive, include, exclude, dry-run | revert: all, date, rev, no-backup, interactive, include, exclude, dry-run | ||||
| rollback: dry-run, force | rollback: dry-run, force | ||||
| root: | root: | ||||
| serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos | |||||
| status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template | |||||
| summary: remote | |||||
| tag: force, local, rev, remove, edit, message, date, user | tag: force, local, rev, remove, edit, message, date, user | ||||
| tags: template | tags: template | ||||
| tip: patch, git, style, template | tip: patch, git, style, template | ||||
| unbundle: update | unbundle: update | ||||
| update: clean, check, merge, date, rev, tool | |||||
| verify: | verify: | ||||
| version: template | version: template | ||||
| $ hg init a | $ hg init a | ||||
| $ cd a | $ cd a | ||||
| $ echo fee > fee | $ echo fee > fee | ||||
| $ hg ci -q -Amfee | $ hg ci -q -Amfee | ||||
| $ hg tag fee | $ hg tag fee | ||||