comparison ja/mq.tex @ 335:2a8c05da3fae

more mq.tex

334:4ffdaa0773a3

\end{figure}

%\subsection{Safety checks, and overriding them}
\subsection{$B0BA4@-%A%'%C%/$H%*!<%P%i%$%I(B}

Several MQ commands check the working directory before they do
anything, and fail if they find any modifications.  They do this to
ensure that you won't lose any changes that you have made, but not yet
incorporated into a patch.  Figure~\ref{ex:mq:add} illustrates this;
the \hgxcmd{mq}{qnew} command will not create a new patch if there are
outstanding changes, caused in this case by the \hgcmd{add} of
\filename{file3}.

\begin{figure}[ht]
  \interaction{mq.tutorial.add}
  \caption{Forcibly creating a patch}
  \label{ex:mq:add}
\end{figure}

Commands that check the working directory all take an ``I know what
I'm doing'' option, which is always named \option{-f}.  The exact
meaning of \option{-f} depends on the command.  For example,
\hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}} will incorporate any outstanding
changes into the new patch it creates, but
\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-f}} will revert modifications to any
files affected by the patch that it is popping.  Be sure to read the
documentation for a command's \option{-f} option before you use it!

%\subsection{Working on several patches at once}
\subsection{$BJ#?t$N%Q%C%A$r0lEY$K07$&(B}

The \hgxcmd{mq}{qrefresh} command always refreshes the \emph{topmost}
applied patch.  This means that you can suspend work on one patch (by
refreshing it), pop or push to make a different patch the top, and
work on \emph{that} patch for a while.

Here's an example that illustrates how you can use this ability.
Let's say you're developing a new feature as two patches.  The first
is a change to the core of your software, and the second---layered on
top of the first---changes the user interface to use the code you just
added to the core.  If you notice a bug in the core while you're
working on the UI patch, it's easy to fix the core.  Simply
\hgxcmd{mq}{qrefresh} the UI patch to save your in-progress changes, and
\hgxcmd{mq}{qpop} down to the core patch.  Fix the core bug,
\hgxcmd{mq}{qrefresh} the core patch, and \hgxcmd{mq}{qpush} back to the UI
patch to continue where you left off.

%\section{More about patches}
\section{$B$5$i$K%Q%C%A$K$D$$$F(B}
\label{sec:mq:adv-patch}

335:2a8c05da3fae

\end{figure}

%\subsection{Safety checks, and overriding them}
\subsection{$B0BA4@-%A%'%C%/$H%*!<%P%i%$%I(B}

%Several MQ commands check the working directory before they do
%anything, and fail if they find any modifications.  They do this to
%ensure that you won't lose any changes that you have made, but not yet
%incorporated into a patch.Figure~\ref{ex:mq:add} illustrates this;
%the \hgxcmd{mq}{qnew} command will not create a new patch if there are
%outstanding changes, caused in this case by the \hgcmd{add} of
%\filename{file3}.

$B$$$/$D$+$N(BMQ$B%3%^%s%I$O!$<B9T;~$K$^$:%o!<%-%s%0%G%#%l%/%H%j$r%A%'%C%/$7!$(B
$BJQ99$,$J$5$l$F$$$?$i=*N;$9$k$h$&$K$J$C$F$$$k!%$3$l$O!$%f!<%6$N$^$@%Q%C%A(B
$B$K<h$j9~$^$l$F$$$J$$JQ99$,<:$o$l$J$$$h$&$K$9$k$?$a$G$"$k!%(B
$B?^(B~\ref{ex:mq:add}$B$O$3$l$r@bL@$7$?$b$N$G!$(B\hgxcmd{mq}{qnew}$B%3%^%s%I$O8IN)(B
$B$7$?JQ99$,$"$k;~$K?7$?$J%Q%C%A$r@8@.$7$J$$!%$3$NNc$G$O!$JQ99$O(B
\hgcmd{add}$B$K$h$k(B\filename{file3}$B$NDI2C$K$h$C$F@8$^$l$F$$$k!%(B

\begin{figure}[ht]
  \interaction{mq.tutorial.add}
%  \caption{Forcibly creating a patch}
  \caption{$B%Q%C%A$N6/@)E*$J@8@.(B}
  \label{ex:mq:add}
\end{figure}

%Commands that check the working directory all take an ``I know what
%I'm doing'' option, which is always named \option{-f}.  The exact
%meaning of \option{-f} depends on the command.  For example,
%\hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}} will incorporate any outstanding
%changes into the new patch it creates, but
%\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-f}} will revert modifications to any
%files affected by the patch that it is popping.  Be sure to read the
%documentation for a command's \option{-f} option before you use it!

$B%o!<%-%s%0%G%#%l%/%H%j$N%A%'%C%/$r9T$J$&%3%^%s%I$OA4$F!$>e5i<T8~$1$N6/@)(B
$B%*%W%7%g%s(B\option{-f}$B$r;}$C$F$$$k!%(B\option{-f}$B$N87L)$J0UL#$O!$%3%^%s%I$K(B
$B$h$C$F0[$J$k!%Nc$($P(B\hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}}$B$O8IN)$7$?JQ(B
$B99$r?7$7$$%Q%C%A$K<h$j9~$`$H$$$&0UL#$@$,!$(B
\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-f}}$B$O!$%]%C%W$9$k%Q%C%A$K$h$k$"$i$f(B
$B$k%U%!%$%k$X$NJQ99$r<h$j>C$9$H$$$&0UL#$K$J$k!%(B\option{-f}$B%*%W%7%g%s$r;H(B
$B$&;~$OI,$:;vA0$K%3%^%s%I$N%I%-%e%a%s%H$rFI$s$G3NG'$9$k$h$&$K$7$FM_$7$$!%(B

%\subsection{Working on several patches at once}
\subsection{$BJ#?t$N%Q%C%A$r0lEY$K07$&(B}

%The \hgxcmd{mq}{qrefresh} command always refreshes the \emph{topmost}
%applied patch.  This means that you can suspend work on one patch (by
%refreshing it), pop or push to make a different patch the top, and
%work on \emph{that} patch for a while.

\hgxcmd{mq}{qrefresh}$B%3%^%s%I$O(B\emph{$B:G$b>e(B}$B$KE,MQ$5$l$?%Q%C%A$KBP$7$F%j(B
$B%U%l%C%7%e$r9T$J$&!%$3$l$O%j%U%l%C%7%e$K$h$C$F(B1$B$D$N%Q%C%A$K8=:_$N:n6H$r%5(B
$B%9%Z%s%I$7$?$j!$JL$N%H%C%W%Q%C%A$d0l;~E*$K:n6H$9$k$?$a%Q%C%A$r:n$k$?$a$K(B
$B%]%C%W$d%W%C%7%e$,$G$-$k$H$$$&$3$H$r0UL#$9$k!%(B

%Here's an example that illustrates how you can use this ability.
%Let's say you're developing a new feature as two patches.  The first
%is a change to the core of your software, and the second---layered on
%top of the first---changes the user interface to use the code you just
%added to the core.  If you notice a bug in the core while you're
%working on the UI patch, it's easy to fix the core.  Simply
%\hgxcmd{mq}{qrefresh} the UI patch to save your in-progress changes, and
%\hgxcmd{mq}{qpop} down to the core patch.  Fix the core bug,
%\hgxcmd{mq}{qrefresh} the core patch, and \hgxcmd{mq}{qpush} back to the UI
%patch to continue where you left off.

$B$3$N5!G=$N;H$$J}$r<($9Nc$r<($9!%(B2$B$D$N%Q%C%A$H$7$F?7$7$$5!G=$r3+H/$7$F$$$k(B
$B$H$9$k!%:G=i$N$b$N$O$"$J$?$N%=%U%H%&%'%"$N%3%"$rJQ99$7!$(B2$BHVL\$N$b$N$O(B1$BHV(B
$BL\$N$b$N$N>e$KE83+$9$k!$:#DI2C$7$?%3%"$N%3!<%I$r;H$C$?%f!<%6%$%s%?%U%'!<(B
$B%9$@$H$9$k!%(BUI$B%Q%C%A$G:n6HCf$K%3%"$N%P%0$K5$IU$$$?$H$9$k$H!$4JC1$K%3%"$N(B
$B=$@5$O9T$J$($k!%C1=c$K(B\hgxcmd{mq}{qrefresh}$B$K$h$C$F?J9TCf$N(BUI$B%Q%C%A$r%;!<(B
$B%V$7!$(B\hgxcmd{mq}{qpop}$B$K$h$C$F%3%"%Q%C%A$XAL$k!%%3%"$N%P%0$r=$@5$7$?8e(B
$B$K(B\hgxcmd{mq}{qrefresh}$B$r%3%"%Q%C%A$K$D$$$F9T$J$$!$(B\hgxcmd{mq}{qpush}$B$G(B
UI$B%Q%C%A$KLa$C$F:n6H$rB3$1$k!%(B

%\section{More about patches}
\section{$B$5$i$K%Q%C%A$K$D$$$F(B}
\label{sec:mq:adv-patch}