Mercurial > hg
view tests/test-extension.out @ 10397:8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.
This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:
* Resolve conflicts found when qpushing to a new location by merging
instead of simply showing rejects.
* Display better diffs of versioned MQ patches because we can tell how the
patched files have changed in the meantime.
Here are the new rules this patch introduces. They are checked in this order:
* If a patch currently has old, plain-style patch headers ("From:" and
"Date:") do not change the style or add any new headers.
* If the 'mq.plain' configuration setting is true, only plain-style
headers will be used for all MQ patches.
* qnew will initialize new patches with HG-style headers and fill in the
"# Parent" header with the appropriate parent node.
* qrefresh will refresh the "# Parent" header with the current parent of
the current patch.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sun, 07 Feb 2010 10:47:54 -0500 |
parents | de1e7099d100 |
children | fac67f0bfbb2 |
line wrap: on
line source
uisetup called reposetup called for a ui == repo.ui Foo uisetup called reposetup called for a ui == repo.ui reposetup called for b ui == repo.ui updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved uisetup called Bar % module/__init__.py-style uisetup called reposetup called for a ui == repo.ui Foo 1) foo imported 1) bar imported 2) foo uisetup 2) bar uisetup 3) foo extsetup 3) bar extsetup 4) foo reposetup 4) bar reposetup % hgweb.cgi 1) foo imported 1) bar imported 2) foo uisetup 2) bar uisetup 3) foo extsetup 3) bar extsetup 4) foo reposetup 4) bar reposetup 4) foo reposetup 4) bar reposetup empty extension - empty cmdtable no commands defined % hg help debugextension extension - only debugcommands no commands defined % hg help --verbose debugextension extension - only debugcommands list of commands: foo: yet another foo command global options: -R --repository repository root directory or name of overlay bundle file --cwd change working directory -y --noninteractive do not prompt, assume 'yes' for any required answers -q --quiet suppress output -v --verbose enable additional output --config set/override config option --debug enable debugging output --debugger start debugger --encoding set the charset encoding (default: ascii) --encodingmode set the charset encoding mode (default: strict) --traceback always print a traceback on exception --time time how long the command takes --profile print command execution profile --version output version information and exit -h --help display help and exit % hg help --debug debugextension extension - only debugcommands list of commands: debugfoobar: yet another debug command foo: yet another foo command global options: -R --repository repository root directory or name of overlay bundle file --cwd change working directory -y --noninteractive do not prompt, assume 'yes' for any required answers -q --quiet suppress output -v --verbose enable additional output --config set/override config option --debug enable debugging output --debugger start debugger --encoding set the charset encoding (default: ascii) --encodingmode set the charset encoding mode (default: strict) --traceback always print a traceback on exception --time time how long the command takes --profile print command execution profile --version output version information and exit -h --help display help and exit % issue811 % show extensions debugissue811 mq % disabled extension commands 'email' is provided by the following extension: patchbomb command to send changesets as (a series of) patch emails use "hg help extensions" for information on enabling extensions hg: unknown command 'qdel' 'qdelete' is provided by the following extension: mq manage a stack of patches use "hg help extensions" for information on enabling extensions hg: unknown command 'churn' 'churn' is provided by the following extension: churn command to display statistics about repository history use "hg help extensions" for information on enabling extensions % disabled extensions churn extension - command to display statistics about repository history use "hg help extensions" for information on enabling extensions patchbomb extension - command to send changesets as (a series of) patch emails use "hg help extensions" for information on enabling extensions % broken disabled extension and command broken extension - (no help text available) use "hg help extensions" for information on enabling extensions hg: unknown command 'foo'