Mercurial > hg
changeset 15868:031c2e4424e1
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 13 Jan 2012 11:29:40 -0600 |
| parents | d0f2a89c8cfa (diff) c37479fb81bd (current diff) |
| children | e5feebc1f3bb |
| files | |
| diffstat | 16 files changed, 656 insertions(+), 641 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Jan 12 17:50:48 2012 +0700 +++ b/.hgignore Fri Jan 13 11:29:40 2012 -0600 @@ -19,6 +19,7 @@ tests/.coverage* tests/annotated tests/*.err +tests/htmlcov build contrib/hgsh/hgsh dist
--- a/hgext/largefiles/lfcommands.py Thu Jan 12 17:50:48 2012 +0700 +++ b/hgext/largefiles/lfcommands.py Fri Jan 13 11:29:40 2012 -0600 @@ -375,7 +375,15 @@ toget = [] for lfile in lfiles: - expectedhash = repo[node][lfutil.standin(lfile)].data().strip() + # If we are mid-merge, then we have to trust the standin that is in the + # working copy to have the correct hashvalue. This is because the + # original hg.merge() already updated the standin as part of the normal + # merge process -- we just have to udpate the largefile to match. + if getattr(repo, "_ismerging", False): + expectedhash = lfutil.readstandin(repo, lfile) + else: + expectedhash = repo[node][lfutil.standin(lfile)].data().strip() + # if it exists and its hash matches, it might have been locally # modified before updating and the user chose 'local'. in this case, # it will not be in any store, so don't look for it.
--- a/hgext/largefiles/overrides.py Thu Jan 12 17:50:48 2012 +0700 +++ b/hgext/largefiles/overrides.py Fri Jan 13 11:29:40 2012 -0600 @@ -612,8 +612,15 @@ return result def hg_merge(orig, repo, node, force=None, remind=True): - result = orig(repo, node, force, remind) - lfcommands.updatelfiles(repo.ui, repo) + # Mark the repo as being in the middle of a merge, so that + # updatelfiles() will know that it needs to trust the standins in + # the working copy, not in the standins in the current node + repo._ismerging = True + try: + result = orig(repo, node, force, remind) + lfcommands.updatelfiles(repo.ui, repo) + finally: + repo._ismerging = False return result # When we rebase a repository with remotely changed largefiles, we need to
--- a/mercurial/commands.py Thu Jan 12 17:50:48 2012 +0700 +++ b/mercurial/commands.py Fri Jan 13 11:29:40 2012 -0600 @@ -18,7 +18,7 @@ import minirst, revset, fileset import dagparser, context, simplemerge import random, setdiscovery, treediscovery, dagutil -import phases as phasesmod +import phases table = {} @@ -3155,7 +3155,7 @@ ui.write(" %s:\n %s\n"%(commands, h[f])) else: ui.write('%s\n' % (util.wrap(h[f], textwidth, - initindent=' %-*s ' % (m, f), + initindent=' %-*s ' % (m, f), hangindent=' ' * (m + 4)))) if not name: @@ -3169,7 +3169,7 @@ topics.append((sorted(names, key=len, reverse=True)[0], header)) topics_len = max([len(s[0]) for s in topics]) for t, desc in topics: - ui.write(" %-*s %s\n" % (topics_len, t, desc)) + ui.write(" %-*s %s\n" % (topics_len, t, desc)) optlist = [] addglobalopts(optlist, True) @@ -4216,29 +4216,29 @@ ui.write("%s = %s\n" % (name, util.hidepassword(path))) @command('^phase', - [('p', 'public', False, _('Set changeset to public')), - ('d', 'draft', False, _('Set changeset to draft')), - ('s', 'secret', False, _('Set changeset to secret')), + [('p', 'public', False, _('set changeset phase to public')), + ('d', 'draft', False, _('set changeset phase to draft')), + ('s', 'secret', False, _('set changeset phase to secret')), ('f', 'force', False, _('allow to move boundary backward')), - ('r', 'rev', [], _('target revision')), + ('r', 'rev', [], _('target revision'), _('REV')), ], - _('[-p|-d|-s] [-f] [-C] [-r] REV')) + _('[-p|-d|-s] [-f] [-r] REV...')) def phase(ui, repo, *revs, **opts): """set or show the current phase name With no argument, show the phase name of specified revisions. - With one of `--public`, `--draft` or `--secret`, change the phase - value of the specified revisions. + With one of -p/--public, -d/--draft or -s/--secret, change the + phase value of the specified revisions. Unless -f/--force is specified, :hg:`phase` won't move changeset from a - lower phase to an higher phase. Phases are ordered as follows: + lower phase to an higher phase. Phases are ordered as follows:: public < draft < secret """ # search for a unique phase argument targetphase = None - for idx, name in enumerate(phasesmod.phasenames): + for idx, name in enumerate(phases.phasenames): if opts[name]: if targetphase is not None: raise util.Abort(_('only one phase can be specified')) @@ -4262,9 +4262,9 @@ nodes = [ctx.node() for ctx in repo.set('%lr', revs)] if not nodes: raise util.Abort(_('empty revision set')) - phasesmod.advanceboundary(repo, targetphase, nodes) + phases.advanceboundary(repo, targetphase, nodes) if opts['force']: - phasesmod.retractboundary(repo, targetphase, nodes) + phases.retractboundary(repo, targetphase, nodes) finally: lock.release()
--- a/mercurial/minirst.py Thu Jan 12 17:50:48 2012 +0700 +++ b/mercurial/minirst.py Fri Jan 13 11:29:40 2012 -0600 @@ -162,28 +162,24 @@ i += 1 return blocks -_fieldwidth = 12 +_fieldwidth = 14 def updatefieldlists(blocks): - """Find key and maximum key width for field lists.""" + """Find key for field lists.""" i = 0 while i < len(blocks): if blocks[i]['type'] != 'field': i += 1 continue - keywidth = 0 j = i while j < len(blocks) and blocks[j]['type'] == 'field': m = _fieldre.match(blocks[j]['lines'][0]) key, rest = m.groups() blocks[j]['lines'][0] = rest blocks[j]['key'] = key - keywidth = max(keywidth, len(key)) j += 1 - for block in blocks[i:j]: - block['keywidth'] = keywidth i = j + 1 return blocks @@ -492,19 +488,13 @@ m = _bulletre.match(block['lines'][0]) subindent = indent + m.end() * ' ' elif block['type'] == 'field': - keywidth = block['keywidth'] key = block['key'] - subindent = indent + _fieldwidth * ' ' if len(key) + 2 > _fieldwidth: # key too large, use full line width key = key.ljust(width) - elif keywidth + 2 < _fieldwidth: - # all keys are small, add only two spaces - key = key.ljust(keywidth + 2) - subindent = indent + (keywidth + 2) * ' ' else: - # mixed sizes, use fieldwidth for this one + # key fits within field width key = key.ljust(_fieldwidth) block['lines'][0] = key + block['lines'][0] elif block['type'] == 'option':
--- a/tests/run-tests.py Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/run-tests.py Fri Jan 13 11:29:40 2012 -0600 @@ -141,6 +141,8 @@ " rather than capturing and diff'ing it (disables timeout)") parser.add_option("-f", "--first", action="store_true", help="exit on the first test failure") + parser.add_option("-H", "--htmlcov", action="store_true", + help="create an HTML report of the coverage of the files") parser.add_option("--inotify", action="store_true", help="enable inotify extension when running tests") parser.add_option("-i", "--interactive", action="store_true", @@ -211,7 +213,7 @@ % hgbin) options.with_hg = hgbin - options.anycoverage = options.cover or options.annotate + options.anycoverage = options.cover or options.annotate or options.htmlcov if options.anycoverage: try: import coverage @@ -493,8 +495,11 @@ return covrun('-c') - omit = ','.join([BINDIR, TESTDIR]) + omit = ','.join(os.path.join(x, '*') for x in [BINDIR, TESTDIR]) covrun('-i', '-r', '"--omit=%s"' % omit) # report + if options.htmlcov: + htmldir = os.path.join(TESTDIR, 'htmlcov') + covrun('-i', '-b', '"--directory=%s"' % htmldir, '"--omit=%s"' % omit) if options.annotate: adir = os.path.join(TESTDIR, 'annotated') if not os.path.isdir(adir):
--- a/tests/test-alias.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-alias.t Fri Jan 13 11:29:40 2012 -0600 @@ -324,24 +324,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details [255] @@ -351,24 +351,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details [255] @@ -378,24 +378,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details [255]
--- a/tests/test-commandserver.py.out Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-commandserver.py.out Fri Jan 13 11:29:40 2012 -0600 @@ -16,24 +16,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details runcommand id --quiet
--- a/tests/test-convert.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-convert.t Fri Jan 13 11:29:40 2012 -0600 @@ -128,15 +128,16 @@ you can set on the command line with "--config": convert.hg.ignoreerrors - ignore integrity errors when reading. Use it to fix Mercurial - repositories with missing revlogs, by converting from and to - Mercurial. Default is False. + ignore integrity errors when reading. Use it to fix + Mercurial repositories with missing revlogs, by converting + from and to Mercurial. Default is False. convert.hg.saverev - store original revision ID in changeset (forces target IDs to - change). It takes a boolean argument and defaults to False. + store original revision ID in changeset (forces target IDs + to change). It takes a boolean argument and defaults to + False. convert.hg.startrev - convert start revision and its descendants. It takes a hg - revision identifier and defaults to 0. + convert start revision and its descendants. It takes a hg + revision identifier and defaults to 0. CVS Source '''''''''' @@ -153,36 +154,35 @@ The following options can be used with "--config": convert.cvsps.cache - Set to False to disable remote log caching, for testing and - debugging purposes. Default is True. + Set to False to disable remote log caching, for testing and + debugging purposes. Default is True. convert.cvsps.fuzz - Specify the maximum time (in seconds) that is allowed between - commits with identical user and log message in a single - changeset. When very large files were checked in as part of a - changeset then the default may not be long enough. The default - is 60. + Specify the maximum time (in seconds) that is allowed + between commits with identical user and log message in a + single changeset. When very large files were checked in as + part of a changeset then the default may not be long enough. + The default is 60. convert.cvsps.mergeto - Specify a regular expression to which commit log messages are - matched. If a match occurs, then the conversion process will - insert a dummy revision merging the branch on which this log - message occurs to the branch indicated in the regex. Default - is "{{mergetobranch ([-\w]+)}}" + Specify a regular expression to which commit log messages + are matched. If a match occurs, then the conversion process + will insert a dummy revision merging the branch on which + this log message occurs to the branch indicated in the + regex. Default is "{{mergetobranch ([-\w]+)}}" convert.cvsps.mergefrom - Specify a regular expression to which commit log messages are - matched. If a match occurs, then the conversion process will - add the most recent revision on the branch indicated in the - regex as the second parent of the changeset. Default is - "{{mergefrombranch ([-\w]+)}}" - hook.cvslog - Specify a Python function to be called at the end of gathering - the CVS log. The function is passed a list with the log - entries, and can modify the entries in-place, or add or delete - them. + Specify a regular expression to which commit log messages + are matched. If a match occurs, then the conversion process + will add the most recent revision on the branch indicated in + the regex as the second parent of the changeset. Default is + "{{mergefrombranch ([-\w]+)}}" + hook.cvslog Specify a Python function to be called at the end of + gathering the CVS log. The function is passed a list with + the log entries, and can modify the entries in-place, or add + or delete them. hook.cvschangesets - Specify a Python function to be called after the changesets - are calculated from the the CVS log. The function is passed a - list with the changeset entries, and can modify the changesets - in-place, or add or delete them. + Specify a Python function to be called after the changesets + are calculated from the the CVS log. The function is passed + a list with the changeset entries, and can modify the + changesets in-place, or add or delete them. An additional "debugcvsps" Mercurial command allows the builtin changeset merging code to be run without doing a conversion. Its parameters and @@ -205,19 +205,21 @@ The following options can be set with "--config": convert.svn.branches - specify the directory containing branches. The default is - "branches". + specify the directory containing branches. The default is + "branches". convert.svn.tags - specify the directory containing tags. The default is "tags". + specify the directory containing tags. The default is + "tags". convert.svn.trunk - specify the name of the trunk branch. The default is "trunk". + specify the name of the trunk branch. The default is + "trunk". Source history can be retrieved starting at a specific revision, instead of being integrally converted. Only single branch conversions are supported. convert.svn.startrev - specify start Subversion revision number. The default is 0. + specify start Subversion revision number. The default is 0. Perforce Source ''''''''''''''' @@ -232,8 +234,8 @@ specifying an initial Perforce revision: convert.p4.startrev - specify initial Perforce revision (a Perforce changelist - number). + specify initial Perforce revision (a Perforce changelist + number). Mercurial Destination ''''''''''''''''''''' @@ -241,12 +243,12 @@ The following options are supported: convert.hg.clonebranches - dispatch source branches in separate clones. The default is - False. + dispatch source branches in separate clones. The default is + False. convert.hg.tagsbranch - branch name for tag revisions, defaults to "default". + branch name for tag revisions, defaults to "default". convert.hg.usebranchnames - preserve branch names. The default is True. + preserve branch names. The default is True. options:
--- a/tests/test-extension.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-extension.t Fri Jan 13 11:29:40 2012 -0600 @@ -327,7 +327,7 @@ list of commands: - extdiff use external program to diff repository (or selected files) + extdiff use external program to diff repository (or selected files) use "hg -v help extdiff" to show builtin aliases and global options @@ -419,14 +419,14 @@ $ hg help email 'email' is provided by the following extension: - patchbomb command to send changesets as (a series of) patch emails + patchbomb command to send changesets as (a series of) patch emails use "hg help extensions" for information on enabling extensions $ hg qdel hg: unknown command 'qdel' 'qdelete' is provided by the following extension: - mq manage a stack of patches + mq manage a stack of patches use "hg help extensions" for information on enabling extensions [255] @@ -434,7 +434,7 @@ hg: unknown command 'churn' 'churn' is provided by the following extension: - churn command to display statistics about repository history + churn command to display statistics about repository history use "hg help extensions" for information on enabling extensions [255]
--- a/tests/test-globalopts.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-globalopts.t Fri Jan 13 11:29:40 2012 -0600 @@ -279,79 +279,79 @@ list of commands: - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - bookmarks track a line of development with movable markers - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - graft copy changes from other branches onto the current branch - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore files to their checkout state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information by line for each file + archive create an unversioned archive of a repository revision + backout reverse effect of earlier changeset + bisect subdivision search of changesets + bookmarks track a line of development with movable markers + branch set or show the current branch name + branches list repository named branches + bundle create a changegroup file + cat output the current or given revision of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + graft copy changes from other branches onto the current branch + grep search for a pattern in specified files and revisions + heads show current repository heads or show branch heads + help show help for a given topic or a help overview + identify identify the working copy or specified revision + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the current or given revision of the project manifest + merge merge working directory with another revision + outgoing show changesets not found in the destination + parents show the parents of the working directory or revision + paths show aliases for remote repositories + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + resolve redo merges or set/view the merge status of files + revert restore files to their checkout state + rollback roll back the last transaction (dangerous) + root print the root (top) of the current working directory + serve start stand-alone webserver + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + summary summarize working directory state + tag add one or more tags for the current or given revision + tags list repository tags + tip show the tip revision + unbundle apply one or more changegroup files + update update working directory (or switch revisions) + verify verify the integrity of the repository + version output version and copyright information additional help topics: - config Configuration Files - dates Date Formats - diffs Diff Formats - environment Environment Variables - extensions Using additional features - filesets Specifying File Sets - glossary Glossary - hgignore syntax for Mercurial ignore files - hgweb Configuring hgweb - merge-tools Merge Tools - multirevs Specifying Multiple Revisions - patterns File Name Patterns - revisions Specifying Single Revisions - revsets Specifying Revision Sets - subrepos Subrepositories - templating Template Usage - urls URL Paths + config Configuration Files + dates Date Formats + diffs Diff Formats + environment Environment Variables + extensions Using additional features + filesets Specifying File Sets + glossary Glossary + hgignore syntax for Mercurial ignore files + hgweb Configuring hgweb + merge-tools Merge Tools + multirevs Specifying Multiple Revisions + patterns File Name Patterns + revisions Specifying Single Revisions + revsets Specifying Revision Sets + subrepos Subrepositories + templating Template Usage + urls URL Paths use "hg -v help" to show builtin aliases and global options @@ -362,79 +362,79 @@ list of commands: - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - bookmarks track a line of development with movable markers - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - graft copy changes from other branches onto the current branch - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore files to their checkout state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information by line for each file + archive create an unversioned archive of a repository revision + backout reverse effect of earlier changeset + bisect subdivision search of changesets + bookmarks track a line of development with movable markers + branch set or show the current branch name + branches list repository named branches + bundle create a changegroup file + cat output the current or given revision of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + graft copy changes from other branches onto the current branch + grep search for a pattern in specified files and revisions + heads show current repository heads or show branch heads + help show help for a given topic or a help overview + identify identify the working copy or specified revision + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the current or given revision of the project manifest + merge merge working directory with another revision + outgoing show changesets not found in the destination + parents show the parents of the working directory or revision + paths show aliases for remote repositories + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + resolve redo merges or set/view the merge status of files + revert restore files to their checkout state + rollback roll back the last transaction (dangerous) + root print the root (top) of the current working directory + serve start stand-alone webserver + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + summary summarize working directory state + tag add one or more tags for the current or given revision + tags list repository tags + tip show the tip revision + unbundle apply one or more changegroup files + update update working directory (or switch revisions) + verify verify the integrity of the repository + version output version and copyright information additional help topics: - config Configuration Files - dates Date Formats - diffs Diff Formats - environment Environment Variables - extensions Using additional features - filesets Specifying File Sets - glossary Glossary - hgignore syntax for Mercurial ignore files - hgweb Configuring hgweb - merge-tools Merge Tools - multirevs Specifying Multiple Revisions - patterns File Name Patterns - revisions Specifying Single Revisions - revsets Specifying Revision Sets - subrepos Subrepositories - templating Template Usage - urls URL Paths + config Configuration Files + dates Date Formats + diffs Diff Formats + environment Environment Variables + extensions Using additional features + filesets Specifying File Sets + glossary Glossary + hgignore syntax for Mercurial ignore files + hgweb Configuring hgweb + merge-tools Merge Tools + multirevs Specifying Multiple Revisions + patterns File Name Patterns + revisions Specifying Single Revisions + revsets Specifying Revision Sets + subrepos Subrepositories + templating Template Usage + urls URL Paths use "hg -v help" to show builtin aliases and global options
--- a/tests/test-help.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-help.t Fri Jan 13 11:29:40 2012 -0600 @@ -5,202 +5,202 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details $ hg -q - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) $ hg help Mercurial Distributed SCM list of commands: - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - bookmarks track a line of development with movable markers - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - graft copy changes from other branches onto the current branch - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore files to their checkout state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information by line for each file + archive create an unversioned archive of a repository revision + backout reverse effect of earlier changeset + bisect subdivision search of changesets + bookmarks track a line of development with movable markers + branch set or show the current branch name + branches list repository named branches + bundle create a changegroup file + cat output the current or given revision of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + graft copy changes from other branches onto the current branch + grep search for a pattern in specified files and revisions + heads show current repository heads or show branch heads + help show help for a given topic or a help overview + identify identify the working copy or specified revision + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the current or given revision of the project manifest + merge merge working directory with another revision + outgoing show changesets not found in the destination + parents show the parents of the working directory or revision + paths show aliases for remote repositories + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + resolve redo merges or set/view the merge status of files + revert restore files to their checkout state + rollback roll back the last transaction (dangerous) + root print the root (top) of the current working directory + serve start stand-alone webserver + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + summary summarize working directory state + tag add one or more tags for the current or given revision + tags list repository tags + tip show the tip revision + unbundle apply one or more changegroup files + update update working directory (or switch revisions) + verify verify the integrity of the repository + version output version and copyright information additional help topics: - config Configuration Files - dates Date Formats - diffs Diff Formats - environment Environment Variables - extensions Using additional features - filesets Specifying File Sets - glossary Glossary - hgignore syntax for Mercurial ignore files - hgweb Configuring hgweb - merge-tools Merge Tools - multirevs Specifying Multiple Revisions - patterns File Name Patterns - revisions Specifying Single Revisions - revsets Specifying Revision Sets - subrepos Subrepositories - templating Template Usage - urls URL Paths + config Configuration Files + dates Date Formats + diffs Diff Formats + environment Environment Variables + extensions Using additional features + filesets Specifying File Sets + glossary Glossary + hgignore syntax for Mercurial ignore files + hgweb Configuring hgweb + merge-tools Merge Tools + multirevs Specifying Multiple Revisions + patterns File Name Patterns + revisions Specifying Single Revisions + revsets Specifying Revision Sets + subrepos Subrepositories + templating Template Usage + urls URL Paths use "hg -v help" to show builtin aliases and global options $ hg -q help - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - bookmarks track a line of development with movable markers - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - graft copy changes from other branches onto the current branch - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore files to their checkout state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information by line for each file + archive create an unversioned archive of a repository revision + backout reverse effect of earlier changeset + bisect subdivision search of changesets + bookmarks track a line of development with movable markers + branch set or show the current branch name + branches list repository named branches + bundle create a changegroup file + cat output the current or given revision of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + graft copy changes from other branches onto the current branch + grep search for a pattern in specified files and revisions + heads show current repository heads or show branch heads + help show help for a given topic or a help overview + identify identify the working copy or specified revision + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the current or given revision of the project manifest + merge merge working directory with another revision + outgoing show changesets not found in the destination + parents show the parents of the working directory or revision + paths show aliases for remote repositories + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + resolve redo merges or set/view the merge status of files + revert restore files to their checkout state + rollback roll back the last transaction (dangerous) + root print the root (top) of the current working directory + serve start stand-alone webserver + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + summary summarize working directory state + tag add one or more tags for the current or given revision + tags list repository tags + tip show the tip revision + unbundle apply one or more changegroup files + update update working directory (or switch revisions) + verify verify the integrity of the repository + version output version and copyright information additional help topics: - config Configuration Files - dates Date Formats - diffs Diff Formats - environment Environment Variables - extensions Using additional features - filesets Specifying File Sets - glossary Glossary - hgignore syntax for Mercurial ignore files - hgweb Configuring hgweb - merge-tools Merge Tools - multirevs Specifying Multiple Revisions - patterns File Name Patterns - revisions Specifying Single Revisions - revsets Specifying Revision Sets - subrepos Subrepositories - templating Template Usage - urls URL Paths + config Configuration Files + dates Date Formats + diffs Diff Formats + environment Environment Variables + extensions Using additional features + filesets Specifying File Sets + glossary Glossary + hgignore syntax for Mercurial ignore files + hgweb Configuring hgweb + merge-tools Merge Tools + multirevs Specifying Multiple Revisions + patterns File Name Patterns + revisions Specifying Single Revisions + revsets Specifying Revision Sets + subrepos Subrepositories + templating Template Usage + urls URL Paths Test short command list with verbose option @@ -387,8 +387,8 @@ $ hg help ad list of commands: - add add the specified files on the next commit - addremove add all new files, delete all missing files + add add the specified files on the next commit + addremove add all new files, delete all missing files use "hg -v help ad" to show builtin aliases and global options @@ -537,24 +537,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details [255] @@ -565,24 +565,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details [255] @@ -619,83 +619,83 @@ list of commands: - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - bookmarks track a line of development with movable markers - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - graft copy changes from other branches onto the current branch - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore files to their checkout state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information by line for each file + archive create an unversioned archive of a repository revision + backout reverse effect of earlier changeset + bisect subdivision search of changesets + bookmarks track a line of development with movable markers + branch set or show the current branch name + branches list repository named branches + bundle create a changegroup file + cat output the current or given revision of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + graft copy changes from other branches onto the current branch + grep search for a pattern in specified files and revisions + heads show current repository heads or show branch heads + help show help for a given topic or a help overview + identify identify the working copy or specified revision + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the current or given revision of the project manifest + merge merge working directory with another revision + outgoing show changesets not found in the destination + parents show the parents of the working directory or revision + paths show aliases for remote repositories + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + resolve redo merges or set/view the merge status of files + revert restore files to their checkout state + rollback roll back the last transaction (dangerous) + root print the root (top) of the current working directory + serve start stand-alone webserver + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + summary summarize working directory state + tag add one or more tags for the current or given revision + tags list repository tags + tip show the tip revision + unbundle apply one or more changegroup files + update update working directory (or switch revisions) + verify verify the integrity of the repository + version output version and copyright information enabled extensions: - helpext (no help text available) + helpext (no help text available) additional help topics: - config Configuration Files - dates Date Formats - diffs Diff Formats - environment Environment Variables - extensions Using additional features - filesets Specifying File Sets - glossary Glossary - hgignore syntax for Mercurial ignore files - hgweb Configuring hgweb - merge-tools Merge Tools - multirevs Specifying Multiple Revisions - patterns File Name Patterns - revisions Specifying Single Revisions - revsets Specifying Revision Sets - subrepos Subrepositories - templating Template Usage - urls URL Paths + config Configuration Files + dates Date Formats + diffs Diff Formats + environment Environment Variables + extensions Using additional features + filesets Specifying File Sets + glossary Glossary + hgignore syntax for Mercurial ignore files + hgweb Configuring hgweb + merge-tools Merge Tools + multirevs Specifying Multiple Revisions + patterns File Name Patterns + revisions Specifying Single Revisions + revsets Specifying Revision Sets + subrepos Subrepositories + templating Template Usage + urls URL Paths use "hg -v help" to show builtin aliases and global options @@ -708,7 +708,7 @@ list of commands: - nohelp (no help text available) + nohelp (no help text available) use "hg -v help helpext" to show builtin aliases and global options @@ -748,10 +748,10 @@ Test templating help $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) ' - desc String. The text of the changeset description. - diffstat String. Statistics of changes with the following format: - firstline Any text. Returns the first line of text. - nonempty Any text. Returns '(none)' if the string is empty. + desc String. The text of the changeset description. + diffstat String. Statistics of changes with the following format: + firstline Any text. Returns the first line of text. + nonempty Any text. Returns '(none)' if the string is empty. Test help hooks
--- a/tests/test-minirst.py.out Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-minirst.py.out Fri Jan 13 11:29:40 2012 -0600 @@ -414,35 +414,37 @@ == fields == 60 column format: ---------------------------------------------------------------------- -a First item. -ab Second item. Indentation and wrapping is handled - automatically. +a First item. +ab Second item. Indentation and wrapping is + handled automatically. Next list: -small The larger key below triggers full indentation - here. +small The larger key below triggers full indentation + here. much too large - This key is big enough to get its own line. + This key is big enough to get its own line. ---------------------------------------------------------------------- 30 column format: ---------------------------------------------------------------------- -a First item. -ab Second item. Indentation - and wrapping is handled - automatically. +a First item. +ab Second item. + Indentation and + wrapping is + handled + automatically. Next list: -small The larger key - below triggers - full indentation - here. +small The larger key + below triggers + full indentation + here. much too large - This key is big - enough to get its - own line. + This key is big + enough to get + its own line. ---------------------------------------------------------------------- html format:
--- a/tests/test-mq.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-mq.t Fri Jan 13 11:29:40 2012 -0600 @@ -55,29 +55,29 @@ list of commands: - qapplied print the patches already applied - qclone clone main and patch repository at same time - qdelete remove patches from queue - qdiff diff of the current patch and subsequent modifications - qfinish move applied patches into repository history - qfold fold the named patches into the current patch - qgoto push or pop patches until named patch is at top of stack - qguard set or print guards for a patch - qheader print the header of the topmost or specified patch - qimport import a patch - qnew create a new patch - qnext print the name of the next patch - qpop pop the current patch off the stack - qprev print the name of the previous patch - qpush push the next patch onto the stack - qqueue manage multiple patch queues - qrefresh update the current patch - qrename rename a patch - qselect set or print guarded patches to push - qseries print the entire series file - qtop print the name of the current patch - qunapplied print the patches not yet applied - strip strip changesets and all their descendants from the repository + qapplied print the patches already applied + qclone clone main and patch repository at same time + qdelete remove patches from queue + qdiff diff of the current patch and subsequent modifications + qfinish move applied patches into repository history + qfold fold the named patches into the current patch + qgoto push or pop patches until named patch is at top of stack + qguard set or print guards for a patch + qheader print the header of the topmost or specified patch + qimport import a patch + qnew create a new patch + qnext print the name of the next patch + qpop pop the current patch off the stack + qprev print the name of the previous patch + qpush push the next patch onto the stack + qqueue manage multiple patch queues + qrefresh update the current patch + qrename rename a patch + qselect set or print guarded patches to push + qseries print the entire series file + qtop print the name of the current patch + qunapplied print the patches not yet applied + strip strip changesets and all their descendants from the repository use "hg -v help mq" to show builtin aliases and global options
--- a/tests/test-qrecord.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-qrecord.t Fri Jan 13 11:29:40 2012 -0600 @@ -15,7 +15,7 @@ $ hg help qrecord 'qrecord' is provided by the following extension: - record commands to interactively select changes for commit/qrefresh + record commands to interactively select changes for commit/qrefresh use "hg help extensions" for information on enabling extensions
--- a/tests/test-strict.t Thu Jan 12 17:50:48 2012 +0700 +++ b/tests/test-strict.t Fri Jan 13 11:29:40 2012 -0600 @@ -16,24 +16,24 @@ basic commands: - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - phase set or show the current phase name - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + phase set or show the current phase name + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details [255]