comparison ja/cmdref.tex @ 294:b2d447356c42

- completed cmdref.tex - minor temporal changes.

293:3b1291f24c0d

%Omit date and time information when printing diff headers.

diff$B%X%C%@$+$iF|IU$H;~4V>pJs$r>JN,$9$k!%(B

\optref{diff}{B}{ignore-blank-lines}

%Do not print changes that only insert or delete blank lines.  A line
%that contains only whitespace is not considered blank.

$B6u9T$NA^F~$^$?$O:o=|$@$1$NJQ99$rI=<($7$J$$!%6uGrJ8;z$,4^$^$l$k9T$O6u9T$H(B

\subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status}
  differ?}
\label{cmdref:diff-vs-status}

When you run the \hgcmd{status} command, you'll see a list of files
that Mercurial will record changes for the next time you perform a
commit.  If you run the \hgcmd{diff} command, you may notice that it
prints diffs for only a \emph{subset} of the files that \hgcmd{status}
listed.  There are two possible reasons for this.

The first is that \hgcmd{status} prints some kinds of modifications
that \hgcmd{diff} doesn't normally display.  The \hgcmd{diff} command
normally outputs unified diffs, which don't have the ability to
represent some changes that Mercurial can track.  Most notably,
traditional diffs can't represent a change in whether or not a file is
executable, but Mercurial records this information.

If you use the \hgopt{diff}{--git} option to \hgcmd{diff}, it will
display \command{git}-compatible diffs that \emph{can} display this
extra information.

The second possible reason that \hgcmd{diff} might be printing diffs
for a subset of the files displayed by \hgcmd{status} is that if you
invoke it without any arguments, \hgcmd{diff} prints diffs against the
first parent of the working directory.  If you have run \hgcmd{merge}
to merge two changesets, but you haven't yet committed the results of
the merge, your working directory has two parents (use \hgcmd{parents}
to see them).  While \hgcmd{status} prints modifications relative to
\emph{both} parents after an uncommitted merge, \hgcmd{diff} still
operates relative only to the first parent.  You can get it to print
diffs relative to the second parent by specifying that parent with the
\hgopt{diff}{-r} option.  There is no way to print diffs relative to
both parents.

\subsubsection{Generating safe binary diffs}

If you use the \hgopt{diff}{-a} option to force Mercurial to print
diffs of files that are either ``mostly text'' or contain lots of
binary data, those diffs cannot subsequently be applied by either
Mercurial's \hgcmd{import} command or the system's \command{patch}
command.  

If you want to generate a diff of a binary file that is safe to use as
input for \hgcmd{import}, use the \hgcmd{diff}{--git} option when you
generate the patch.  The system \command{patch} command cannot handle
binary patches at all.

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

294:b2d447356c42

%Omit date and time information when printing diff headers.

diff$B%X%C%@$+$iF|IU$H;~4V>pJs$r>JN,$9$k!%(B

\optref{diff}{B}{$B6u9T$rL5;k$9$k(B}

%Do not print changes that only insert or delete blank lines.  A line
%that contains only whitespace is not considered blank.

$B6u9T$NA^F~$^$?$O:o=|$@$1$NJQ99$rI=<($7$J$$!%6uGrJ8;z$,4^$^$l$k9T$O6u9T$H(B

\subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status}
  differ?}
\label{cmdref:diff-vs-status}

%When you run the \hgcmd{status} command, you'll see a list of files
%that Mercurial will record changes for the next time you perform a
%commit.  If you run the \hgcmd{diff} command, you may notice that it
%prints diffs for only a \emph{subset} of the files that \hgcmd{status}
%listed.  There are two possible reasons for this.

\hgcmd{status}$B$r<B9T$7$?;~!$(BMercurial$B$O<!2s$N%3%_%C%H$G5-O?$9$kJQ99$N%j(B
$B%9%H$rI=<($9$k!%(B\hgcmd{diff}$B$r<B9T$9$k$H!$(B\hgcmd{status}$B$N(B\emph{$B0lIt(B
$B$N(B}diff$B$,I=<($5$l$k$3$H$K5$IU$/$@$m$&!%$3$l$K$OFs$D$NM}M3$,9M$($i$l$k!%(B

%The first is that \hgcmd{status} prints some kinds of modifications
%that \hgcmd{diff} doesn't normally display.  The \hgcmd{diff} command
%normally outputs unified diffs, which don't have the ability to
%represent some changes that Mercurial can track.  Most notably,
%traditional diffs can't represent a change in whether or not a file is
%executable, but Mercurial records this information.

1$B$DL\$O(B\hgcmd{status}$B$,(B\hgcmd{diff}$B$,DL>oI=<($7$J$$2?<oN`$+$NJQ99$rI=<($9(B
$B$k$?$a$G$"$k!%(B\hgcmd{diff}$B$ODL>o(Bunified diff$B7A<0$G=PNO$9$k$,!$$3$l$O(B
Mercurial$B$,DI@W$G$-$kJQ99$N$$$/$D$+$rDI@W$G$-$J$$!%FC$K!$8E$$(Bdiff$B$G$O%U%!(B
$B%$%k$,<B9T$+$N$&$+$I$&$+$rI=8=$G$-$J$$$,!$(BMercurial$B$O$3$N>pJs$r5-O?$9$k!%(B

%If you use the \hgopt{diff}{--git} option to \hgcmd{diff}, it will
%display \command{git}-compatible diffs that \emph{can} display this
%extra information.

\hgcmd{diff}$B%3%^%s%I$G(B\hgopt{diff}{--git}$B%*%W%7%g%s$r;H$C$F$$$k>l9g!$(B
$B$3$N>pJs$rI=<($G$-$k(B\command{git}$B8_49$N(Bdiff$B$r=PNO$9$k!%(B

%The second possible reason that \hgcmd{diff} might be printing diffs
%for a subset of the files displayed by \hgcmd{status} is that if you
%invoke it without any arguments, \hgcmd{diff} prints diffs against the
%first parent of the working directory.If you have run \hgcmd{merge}
%to merge two changesets, but you haven't yet committed the results of
%the merge,your working directory has two parents (use \hgcmd{parents}
%to see them).While \hgcmd{status} prints modifications relative to
%\emph{both} parents after an uncommitted merge, \hgcmd{diff} still
%operates relative only to the first parent.  You can get it to print
%diffs relative to the second parent by specifying that parent with the
%\hgopt{diff}{-r} option.  There is no way to print diffs relative to
%both parents.

2$B$DL\$N9M$($i$l$kM}M3$O!$(B\hgcmd{diff}$B$r0z?t$J$7$G8F$s$G$$$k$?$a!$(B
\hgcmd{diff}$B$,%o!<%-%s%0%G%#%l%/%H%j$ND>@\$N?F$H$N:9J,$r<h$C$F$$$k$?$a$G(B
$B$"$k!%%A%'%s%8%;%C%H$r%^!<%8$9$k$?$a$K(B\hgcmd{merge}$B$r<B9T$9$k$H!$%o!<%-%s(B
$B%0%G%#%l%/%H%j$O(B2$B$D$N?F$r;}$D$3$H$K$J$k!%!J?F$rI=<($9$k$K$O(B
\hgcmd{parents}$B$r;H$&!%!K(B\hgcmd{status}$B$O%3%_%C%H$5$l$F$$$J$$%^!<%8$N(B
\emph{$BN>J}(B}$B$N?F$H$N:9J,$r<h$k$N$KBP$7$F!$(B\hgcmd{diff}$B$O=g=xE*$K@h$N?F$H(B
$B$N:9J,$r<h$k!%8e$N?F$H$N:9J,$r<h$k$?$a$K$O(B\hgopt{diff}{-r}$B%*%W%7%g%s$r;H(B
$B$&!%N>J}$N?F$H$N:9J,$r<h$kJ}K!$OB8:_$7$J$$!%(B


%\subsubsection{Generating safe binary diffs}
\subsubsection{$B%P%$%J%j$N:9J,$r0BA4$K<hF@$9$k(B}

%If you use the \hgopt{diff}{-a} option to force Mercurial to print
%diffs of files that are either ``mostly text'' or contain lots of
%binary data, those diffs cannot subsequently be applied by either
%Mercurial's \hgcmd{import} command or the system's \command{patch}
%command.  

$BBgH>$,%F%-%9%H$G$"$k%U%!%$%kF1;N$d!$B?$/$N%P%$%J%j%G!<%?$,4^$^$l$k%U%!%$(B
$B%kF1;N$N:9J,$r<h$k$?$a$K(B\hopt{diff}{-a}$B$r;XDj$9$k>l9g!$@8@.$5$l$?:9J,$O(B
Mercurial$B$N(B\hgcmd{import}$B%3%^%s%I$d%7%9%F%`$N(B\command{patch}$B$KMQ$$$k$3$H(B
$B$,$G$-$J$$!%(B

%If you want to generate a diff of a binary file that is safe to use as
%input for \hgcmd{import}, use the \hgcmd{diff}{--git} option when you
%generate the patch.  The system \command{patch} command cannot handle
%binary patches at all.

\hgcmd{import}$B$GMxMQ$G$-$k%P%$%J%j%U%!%$%k$N:9J,$r@8@.$9$k$K$O!$(B
$B%Q%C%A@8@.$K(B\hgcmd{diff}{--git}$B%*%W%7%g%s$r;XDj$9$l$P$h$$!%%7%9%F%`$N(B
\command{patch}$B%3%^%s%I$+$i$O$3$N:9J,$OMxMQ$G$-$J$$!%(B

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