# HG changeset patch # User Yoshiki Yazawa # Date 1244022819 -32400 # Node ID b15bea650f30bc2b9da4b5511980d72bf609923d # Parent 43556decb81ff3d53c826c27e9944dd5872d850b started tour-basic.tex diff -r 43556decb81f -r b15bea650f30 ja/todo.txt --- a/ja/todo.txt Wed Jun 03 15:41:08 2009 +0900 +++ b/ja/todo.txt Wed Jun 03 18:53:39 2009 +0900 @@ -16,7 +16,7 @@ preface.tex 100% srcinstall.tex 100% template.tex 100% -tour-basic.tex +tour-basic.tex 10% tour-merge.tex 100% undo.tex 100% cmdref.tex 100% diff -r 43556decb81f -r b15bea650f30 ja/tour-basic.tex --- a/ja/tour-basic.tex Wed Jun 03 15:41:08 2009 +0900 +++ b/ja/tour-basic.tex Wed Jun 03 18:53:39 2009 +0900 @@ -1,26 +1,42 @@ -\chapter{A tour of Mercurial: the basics} +%\chapter{A tour of Mercurial: the basics} +\chapter{Mercurialツアー: 基本} \label{chap:tour-basic} -\section{Installing Mercurial on your system} +%\section{Installing Mercurial on your system} +\section{システムへのMercurialのインストール} \label{sec:tour:install} -Prebuilt binary packages of Mercurial are available for every popular -operating system. These make it easy to start using Mercurial on your -computer immediately. +%Prebuilt binary packages of Mercurial are available for every popular +%operating system. These make it easy to start using Mercurial on your +%computer immediately. + +人気の高いオペレーティングシステムではMercurialのビルド済みバイナリパッ +ケージが提供されている．これを用いれば読者の計算機の上で直ちにMercurial +を使うことができる． \subsection{Linux} -Because each Linux distribution has its own packaging tools, policies, -and rate of development, it's difficult to give a comprehensive set of -instructions on how to install Mercurial binaries. The version of -Mercurial that you will end up with can vary depending on how active -the person is who maintains the package for your distribution. +%Because each Linux distribution has its own packaging tools, policies, +%and rate of development, it's difficult to give a comprehensive set of +%instructions on how to install Mercurial binaries. The version of +%Mercurial that you will end up with can vary depending on how active +%the person is who maintains the package for your distribution. + +Linuxの各ディストリビューションはそれぞれ独自のパッケージツール，ポリ +シー，開発ペースを持っているため，全てを網羅してMercurialバイナリのインス +トール手順を述べることは困難である．それぞれのディストリビューションで利 +用可能なMercurialのバージョンは，パッケージメンテナの活動に依存する． -To keep things simple, I will focus on installing Mercurial from the -command line under the most popular Linux distributions. Most of -these distributions provide graphical package managers that will let -you install Mercurial with a single click; the package name to look -for is \texttt{mercurial}. +%To keep things simple, I will focus on installing Mercurial from the +%command line under the most popular Linux distributions. Most of +%these distributions provide graphical package managers that will let +%you install Mercurial with a single click; the package name to look +%for is \texttt{mercurial}. + +単純化のために，大多数のLinuxディストリビューションでコマンドラインから +Mercurialをインストールする方法に限定して説明することにする．これらの大半 +のディストリビューションでは，Mercurialをクリック1回でインストールできる +ようなグラフィカルなパッケージマネージャを用意している． \begin{itemize} \item[Debian] @@ -43,15 +59,20 @@ yum install mercurial \end{codesample4} -\item[Ubuntu] Ubuntu's Mercurial package is based on Debian's. To - install it, run the following command. +%\item[Ubuntu] Ubuntu's Mercurial package is based on Debian's. To +% install it, run the following command. +\item[Ubuntu] UbuntuのMercurial packageはDebianのものを元にしている．こ + れをインストールするためには次のコマンドを実行する． \begin{codesample4} apt-get install mercurial \end{codesample4} - The Ubuntu package for Mercurial tends to lag behind the Debian - version by a considerable time margin (at the time of writing, seven - months), which in some cases will mean that on Ubuntu, you may run - into problems that have since been fixed in the Debian package. +% The Ubuntu package for Mercurial tends to lag behind the Debian +% version by a considerable time margin (at the time of writing, seven +% months), which in some cases will mean that on Ubuntu, you may run +% into problems that have since been fixed in the Debian package. +UbuntuのMercurialパッケージはDebianのものに比べて無視できないほどの遅れ + がある（これを書いている時点では7カ月）．このため，Ubuntuで + はDebianではすでに解決された問題に直面するかもしれない． \end{itemize} \subsection{Solaris} @@ -60,83 +81,124 @@ \subsection{Mac OS X} -Lee Cantey publishes an installer of Mercurial for Mac OS~X at -\url{http://mercurial.berkwood.com}. This package works on both -Intel-~and Power-based Macs. Before you can use it, you must install -a compatible version of Universal MacPython~\cite{web:macpython}. This -is easy to do; simply follow the instructions on Lee's site. +%Lee Cantey publishes an installer of Mercurial for Mac OS~X at +%\url{http://mercurial.berkwood.com}. This package works on both +%Intel-~and Power-based Macs. Before you can use it, you must install +%a compatible version of Universal MacPython~\cite{web:macpython}. This +%is easy to do; simply follow the instructions on Lee's site. + +Lee CanteyはMac OS~X向けのMercurialインストーラを +\url{http://mercurial.berkwood.com}で配布している．このパッケージは +Intel-~とPower-ベースのMac両方で動作する．これを使う前に，互換性のあるバー +ジョンのUniversal MacPython~\cite{web:macpython}をインストールする必要が +ある．インストールは簡単で，Leeのサイトにある手順に従うだけである． \subsection{Windows} -Lee Cantey also publishes an installer of Mercurial for Windows at -\url{http://mercurial.berkwood.com}. This package has no external -dependencies; it ``just works''. +%Lee Cantey also publishes an installer of Mercurial for Windows at +%\url{http://mercurial.berkwood.com}. This package has no external +%dependencies; it ``just works''. + +Lee CanteyはWindows向けのMercurialインストーラも +\url{http://mercurial.berkwood.com}で配布している．このパッケージは外部 +のソフトウェアに依存せず，単独で実行可能である． \begin{note} - The Windows version of Mercurial does not automatically convert line - endings between Windows and Unix styles. If you want to share work - with Unix users, you must do a little additional configuration - work. XXX Flesh this out. +% The Windows version of Mercurial does not automatically convert line +% endings between Windows and Unix styles. If you want to share work +% with Unix users, you must do a little additional configuration +% work. XXX Flesh this out. + WindowsバージョンのMercurialは，WindowsとUnixの間で行末の改行コードを自 + 動で変換しない．Unixユーザと作業を行いたい場合は，追加の設定を行う必要 + がある．XXX Flesh this out. \end{note} -\section{Getting started} +%\section{Getting started} +\section{Mercurialを使う} -To begin, we'll use the \hgcmd{version} command to find out whether -Mercurial is actually installed properly. The actual version -information that it prints isn't so important; it's whether it prints -anything at all that we care about. +%To begin, we'll use the \hgcmd{version} command to find out whether +%Mercurial is actually installed properly. The actual version +%information that it prints isn't so important; it's whether it prints +%anything at all that we care about. +%\interaction{tour.version} + +まず\hgcmd{version}コマンドでMercurialが実際に正しくインストールされたか +を確認してみよう．表示されるかどうかが問題であって，表示されるバージョン +情報は特に重要ではない． \interaction{tour.version} -\subsection{Built-in help} +%\subsection{Built-in help} +\subsection{組み込みヘルプ} -Mercurial provides a built-in help system. This is invaluable for those -times when you find yourself stuck trying to remember how to run a -command. If you are completely stuck, simply run \hgcmd{help}; it -will print a brief list of commands, along with a description of what -each does. If you ask for help on a specific command (as below), it -prints more detailed information. +%Mercurial provides a built-in help system. This is invaluable for those +%times when you find yourself stuck trying to remember how to run a +%command. If you are completely stuck, simply run \hgcmd{help}; it +%will print a brief list of commands, along with a description of what +%each does. If you ask for help on a specific command (as below), it +%prints more detailed information. +%\interaction{tour.help} +%For a more impressive level of detail (which you won't usually need) +%run \hgcmdargs{help}{\hggopt{-v}}. The \hggopt{-v} option is short +%for \hggopt{--verbose}, and tells Mercurial to print more information +%than it usually would. + +Mercurialは組み込みのヘルプシステムを備えている．これはコマンドの使い方に +詰まった時に役に立つ．何を実行したら良いのか全く分からない場合は単に +\hgcmd{help}を実行する．これはコマンドの一部を説明と共にリスト表示する． +特定のコマンドについてヘルプが見たい場合は，下記のようにするとより詳細な +情報が得られる． \interaction{tour.help} -For a more impressive level of detail (which you won't usually need) -run \hgcmdargs{help}{\hggopt{-v}}. The \hggopt{-v} option is short -for \hggopt{--verbose}, and tells Mercurial to print more information -than it usually would. +通常必要としないような極めて詳しい説明が必要な場合は +\hgcmdargs{help}{\hggopt{-v}}を実行する．\hggopt{-v}は\hggopt{--verbose} +オプションの短縮形で，より詳細な情報を表示するオプションである． -\section{Working with a repository} +%\section{Working with a repository} +\section{リポジトリを使った作業} -In Mercurial, everything happens inside a \emph{repository}. The -repository for a project contains all of the files that ``belong to'' -that project, along with a historical record of the project's files. +%In Mercurial, everything happens inside a \emph{repository}. The +%repository for a project contains all of the files that ``belong to'' +%that project, along with a historical record of the project's files. -There's nothing particularly magical about a repository; it is simply -a directory tree in your filesystem that Mercurial treats as special. -You can rename or delete a repository any time you like, using either the -command line or your file browser. +Mercurialでは\emph{リポジトリ内}で一切が起きる．プロジェクトのリポジトリ +は所属する全てのファイルとそれらの履歴情報を持つ． -\subsection{Making a local copy of a repository} +%There's nothing particularly magical about a repository; it is simply +%a directory tree in your filesystem that Mercurial treats as special. +%You can rename or delete a repository any time you like, using either the +%command line or your file browser. + +リポジトリには特に不思議なところはない．リポジトリはMercurialが特別の扱い +をするだけのファイルシステム上の単なるディレクトリツリーにすぎない． +リポジトリはコマンドラインやファイルブラウザからいつでも名前を変えたり消 +去することができる． + +%\subsection{Making a local copy of a repository} +\subsection{リポジトリのローカルコピーを作る} -\emph{Copying} a repository is just a little bit special. While you -could use a normal file copying command to make a copy of a -repository, it's best to use a built-in command that Mercurial -provides. This command is called \hgcmd{clone}, because it creates an -identical copy of an existing repository. -\interaction{tour.clone} -If our clone succeeded, we should now have a local directory called -\dirname{hello}. This directory will contain some files. -\interaction{tour.ls} -These files have the same contents and history in our repository as -they do in the repository we cloned. +%\emph{Copying} a repository is just a little bit special. While you +%could use a normal file copying command to make a copy of a +%repository, it's best to use a built-in command that Mercurial +%provides. This command is called \hgcmd{clone}, because it creates an +%identical copy of an existing repository. +%\interaction{tour.clone} +%If our clone succeeded, we should now have a local directory called +%\dirname{hello}. This directory will contain some files. +%\interaction{tour.ls} +%These files have the same contents and history in our repository as +%they do in the repository we cloned. -Every Mercurial repository is complete, self-contained, and -independent. It contains its own private copy of a project's files -and history. A cloned repository remembers the location of the -repository it was cloned from, but it does not communicate with that -repository, or any other, unless you tell it to. +%Every Mercurial repository is complete, self-contained, and +%independent. It contains its own private copy of a project's files +%and history. A cloned repository remembers the location of the +%repository it was cloned from, but it does not communicate with that +%repository, or any other, unless you tell it to. -What this means for now is that we're free to experiment with our -repository, safe in the knowledge that it's a private ``sandbox'' that -won't affect anyone else. +%What this means for now is that we're free to experiment with our +%repository, safe in the knowledge that it's a private ``sandbox'' that +%won't affect anyone else. -\subsection{What's in a repository?} +%\subsection{What's in a repository?} +\subsection{リポジトリには何が含まれるか？} When we take a more detailed look inside a repository, we can see that it contains a directory named \dirname{.hg}. This is where Mercurial @@ -155,7 +217,8 @@ contains a \emph{snapshot} of your project at a particular point in history. -\section{A tour through history} +%\section{A tour through history} +\section{履歴を辿る} One of the first things we might want to do with a new, unfamiliar repository is understand its history. The \hgcmd{log} command gives @@ -199,8 +262,8 @@ \label{fig:tour-basic:history} \end{figure} -\subsection{Changesets, revisions, and talking to other - people} +%\subsection{Changesets, revisions, and talking to other people} +\subsection{チェンジセット, リビジョン, 他のユーザとのやりとり} As English is a notoriously sloppy language, and computer science has a hallowed history of terminological confusion (why use one term when @@ -236,7 +299,8 @@ changeset for some other reason (for example, in a bug report), use the hexadecimal identifier. -\subsection{Viewing specific revisions} +%\subsection{Viewing specific revisions} +\subsection{特定のリビジョンを見る} To narrow the output of \hgcmd{log} down to a single revision, use the \hgopt{log}{-r} (or \hgopt{log}{--rev}) option. You can use either a @@ -252,7 +316,8 @@ \hgcmdargs{log}{-r 2:4} prints $2,3,4$ while \hgcmdargs{log}{-r 4:2} prints $4,3,2$. -\subsection{More detailed information} +%\subsection{More detailed information} +\subsection{より詳細な情報} While the summary information printed by \hgcmd{log} is useful if you already know what you're looking for, you may need to see a complete @@ -268,7 +333,8 @@ a unified diff before, see section~\ref{sec:mq:patch} for an overview). \interaction{tour.log-vp} -\section{All about command options} +%\section{All about command options} +\section{コマンドオプションのすべて} Let's take a brief break from exploring Mercurial commands to discuss a pattern in the way that they work; you may find this useful to keep @@ -300,7 +366,8 @@ when passed a \hggopt{-v} (or \hggopt{--verbose}) option, and less when passed \hggopt{-q} (or \hggopt{--quiet}). -\section{Making and reviewing changes} +%\section{Making and reviewing changes} +\section{変更の仕方，変更のレビュー} Now that we have a grasp of viewing history in Mercurial, let's take a look at making some changes and examining them. @@ -336,7 +403,7 @@ The \hgcmd{status} command prints no output for some files, but a line starting with ``\texttt{M}'' for \filename{hello.c}. Unless you tell it to, \hgcmd{status} will not print any output for files that have -not been modified. +not been modified. The ``\texttt{M}'' indicates that Mercurial has noticed that we modified \filename{hello.c}. We didn't need to \emph{inform} @@ -350,7 +417,8 @@ command. \interaction{tour.diff} -\section{Recording changes in a new changeset} +%\section{Recording changes in a new changeset} +\section{新たなチェンジセットへ変更を記録する} We can modify files, build and test our changes, and use \hgcmd{status} and \hgcmd{diff} to review our changes, until we're @@ -358,9 +426,10 @@ where we want to record our work in a new changeset. The \hgcmd{commit} command lets us create a new changeset; we'll -usually refer to this as ``making a commit'' or ``committing''. +usually refer to this as ``making a commit'' or ``committing''. -\subsection{Setting up a username} +%\subsection{Setting up a username} +\subsection{ユーザ名を設定する} When you try to run \hgcmd{commit} for the first time, it is not guaranteed to succeed. Mercurial records your name and address with @@ -395,7 +464,8 @@ use, the simplest and most robust way to set a username for yourself is by creating a \sfilename{.hgrc} file; see below for details. -\subsubsection{Creating a Mercurial configuration file} +%\subsubsection{Creating a Mercurial configuration file} +\subsubsection{Mercurialの設定ファイルを作成する} \label{sec:tour-basic:username} To set a user name, use your favourite editor to create a file called @@ -414,7 +484,8 @@ file. Mercurial ignores empty lines and treats any text from ``\texttt{\#}'' to the end of a line as a comment. -\subsubsection{Choosing a user name} +%\subsubsection{Choosing a user name} +\subsubsection{ユーザ名を選ぶ} You can use any text you like as the value of the \texttt{username} config item, since this information is for reading by other people, @@ -429,7 +500,8 @@ email if you publish a Mercurial repository on the web. \end{note} -\subsection{Writing a commit message} +%\subsection{Writing a commit message} +\subsection{コミットメッセージを書く} When we commit a change, Mercurial drops us into a text editor, to enter a message that will describe the modifications we've made in @@ -449,7 +521,8 @@ them only to tell us which files it's recording changes to. Modifying or deleting these lines has no effect. -\subsection{Writing a good commit message} +%\subsection{Writing a good commit message} +\subsection{よいコミットメッセージの書き方} Since \hgcmd{log} only prints the first line of a commit message by default, it's best to write a commit message whose first line stands @@ -472,7 +545,8 @@ that tell me something that I can't figure out with a quick glance at the output of \hgcmdargs{log}{--patch}. -\subsection{Aborting a commit} +%\subsection{Aborting a commit} +\subsection{コミットを中止する} If you decide that you don't want to commit while in the middle of editing a commit message, simply exit from your editor without saving @@ -483,7 +557,8 @@ all of the changes we've made, as reported by \hgcmd{status} and \hgcmd{diff}. -\subsection{Admiring our new handiwork} +%\subsection{Admiring our new handiwork} +\subsection{新たな作業を称賛する} Once we've finished the commit, we can use the \hgcmd{tip} command to display the changeset we just created. This command produces output @@ -493,14 +568,16 @@ We refer to the newest revision in the repository as the tip revision, or simply the tip. -\section{Sharing changes} +%\section{Sharing changes} +\section{変更を共有する} We mentioned earlier that repositories in Mercurial are self-contained. This means that the changeset we just created exists only in our \dirname{my-hello} repository. Let's look at a few ways that we can propagate this change into other repositories. -\subsection{Pulling changes from another repository} +%\subsection{Pulling changes from another repository} +\subsection{他のリポジトリから変更をpullする} \label{sec:tour:pull} To get started, let's clone our original \dirname{hello} repository, @@ -527,7 +604,8 @@ have successfully pulled changes into our repository. There remains one step before we can see these changes in the working directory. -\subsection{Updating the working directory} +%\subsection{Updating the working directory} +\subsection{ワーキングディレクトリを更新する} We have so far glossed over the relationship between a repository and its working directory. The \hgcmd{pull} command that we ran in @@ -578,7 +656,8 @@ tip revision, as shown by the second call to \hgcmd{update} in the example above. -\subsection{Pushing changes to another repository} +%\subsection{Pushing changes to another repository} +\subsection{他のリポジトリに変更をpushする} Mercurial lets us push changes to another repository, from the repository we're currently visiting. As with the example of @@ -599,7 +678,8 @@ repository already has those changes? Nothing too exciting. \interaction{tour.push.nothing} -\subsection{Sharing changes over a network} +%\subsection{Sharing changes over a network} +\subsection{変更をネットワークを通じて共有する} The commands we have covered in the previous few sections are not limited to working with local repositories. Each works in exactly the @@ -611,7 +691,7 @@ anonymous users push to it. \interaction{tour.push.net} -%%% Local Variables: +%%% Local Variables: %%% mode: yatex %%% TeX-master: "00book" -%%% End: +%%% End: