view en/mq-ref.tex @ 324:7dc8a24c70f4

more mq.tex

\chapter{Mercurial Queues reference}
\label{chap:mqref}

\section{MQ command reference}
\label{sec:mqref:cmdref}

For an overview of the commands provided by MQ, use the command
\hgcmdargs{help}{mq}.

\subsection{\hgxcmd{mq}{qapplied}---print applied patches}

The \hgxcmd{mq}{qapplied} command prints the current stack of applied
patches.  Patches are printed in oldest-to-newest order, so the last
patch in the list is the ``top'' patch.

\subsection{\hgxcmd{mq}{qcommit}---commit changes in the queue repository}

The \hgxcmd{mq}{qcommit} command commits any outstanding changes in the
\sdirname{.hg/patches} repository.  This command only works if the
\sdirname{.hg/patches} directory is a repository, i.e.~you created the
directory using \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} or ran
\hgcmd{init} in the directory after running \hgxcmd{mq}{qinit}.

This command is shorthand for \hgcmdargs{commit}{--cwd .hg/patches}.

\subsection{\hgxcmd{mq}{qdelete}---delete a patch from the
  \sfilename{series} file}

The \hgxcmd{mq}{qdelete} command removes the entry for a patch from the
\sfilename{series} file in the \sdirname{.hg/patches} directory.  It
does not pop the patch if the patch is already applied.  By default,
it does not delete the patch file; use the \hgxopt{mq}{qdel}{-f} option to
do that.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qdel}{-f}] Delete the patch file.
\end{itemize}

\subsection{\hgxcmd{mq}{qdiff}---print a diff of the topmost applied patch}

The \hgxcmd{mq}{qdiff} command prints a diff of the topmost applied patch.
It is equivalent to \hgcmdargs{diff}{-r-2:-1}.

\subsection{\hgxcmd{mq}{qfold}---merge (``fold'') several patches into one}

The \hgxcmd{mq}{qfold} command merges multiple patches into the topmost
applied patch, so that the topmost applied patch makes the union of
all of the changes in the patches in question.

The patches to fold must not be applied; \hgxcmd{mq}{qfold} will exit with
an error if any is.  The order in which patches are folded is
significant; \hgcmdargs{qfold}{a b} means ``apply the current topmost
patch, followed by \texttt{a}, followed by \texttt{b}''.

The comments from the folded patches are appended to the comments of
the destination patch, with each block of comments separated by three
asterisk (``\texttt{*}'') characters.  Use the \hgxopt{mq}{qfold}{-e}
option to edit the commit message for the combined patch/changeset
after the folding has completed.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qfold}{-e}] Edit the commit message and patch description
  for the newly folded patch.
\item[\hgxopt{mq}{qfold}{-l}] Use the contents of the given file as the new
  commit message and patch description for the folded patch.
\item[\hgxopt{mq}{qfold}{-m}] Use the given text as the new commit message
  and patch description for the folded patch.
\end{itemize}

\subsection{\hgxcmd{mq}{qheader}---display the header/description of a patch}

The \hgxcmd{mq}{qheader} command prints the header, or description, of a
patch.  By default, it prints the header of the topmost applied patch.
Given an argument, it prints the header of the named patch.

\subsection{\hgxcmd{mq}{qimport}---import a third-party patch into the queue}

The \hgxcmd{mq}{qimport} command adds an entry for an external patch to the
\sfilename{series} file, and copies the patch into the
\sdirname{.hg/patches} directory.  It adds the entry immediately after
the topmost applied patch, but does not push the patch.

If the \sdirname{.hg/patches} directory is a repository,
\hgxcmd{mq}{qimport} automatically does an \hgcmd{add} of the imported
patch.

\subsection{\hgxcmd{mq}{qinit}---prepare a repository to work with MQ}

The \hgxcmd{mq}{qinit} command prepares a repository to work with MQ.  It
creates a directory called \sdirname{.hg/patches}.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qinit}{-c}] Create \sdirname{.hg/patches} as a repository
  in its own right.  Also creates a \sfilename{.hgignore} file that
  will ignore the \sfilename{status} file.
\end{itemize}

When the \sdirname{.hg/patches} directory is a repository, the
\hgxcmd{mq}{qimport} and \hgxcmd{mq}{qnew} commands automatically \hgcmd{add}
new patches.

\subsection{\hgxcmd{mq}{qnew}---create a new patch}

The \hgxcmd{mq}{qnew} command creates a new patch.  It takes one mandatory
argument, the name to use for the patch file.  The newly created patch
is created empty by default.  It is added to the \sfilename{series}
file after the current topmost applied patch, and is immediately
pushed on top of that patch.

If \hgxcmd{mq}{qnew} finds modified files in the working directory, it will
refuse to create a new patch unless the \hgxopt{mq}{qnew}{-f} option is
used (see below).  This behaviour allows you to \hgxcmd{mq}{qrefresh} your
topmost applied patch before you apply a new patch on top of it.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qnew}{-f}] Create a new patch if the contents of the
  working directory are modified.  Any outstanding modifications are
  added to the newly created patch, so after this command completes,
  the working directory will no longer be modified.
\item[\hgxopt{mq}{qnew}{-m}] Use the given text as the commit message.
  This text will be stored at the beginning of the patch file, before
  the patch data.
\end{itemize}

\subsection{\hgxcmd{mq}{qnext}---print the name of the next patch}

The \hgxcmd{mq}{qnext} command prints the name name of the next patch in
the \sfilename{series} file after the topmost applied patch.  This
patch will become the topmost applied patch if you run \hgxcmd{mq}{qpush}.

\subsection{\hgxcmd{mq}{qpop}---pop patches off the stack}

The \hgxcmd{mq}{qpop} command removes applied patches from the top of the
stack of applied patches.  By default, it removes only one patch.

This command removes the changesets that represent the popped patches
from the repository, and updates the working directory to undo the
effects of the patches.

This command takes an optional argument, which it uses as the name or
index of the patch to pop to.  If given a name, it will pop patches
until the named patch is the topmost applied patch.  If given a
number, \hgxcmd{mq}{qpop} treats the number as an index into the entries in
the series file, counting from zero (empty lines and lines containing
only comments do not count).  It pops patches until the patch
identified by the given index is the topmost applied patch.

The \hgxcmd{mq}{qpop} command does not read or write patches or the
\sfilename{series} file.  It is thus safe to \hgxcmd{mq}{qpop} a patch that
you have removed from the \sfilename{series} file, or a patch that you
have renamed or deleted entirely.  In the latter two cases, use the
name of the patch as it was when you applied it.

By default, the \hgxcmd{mq}{qpop} command will not pop any patches if the
working directory has been modified.  You can override this behaviour
using the \hgxopt{mq}{qpop}{-f} option, which reverts all modifications in
the working directory.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qpop}{-a}] Pop all applied patches.  This returns the
  repository to its state before you applied any patches.
\item[\hgxopt{mq}{qpop}{-f}] Forcibly revert any modifications to the
  working directory when popping.
\item[\hgxopt{mq}{qpop}{-n}] Pop a patch from the named queue.
\end{itemize}

The \hgxcmd{mq}{qpop} command removes one line from the end of the
\sfilename{status} file for each patch that it pops.

\subsection{\hgxcmd{mq}{qprev}---print the name of the previous patch}

The \hgxcmd{mq}{qprev} command prints the name of the patch in the
\sfilename{series} file that comes before the topmost applied patch.
This will become the topmost applied patch if you run \hgxcmd{mq}{qpop}.

\subsection{\hgxcmd{mq}{qpush}---push patches onto the stack}
\label{sec:mqref:cmd:qpush}

The \hgxcmd{mq}{qpush} command adds patches onto the applied stack.  By
default, it adds only one patch.

This command creates a new changeset to represent each applied patch,
and updates the working directory to apply the effects of the patches.

The default data used when creating a changeset are as follows:
\begin{itemize}
\item The commit date and time zone are the current date and time
  zone.  Because these data are used to compute the identity of a
  changeset, this means that if you \hgxcmd{mq}{qpop} a patch and
  \hgxcmd{mq}{qpush} it again, the changeset that you push will have a
  different identity than the changeset you popped.
\item The author is the same as the default used by the \hgcmd{commit}
  command.
\item The commit message is any text from the patch file that comes
  before the first diff header.  If there is no such text, a default
  commit message is used that identifies the name of the patch.
\end{itemize}
If a patch contains a Mercurial patch header (XXX add link), the
information in the patch header overrides these defaults.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qpush}{-a}] Push all unapplied patches from the
  \sfilename{series} file until there are none left to push.
\item[\hgxopt{mq}{qpush}{-l}] Add the name of the patch to the end
  of the commit message.
\item[\hgxopt{mq}{qpush}{-m}] If a patch fails to apply cleanly, use the
  entry for the patch in another saved queue to compute the parameters
  for a three-way merge, and perform a three-way merge using the
  normal Mercurial merge machinery.  Use the resolution of the merge
  as the new patch content.
\item[\hgxopt{mq}{qpush}{-n}] Use the named queue if merging while pushing.
\end{itemize}

The \hgxcmd{mq}{qpush} command reads, but does not modify, the
\sfilename{series} file.  It appends one line to the \hgcmd{status}
file for each patch that it pushes.

\subsection{\hgxcmd{mq}{qrefresh}---update the topmost applied patch}

The \hgxcmd{mq}{qrefresh} command updates the topmost applied patch.  It
modifies the patch, removes the old changeset that represented the
patch, and creates a new changeset to represent the modified patch.

The \hgxcmd{mq}{qrefresh} command looks for the following modifications:
\begin{itemize}
\item Changes to the commit message, i.e.~the text before the first
  diff header in the patch file, are reflected in the new changeset
  that represents the patch.
\item Modifications to tracked files in the working directory are
  added to the patch.
\item Changes to the files tracked using \hgcmd{add}, \hgcmd{copy},
  \hgcmd{remove}, or \hgcmd{rename}.  Added files and copy and rename
  destinations are added to the patch, while removed files and rename
  sources are removed.
\end{itemize}

Even if \hgxcmd{mq}{qrefresh} detects no changes, it still recreates the
changeset that represents the patch.  This causes the identity of the
changeset to differ from the previous changeset that identified the
patch.

Options:
\begin{itemize}
\item[\hgxopt{mq}{qrefresh}{-e}] Modify the commit and patch description,
  using the preferred text editor.
\item[\hgxopt{mq}{qrefresh}{-m}] Modify the commit message and patch
  description, using the given text.
\item[\hgxopt{mq}{qrefresh}{-l}] Modify the commit message and patch
  description, using text from the given file.
\end{itemize}

\subsection{\hgxcmd{mq}{qrename}---rename a patch}

The \hgxcmd{mq}{qrename} command renames a patch, and changes the entry for
the patch in the \sfilename{series} file.

With a single argument, \hgxcmd{mq}{qrename} renames the topmost applied
patch.  With two arguments, it renames its first argument to its
second.

\subsection{\hgxcmd{mq}{qrestore}---restore saved queue state}

XXX No idea what this does.

\subsection{\hgxcmd{mq}{qsave}---save current queue state}

XXX Likewise.

\subsection{\hgxcmd{mq}{qseries}---print the entire patch series}

The \hgxcmd{mq}{qseries} command prints the entire patch series from the
\sfilename{series} file.  It prints only patch names, not empty lines
or comments.  It prints in order from first to be applied to last.

\subsection{\hgxcmd{mq}{qtop}---print the name of the current patch}

The \hgxcmd{mq}{qtop} prints the name of the topmost currently applied
patch.

\subsection{\hgxcmd{mq}{qunapplied}---print patches not yet applied}

The \hgxcmd{mq}{qunapplied} command prints the names of patches from the
\sfilename{series} file that are not yet applied.  It prints them in
order from the next patch that will be pushed to the last.

\subsection{\hgcmd{strip}---remove a revision and descendants}

The \hgcmd{strip} command removes a revision, and all of its
descendants, from the repository.  It undoes the effects of the
removed revisions from the repository, and updates the working
directory to the first parent of the removed revision.

The \hgcmd{strip} command saves a backup of the removed changesets in
a bundle, so that they can be reapplied if removed in error.

Options:
\begin{itemize}
\item[\hgopt{strip}{-b}] Save unrelated changesets that are intermixed
  with the stripped changesets in the backup bundle.
\item[\hgopt{strip}{-f}] If a branch has multiple heads, remove all
  heads. XXX This should be renamed, and use \texttt{-f} to strip revs
  when there are pending changes.
\item[\hgopt{strip}{-n}] Do not save a backup bundle.
\end{itemize}

\section{MQ file reference}

\subsection{The \sfilename{series} file}

The \sfilename{series} file contains a list of the names of all
patches that MQ can apply.  It is represented as a list of names, with
one name saved per line.  Leading and trailing white space in each
line are ignored.

Lines may contain comments.  A comment begins with the ``\texttt{\#}''
character, and extends to the end of the line.  Empty lines, and lines
that contain only comments, are ignored.

You will often need to edit the \sfilename{series} file by hand, hence
the support for comments and empty lines noted above.  For example,
you can comment out a patch temporarily, and \hgxcmd{mq}{qpush} will skip
over that patch when applying patches.  You can also change the order
in which patches are applied by reordering their entries in the
\sfilename{series} file.

Placing the \sfilename{series} file under revision control is also
supported; it is a good idea to place all of the patches that it
refers to under revision control, as well.  If you create a patch
directory using the \hgxopt{mq}{qinit}{-c} option to \hgxcmd{mq}{qinit}, this
will be done for you automatically.

\subsection{The \sfilename{status} file}

The \sfilename{status} file contains the names and changeset hashes of
all patches that MQ currently has applied.  Unlike the
\sfilename{series} file, this file is not intended for editing.  You
should not place this file under revision control, or modify it in any
way.  It is used by MQ strictly for internal book-keeping.

%%% Local Variables: 
%%% mode: latex
%%% TeX-master: "00book"
%%% End: