Mercurial > hgbook
annotate es/concepts.tex @ 521:59fbfb7e790c
translated some more comments
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Mon, 17 Nov 2008 20:04:37 -0500 |
parents | 0774efad9003 |
children | f907df38efef |
rev | line source |
---|---|
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
1 \chapter{Tras bambalinas} |
442 | 2 \label{chap:concepts} |
3 | |
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
4 A diferencia de varios sistemas de control de revisiones, los |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
5 conceptos en los que se fundamenta Mercurial son lo suficientemente |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
6 simples como para entender fácilmente cómo funciona el software. |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
7 Saber esto no es necesario, pero considero útil tener un ``modelo |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
8 mental'' de qué es lo que sucede. |
442 | 9 |
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
10 Comprender esto me da la confianza de que Mercurial ha sido |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
11 cuidadosamente diseñado para ser tanto \emph{seguro} como |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
12 \emph{eficiente}. Y tal vez con la misma importancia, si es fácil |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
13 para mí hacerme a una idea adecuada de qué está haciendo el software |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
14 cuando llevo a cabo una tarea relacionada con control de revisiones, |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
15 es menos probable que me sosprenda su comportamiento. |
442 | 16 |
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
17 En este capítulo, cubriremos inicialmente los conceptos centrales |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
18 del diseño de Mercurial, y luego discutiremos algunos detalles |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
19 interesantes de su implementación. |
442 | 20 |
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
21 \section{Registro del historial de Mercurial} |
442 | 22 |
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
23 \subsection{Seguir el historial de un único fichero} |
442 | 24 |
492
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
25 Cuando Mercurial sigue las modificaciones a un fichero, guarda el |
2c2c86824c61
began translation of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
442
diff
changeset
|
26 historial de dicho fichero en un objeto de metadatos llamado |
494
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
27 \emph{filelog}\ndt{Fichero de registro}. Cada entrada en el fichero |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
28 de registro contiene suficiente información para reconstruir una |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
29 revisión del fichero que se está siguiendo. Los ficheros de registro |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
30 son almacenados como ficheros el el directorio |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
31 \sdirname{.hg/store/data}. Un fichero de registro contiene dos tipos |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
32 de información: datos de revisiones, y un índice para ayudar a |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
33 Mercurial a buscar revisiones eficientemente. |
442 | 34 |
494
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
35 El fichero de registro de un fichero grande, o con un historial muy |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
36 largo, es guardado como ficheros separados para datos (sufijo |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
37 ``\texttt{.d}'') y para el índice (sufijo ``\texttt{.i}''). Para |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
38 ficheros pequeños con un historial pequeño, los datos de revisiones y |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
39 el índice son combinados en un único fichero ``\texttt{.i}''. La |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
40 correspondencia entre un fichero en el directorio de trabajo y el |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
41 fichero de registro que hace seguimiento a su historial en el |
149ea8ae39c4
translated a couple of paragraphs of the "behind the scenes" chapter
Javier Rojas <jerojasro@devnull.li>
parents:
492
diff
changeset
|
42 repositorio se ilustra en la figura~\ref{fig:concepts:filelog}. |
442 | 43 |
44 \begin{figure}[ht] | |
45 \centering | |
46 \grafix{filelog} | |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
47 \caption{Relación entre ficheros en el directorio de trabajo y |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
48 ficheros de registro en el repositorio} |
442 | 49 \label{fig:concepts:filelog} |
50 \end{figure} | |
51 | |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
52 \subsection{Administración de ficheros monitoreados} |
442 | 53 |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
54 Mercurial usa una estructura llamada \emph{manifiesto} para |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
55 % TODO collect together => centralizar |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
56 centralizar la información que maneja acerca de los ficheros que |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
57 monitorea. Cada entrada en el manifiesto contiene información acerca |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
58 de los ficheros involucrados en un único conjunto de cambios. Una |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
59 entrada registra qué ficheros están presentes en el conjunto de |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
60 cambios, la revisión de cada fichero, y otros cuantos metadatos del |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
61 mismo. |
442 | 62 |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
63 \subsection{Registro de información del conjunto de cambios} |
442 | 64 |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
65 La \emph{bitácora de cambios} contiene información acerca de cada |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
66 conjunto de cambios. Cada revisión indica quién consignó un cambio, el |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
67 comentario para el conjunto de cambios, otros datos relacionados con |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
68 el conjunto de cambios, y la revisión del manifiesto a usar. |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
69 |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
70 \subsection{Relaciones entre revisiones} |
442 | 71 |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
72 Dentro de una bitácora de cambios, un manifiesto, o un fichero de |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
73 registro, cada revisión conserva un apuntador a su padre inmediato |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
74 (o sus dos padres, si es la revisión de una fusión). Como menciońe |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
75 anteriormente, también hay relaciones entre revisiones \emph{a través} |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
76 de estas estructuras, y tienen naturaleza jerárquica. |
442 | 77 |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
78 Por cada conjunto de cambios en un repositorio, hay exactamente una |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
79 revisión almacenada en la bitácora de cambios. Cada revisión de la |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
80 bitácora de cambios contiene un apuntador a una única revisión del |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
81 manifiesto. Una revisión del manifiesto almacena un apuntador a una |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
82 única revisión de cada fichero de registro al que se le hacía |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
83 seguimiento cuando fue creado el conjunto de cambios. Estas relaciones |
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
84 se ilustran en la figura~\ref{fig:concepts:metadata}. |
442 | 85 |
86 \begin{figure}[ht] | |
87 \centering | |
88 \grafix{metadata} | |
495
0f2170fcb79a
added the term "tracking", and translated a few paragraphs of concepts.tex
Javier Rojas <jerojasro@devnull.li>
parents:
494
diff
changeset
|
89 \caption{Relaciones entre metadatos} |
442 | 90 \label{fig:concepts:metadata} |
91 \end{figure} | |
92 | |
505
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
93 Como lo muestra la figura, \emph{no} hay una relación ``uno a uno'' |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
94 entre las revisiones en el conjunto de cambios, el manifiesto, o el |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
95 fichero de registro. Si el manifiesto no ha sido modificado de un |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
96 conjunto de cambios a otro, las entradas en la bitácora de cambios |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
97 para esos conjuntos de cambios apuntarán a la misma revisión del |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
98 manifiesto. Si un fichero monitoreado por Mercurial no sufre ningún |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
99 cambio de un conjunto de cambios a otro, la entrada para dicho fichero |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
100 en las dos revisiones del manifiesto apuntará a la misma revisión de |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
101 su fichero de registro. |
442 | 102 |
505
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
103 \section{Almacenamiento seguro y eficiente} |
442 | 104 |
505
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
105 La base común de las bitácoras de cambios, los manifiestos, y los |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
106 ficheros de registros es provista por una única estructura llamada el |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
107 \emph{revlog}\ndt{Contracción de \emph{revision log}, registro de |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
108 revisión.}. |
442 | 109 |
505
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
110 \subsection{Almacenamiento eficiente} |
442 | 111 |
505
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
112 El revlog provee almacenamiento eficiente de revisiones por medio del |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
113 mecanismo de \emph{deltas}\ndt{Diferencias.}. En vez de almacenar una |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
114 copia completa del fichero por cada revisión, almacena los cambios |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
115 necesarios para transformar una revisión anterior en la nueva |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
116 revisión. Para muchos tipos de fichero, estos deltas son típicamente |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
117 de una fracción porcentual del tamaño de una copia completa del |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
118 fichero. |
442 | 119 |
505
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
120 Algunos sistemas de control de revisiones obsoletos sólo pueden |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
121 manipular deltas de ficheros de texto plano. Ellos o bien almacenan |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
122 los ficheros binarios como instantáneas completas, o codificados en |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
123 alguna representación de texto plano adecuada, y ambas alternativas |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
124 son enfoques que desperdician bastantes recursos. Mercurial puede |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
125 manejar deltas de ficheros con contenido binario arbitrario; no |
446d1b4b7a71
translated up to section 4.2.1, included
Javier Rojas <jerojasro@devnull.li>
parents:
495
diff
changeset
|
126 necesita tratar el texto plano como un caso especial. |
442 | 127 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
128 \subsection{Operación segura} |
442 | 129 \label{sec:concepts:txn} |
130 | |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
131 Mercurial sólo \emph{añade} datos al final de los ficheros de revlog. Nunca |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
132 modifica ninguna sección de un fichero una vez ha sido escrita. Esto es más |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
133 robusto y eficiente que otros esquemas que requieren modificar o reescribir |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
134 datos. |
442 | 135 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
136 Adicionalmente, Mercurial trata cada escritura como parte de una |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
137 \emph{transacción}, que puede cubrir varios ficheros. Una transacción es |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
138 \emph{atómica}: o bien la transacción tiene éxito y entonces todos sus efectos |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
139 son visibles para todos los lectores, o la operación completa es cancelada. |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
140 % TODO atomicidad no existe de acuerdo a DRAE, reemplazar |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
141 Esta garantía de atomicidad implica que, si usted está ejecutando dos copias de |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
142 Mercurial, donde una de ellas está leyendo datos y la otra los está escribiendo, |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
143 el lector nunca verá un resultado escrito parcialmente que podría confundirlo. |
442 | 144 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
145 El hecho de que Mercurial sólo hace adiciones a los ficheros hace más fácil |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
146 proveer esta garantía transaccional. A medida que sea más fácil hacer |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
147 operaciones como ésta, más confianza tendrá usted en que sean hechas |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
148 correctamente. |
442 | 149 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
150 \subsection{Recuperación rápida de datos} |
442 | 151 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
152 Mercurial evita ingeniosamente un problema común a todos los sistemas de control |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
153 de revisiones anteriores> el problema de la |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
154 \emph{recuperación\ndt{\emph{Retrieval}. Recuperación en el sentido de traer los |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
155 datos, o reconstruirlos a partir de otros datos, pero no debido a una falla o |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
156 calamidad, sino a la operación normal del sistema.} ineficiente de datos}. |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
157 Muchos sistemas de control de revisiones almacenan los contenidos de una |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
158 revisión como una serie incremental de modificaciones a una ``instantánea''. |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
159 Para reconstruir una versión cualquiera, primero usted debe leer la instantánea, |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
160 y luego cada una de las revisiones entre la instantánea y su versión objetivo. |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
161 Entre más largo sea el historial de un fichero, más revisiones deben ser leídas, |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
162 y por tanto toma más tiempo reconstruir una versión particular. |
442 | 163 |
164 \begin{figure}[ht] | |
165 \centering | |
166 \grafix{snapshot} | |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
167 \caption{Instantánea de un revlog, con deltas incrementales} |
442 | 168 \label{fig:concepts:snapshot} |
169 \end{figure} | |
170 | |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
171 La innovación que aplica Mercurial a este problema es simple pero efectiva. |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
172 Una vez la cantidad de información de deltas acumulada desde la última |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
173 instantánea excede un umbral fijado de antemano, se almacena una nueva |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
174 instantánea (comprimida, por supuesto), en lugar de otro delta. Esto hace |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
175 posible reconstruir \emph{cualquier} versión de un fichero rápidamente. Este |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
176 enfoque funciona tan bien que desde entonces ha sido copiado por otros sistemas |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
177 de control de revisiones. |
442 | 178 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
179 La figura~\ref{fig:concepts:snapshot} ilustra la idea. En una entrada en el |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
180 fichero índice de un revlog, Mercurial almacena el rango de entradas (deltas) |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
181 del fichero de datos que se deben leer para reconstruir una revisión en |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
182 particular. |
442 | 183 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
184 \subsubsection{Nota al margen: la influencia de la compresión de vídeo} |
442 | 185 |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
186 Si le es familiar la compresión de vídeo, o ha mirado alguna vez una emisión de |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
187 TV a través de cable digital o un servicio de satélite, puede que sepa que la |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
188 mayor parte de los esquemas de compresión de vídeo almacenan cada cuadro del |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
189 mismo como un delta contra el cuadro predecesor. Adicionalmente, estos esquemas |
510
006cd2b41d11
corrected translation of a term
Javier Rojas <jerojasro@devnull.li>
parents:
509
diff
changeset
|
190 usan técnicas de compresión ``con pérdida'' para aumentar la tasa de |
509
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
191 compresión, por lo que los errores visuales se acumulan a lo largo de una |
7c84967093e1
translated some paragraphs, and updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
505
diff
changeset
|
192 cantidad de deltas inter-cuadros. |
442 | 193 |
514
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
194 Ya que existe la posibilidad de que un flujo de vídeo se ``pierda'' |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
195 ocasionalmente debido a fallas en la señal, y para limitar la acumulación de |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
196 errores introducida por la compresión con pérdidas, los codificadores de vídeo |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
197 insertan periódicamente un cuadro completo (también llamado ``cuadro clave'') en |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
198 el flujo de vídeo; el siguiente delta es generado con respecto a dicho cuadro. |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
199 Esto quiere decir que si la señal de vídeo se interrumpe, se reanudará una vez |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
200 se reciba el siguiente cuadro clave. Además, la acumulación de errores de |
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
201 codificación se reinicia con cada cuadro clave. |
442 | 202 |
514
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
203 \subsection{Identificación e integridad fuerte} |
442 | 204 |
515 | 205 Además de la información de deltas e instantáneas, una entrada en un |
514
0eda2936ef77
translated a couple of paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
510
diff
changeset
|
206 % TODO de pronto aclarar qué diablos es un hash? |
515 | 207 revlog contiene un hash criptográfico de los datos que representa. |
208 Esto hace difícil falsificar el contenido de una revisión, y hace | |
209 fácil detectar una corrupción accidental. | |
442 | 210 |
515 | 211 Los hashes proveen más que una simple revisión de corrupción: son |
212 usados como los identificadores para las revisiones. | |
213 % TODO no entendí completamente la frase a continuación | |
214 Los hashes de | |
215 identificación de conjuntos de cambios que usted ve como usuario final | |
216 son de las revisiones de la bitácora de cambios. Aunque los ficheros | |
217 de registro y el manifiesto también usan hashes, Mercurial sólo los | |
218 usa tras bambalinas. | |
442 | 219 |
515 | 220 Mercurial verifica que los hashes sean correctos cuando recupera |
221 revisiones de ficheros y cuando jala cambios desde otro repositorio. | |
222 Si se encuentra un problema de integridad, Mercurial se quejará y | |
223 detendrá cualquier operación que esté haciendo. | |
224 | |
225 Además del efecto que tiene en la eficiencia en la recuperación, el | |
226 uso periódico de instantáneas de Mercurial lo hace más robusto frente | |
227 a la corrupción parcial de datos. Si un fichero de registro se | |
228 corrompe parcialmente debido a un error de hardware o del sistema, a | |
229 menudo es posible reconstruir algunas o la mayoría de las revisiones a | |
230 partir de las secciones no corrompidas del fichero de registro, tanto | |
231 antes como después de la sección corrompida. Esto no sería posible con | |
232 un sistema de almacenamiento basado únicamente en deltas. | |
442 | 233 |
517
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
234 \section{Historial de revisiones, ramas y fusiones} |
442 | 235 |
517
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
236 Cada entrada en el revlog de Mercurial conoce la identidad de la |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
237 revisión de su ancestro inmediato, al que se conoce usualmente como su |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
238 \emph{padre}. De hecho, una revisión contiene sitio no sólo para un |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
239 padre, sino para dos. Mercurial usa un hash especial, llamado el |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
240 ``ID nulo'', para representar la idea de ``no hay padre aquí''. Este |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
241 hash es simplemente una cadena de ceros. |
442 | 242 |
517
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
243 En la figura~\ref{fig:concepts:revlog} usted puede ver un ejemplo de |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
244 la estructura conceptual de un revlog. Los ficheros de registro, |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
245 manifiestos, y bitácoras de cambios comparten la misma estructura; |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
246 sólo difieren en el tipo de datos almacenados en cada delta o |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
247 instantánea. |
442 | 248 |
517
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
249 La primera revisión en un revlog (al final de la imagen) tiene como |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
250 padre al ID nulo, en las dos ranuras disponibles para padres. En una |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
251 revisión normal, la primera ranura para padres contiene el ID de la |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
252 revisión padre, y la segunda contiene el ID nulo, señalando así que la |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
253 revisión sólo tiene un padre real. Un par de revisiones que tenga el |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
254 mismo ID padre son ramas. Una revisión que representa una fusión entre |
bc2136732cd6
translated 3 paragraphs
Javier Rojas <jerojasro@devnull.li>
parents:
515
diff
changeset
|
255 ramas tiene dos IDs de revisión normales en sus ranuras para padres. |
442 | 256 |
257 \begin{figure}[ht] | |
258 \centering | |
259 \grafix{revlog} | |
260 \caption{} | |
261 \label{fig:concepts:revlog} | |
262 \end{figure} | |
263 | |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
264 \section{El directorio de trabajo} |
442 | 265 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
266 % TODO revisar párrafo, no me convence la traducción |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
267 En el directorio de trabajo, Mercurial almacena una instantánea de los |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
268 ficheros del repositorio como si fueran los de un conjunto de cambios |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
269 particular. |
442 | 270 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
271 El directorio de trabajo ``sabe'' qué conjunto de cambios contiene. |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
272 Cuando usted actualiza el directorio de trabajo para que contenga un |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
273 conjunto de cambios particular, Mercurial busca la revisión adecuada |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
274 del manifiesto para averiguar qué ficheros estaba monitoreando cuando |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
275 se hizo la consignación del conjunto de cambios, y qué revisión de |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
276 cada fichero era la actual en ese momento. Luego de eso, recrea una |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
277 copia de cada uno de esos ficheros, con los mismos contenidos que |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
278 tenían cuando fue consignado el conjunto de cambios. |
442 | 279 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
280 El \emph{estado de directorio}\ndt{dirstate, en inglés en el |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
281 original.} contiene el conocimiento de Mercurial acerca del directorio |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
282 de trabajo. Allí se detalla a qué conjunto de cambios es actualizado |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
283 el directorio de trabajo, y todos los ficheros que Mercurial está |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
284 monitoreando en este directorio. |
442 | 285 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
286 Tal como la revisión de un revlog tiene espacio para dos padres, para |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
287 que pueda representar tanto una revisión normal (con un solo padre) o |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
288 una fusión de dos revisiones anteriores, el estado de directorio tiene |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
289 espacio para dos padres. Cuando usted usa el comando \hgcmd{update}, |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
290 el conjunto de cambios al que usted se actualiza es almacenado en la |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
291 casilla destinada al ``primer padre'', y un ID nulo es almacenado en |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
292 la segunda. Cuando usted hace una fusión (\hgcmd{merge}) con otro |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
293 conjunto de cambios, la casilla para el primer padre permanece sin |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
294 cambios, y la casilla para el segundo es actualizada con el conjunto |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
295 de cambios con el que usted acaba de hacer la fusión. El comando |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
296 \hgcmd{parents} le indica cuáles son los padres del estado de |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
297 directorio. |
442 | 298 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
299 \subsection{Qué pasa en una consignación} |
442 | 300 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
301 El estado de directorio almacena información sobre los padres para |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
302 algo más que mero registro. Mercurial usa los padres del estado de |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
303 directorio como \emph{los padres de un nuevo conjunto de cambios} |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
304 cuando usted hace una consignación. |
442 | 305 |
306 \begin{figure}[ht] | |
307 \centering | |
308 \grafix{wdir} | |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
309 \caption{El directorio de trabajo puede tener dos padres} |
442 | 310 \label{fig:concepts:wdir} |
311 \end{figure} | |
312 | |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
313 La figura~\ref{fig:concepts:wdir} muestra el estado normal del |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
314 directorio de trabajo, que tiene un único conjunto de cambios como |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
315 padre. Dicho conjunto de cambios es la \emph{punta}, el conjunto de |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
316 cambios más reciente en el repositorio que no tiene hijos. |
442 | 317 |
318 \begin{figure}[ht] | |
319 \centering | |
320 \grafix{wdir-after-commit} | |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
321 \caption{El directorio de trabajo obtiene nuevos padres luego de una |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
322 consignación} |
442 | 323 \label{fig:concepts:wdir-after-commit} |
324 \end{figure} | |
325 | |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
326 Es útil pensar en el directorio de trabajo como en ``el conjunto de |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
327 cambios que estoy a punto de enviar''. Cualquier fichero que usted le |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
328 diga a Mercurial que fue añadido, borrado, renombrado o copiado, se |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
329 verá reflejado en ese conjunto de cambios, como también se verán las |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
330 modificaciones a cualquiera de los ficheros que Mercurial ya esté |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
331 monitoreando; el nuevo conjunto de cambios dentrá los padres del |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
332 directorio de trabajo como propios. |
442 | 333 |
519
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
334 Luego de una consignación, Mercurial actualizará los padres del |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
335 directorio de trabajo, de tal manera que el primer padre sea el ID del |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
336 nuevo conjunto de cambios, y el segundo sea el ID nulo. Esto puede |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
337 verse en la figura~\ref{fig:concepts:wdir-after-commit}. Mercurial no |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
338 toca ninguno de los ficheros del directorio de trabajo cuando usted |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
339 hace la consignación; sólo modifica el estado de directorio para |
0774efad9003
translated up to section 4.4.1 (included). updated the project status file
Javier Rojas <jerojasro@devnull.li>
parents:
517
diff
changeset
|
340 anotar sus nuevos padres. |
442 | 341 |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
342 \subsection{Creación de un nuevo frente} |
442 | 343 |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
344 Es perfectamente normal actualizar el directorio de trabajo a un |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
345 conjunto de cambios diferente a la punta actual. Por ejemplo, usted |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
346 podría desear saber en qué estado se encontraba su proyecto el martes |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
347 pasado, o podría estar buscando en todos los conjuntos de cambios para |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
348 saber cuándo se introdujo un fallo. En casos como éstos, la acción |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
349 natural es actualizar el directorio de trabajo al conjunto de cambios |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
350 de su interés, y examinar directamente los ficheros en el directorio |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
351 de trabajo para ver sus contenidos tal como estaban en el momento de |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
352 hacer la consignación. El efecto que tiene esto se muestra en la |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
353 figura~\ref{fig:concepts:wdir-pre-branch}. |
442 | 354 |
355 \begin{figure}[ht] | |
356 \centering | |
357 \grafix{wdir-pre-branch} | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
358 \caption{El directorio de trabajo, actualizado a un conjunto de |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
359 cambios anterior} |
442 | 360 \label{fig:concepts:wdir-pre-branch} |
361 \end{figure} | |
362 | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
363 Una vez se ha actualizado el directorio de trabajo a un conjunto de |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
364 cambios anterior, qué pasa si se hacen cambios, y luego se hace una |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
365 consignación? Mercurial se comporta en la misma forma que describí |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
366 anteriormente. Los padres del directorio de trabajo se convierten en |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
367 los padres del nuevo conjunto de cambios. Este nuevo conjunto de |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
368 cambios no tiene hijos, así que se convierte en la nueva punta. Y el |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
369 repositorio tiene ahora dos conjuntos de cambios que no tienen hijos; |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
370 a éstos los llamamos \emph{frentes}. Usted puede apreciar la |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
371 estructura que esto crea en la figura~\ref{fig:concepts:wdir-branch}. |
442 | 372 |
373 \begin{figure}[ht] | |
374 \centering | |
375 \grafix{wdir-branch} | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
376 \caption{Después de una consignación hecha mientras se usaba un |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
377 conjunto de cambios anterior} |
442 | 378 \label{fig:concepts:wdir-branch} |
379 \end{figure} | |
380 | |
381 \begin{note} | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
382 Si usted es nuevo en Mercurial, debería tener en mente un |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
383 ``error'' común, que es usar el comando \hgcmd{pull} sin ninguna |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
384 opción. Por defecto, el comando \hgcmd{pull} \emph{no} actualiza |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
385 el directorio de trabajo, así que usted termina trayendo nuevos |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
386 conjuntos de cambios a su repositorio, pero el directorio de |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
387 trabajo sigue usando el mismo conjunto de cambios que tenía antes |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
388 de jalar. Si usted hace algunos cambios, y luego hace una |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
389 consignación, estará creando un nuevo frente, porque su directorio |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
390 de trabajo no es sincronizado a cualquiera que sea la nueva punta. |
442 | 391 |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
392 Pongo la palabra ``error'' en comillas porque todo lo que usted |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
393 debe hacer para rectificar la situación es hacer una fusión |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
394 (\hgcmd{merge}), y luego una consignación (\hgcmd{commit}). En |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
395 otras palabras, esto casi nunca tiene consecuencias negativas; |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
396 sólo sorprende a la gente. Discutiré otras formas de evitar este |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
397 comportamiento, y porqué Mercurial se comporta de esta forma, |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
398 inicialmente sorprendente, más adelante. |
442 | 399 \end{note} |
400 | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
401 \subsection{Fusión de frentes} |
442 | 402 |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
403 Cuando usted ejecuta el comando \hgcmd{merge}, Mercurial deja el |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
404 primer padre del directorio de trabajo intacto, y escribe como segundo |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
405 padre el conjunto de cambios contra el cual usted está haciendo la |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
406 fusión, como se muestra en la figura~\ref{fig:concepts:wdir-merge}. |
442 | 407 |
408 \begin{figure}[ht] | |
409 \centering | |
410 \grafix{wdir-merge} | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
411 \caption{Fusión de dos frentes} |
442 | 412 \label{fig:concepts:wdir-merge} |
413 \end{figure} | |
414 | |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
415 Mercurial también debe modificar el directorio de trabajo, para |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
416 fusionar los ficheros que él monitorea en los dos conjuntos de |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
417 cambios. Con algunas simplificaciones, el proceso es el siguiente, por |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
418 cada fichero en los manifiestos de ambos conjuntos de cambios. |
442 | 419 \begin{itemize} |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
420 \item Si ningún conjunto de cambios ha modificado un fichero, no se |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
421 hace nada con el mismo. |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
422 \item Si un conjunto de cambios ha modificado un fichero, y el otro no |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
423 lo ha hecho, se crea una copia del fichero con las modificaciones |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
424 pertinentes en el directorio de trabajo. |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
425 \item Si un conjunto de cambios borra un fichero, y el otro no lo ha |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
426 hecho (o también lo borró), se borra dicho fichero del directorio |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
427 de trabajo. |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
428 \item Si un conjunto de cambios ha borrado un fichero, pero el otro lo ha |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
429 modificado, se le pregunta al usuario qué hacer: conservar el |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
430 fichero modificado, o borrarlo? |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
431 \item Si ambos conjuntos de cambios han modificado un fichero, se |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
432 invoca el programa externo de fusión para definir el nuevo |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
433 contenido del fichero fusionado. Esto puede requerir interacción |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
434 directa de parte del usuario. |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
435 \item Si un conjunto de cambios ha modificado un fichero, y el otro ha |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
436 renombrado o copiado el mismo, asegurarse de que los cambios sigan |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
437 al nuevo nombre de fichero. |
442 | 438 \end{itemize} |
521
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
439 Hay más detalles---hacer una fusión tiene una gran cantidad de casos |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
440 especiales---pero éstas son las elecciones más comunes que se ven |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
441 involucradas en una fusión. Como usted puede ver, muchos de los casos |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
442 son completamente automáticos, y de hecho la mayoría de las fusiones |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
443 terminan automáticamente, sin requerir la interacción del usuario para |
59fbfb7e790c
translated some more comments
Javier Rojas <jerojasro@devnull.li>
parents:
519
diff
changeset
|
444 resolver ningún conflicto. |
442 | 445 |
446 When you're thinking about what happens when you commit after a merge, | |
447 once again the working directory is ``the changeset I'm about to | |
448 commit''. After the \hgcmd{merge} command completes, the working | |
449 directory has two parents; these will become the parents of the new | |
450 changeset. | |
451 | |
452 Mercurial lets you perform multiple merges, but you must commit the | |
453 results of each individual merge as you go. This is necessary because | |
454 Mercurial only tracks two parents for both revisions and the working | |
455 directory. While it would be technically possible to merge multiple | |
456 changesets at once, the prospect of user confusion and making a | |
457 terrible mess of a merge immediately becomes overwhelming. | |
458 | |
459 \section{Other interesting design features} | |
460 | |
461 In the sections above, I've tried to highlight some of the most | |
462 important aspects of Mercurial's design, to illustrate that it pays | |
463 careful attention to reliability and performance. However, the | |
464 attention to detail doesn't stop there. There are a number of other | |
465 aspects of Mercurial's construction that I personally find | |
466 interesting. I'll detail a few of them here, separate from the ``big | |
467 ticket'' items above, so that if you're interested, you can gain a | |
468 better idea of the amount of thinking that goes into a well-designed | |
469 system. | |
470 | |
471 \subsection{Clever compression} | |
472 | |
473 When appropriate, Mercurial will store both snapshots and deltas in | |
474 compressed form. It does this by always \emph{trying to} compress a | |
475 snapshot or delta, but only storing the compressed version if it's | |
476 smaller than the uncompressed version. | |
477 | |
478 This means that Mercurial does ``the right thing'' when storing a file | |
479 whose native form is compressed, such as a \texttt{zip} archive or a | |
480 JPEG image. When these types of files are compressed a second time, | |
481 the resulting file is usually bigger than the once-compressed form, | |
482 and so Mercurial will store the plain \texttt{zip} or JPEG. | |
483 | |
484 Deltas between revisions of a compressed file are usually larger than | |
485 snapshots of the file, and Mercurial again does ``the right thing'' in | |
486 these cases. It finds that such a delta exceeds the threshold at | |
487 which it should store a complete snapshot of the file, so it stores | |
488 the snapshot, again saving space compared to a naive delta-only | |
489 approach. | |
490 | |
491 \subsubsection{Network recompression} | |
492 | |
493 When storing revisions on disk, Mercurial uses the ``deflate'' | |
494 compression algorithm (the same one used by the popular \texttt{zip} | |
495 archive format), which balances good speed with a respectable | |
496 compression ratio. However, when transmitting revision data over a | |
497 network connection, Mercurial uncompresses the compressed revision | |
498 data. | |
499 | |
500 If the connection is over HTTP, Mercurial recompresses the entire | |
501 stream of data using a compression algorithm that gives a better | |
502 compression ratio (the Burrows-Wheeler algorithm from the widely used | |
503 \texttt{bzip2} compression package). This combination of algorithm | |
504 and compression of the entire stream (instead of a revision at a time) | |
505 substantially reduces the number of bytes to be transferred, yielding | |
506 better network performance over almost all kinds of network. | |
507 | |
508 (If the connection is over \command{ssh}, Mercurial \emph{doesn't} | |
509 recompress the stream, because \command{ssh} can already do this | |
510 itself.) | |
511 | |
512 \subsection{Read/write ordering and atomicity} | |
513 | |
514 Appending to files isn't the whole story when it comes to guaranteeing | |
515 that a reader won't see a partial write. If you recall | |
516 figure~\ref{fig:concepts:metadata}, revisions in the changelog point to | |
517 revisions in the manifest, and revisions in the manifest point to | |
518 revisions in filelogs. This hierarchy is deliberate. | |
519 | |
520 A writer starts a transaction by writing filelog and manifest data, | |
521 and doesn't write any changelog data until those are finished. A | |
522 reader starts by reading changelog data, then manifest data, followed | |
523 by filelog data. | |
524 | |
525 Since the writer has always finished writing filelog and manifest data | |
526 before it writes to the changelog, a reader will never read a pointer | |
527 to a partially written manifest revision from the changelog, and it will | |
528 never read a pointer to a partially written filelog revision from the | |
529 manifest. | |
530 | |
531 \subsection{Concurrent access} | |
532 | |
533 The read/write ordering and atomicity guarantees mean that Mercurial | |
534 never needs to \emph{lock} a repository when it's reading data, even | |
535 if the repository is being written to while the read is occurring. | |
536 This has a big effect on scalability; you can have an arbitrary number | |
537 of Mercurial processes safely reading data from a repository safely | |
538 all at once, no matter whether it's being written to or not. | |
539 | |
540 The lockless nature of reading means that if you're sharing a | |
541 repository on a multi-user system, you don't need to grant other local | |
542 users permission to \emph{write} to your repository in order for them | |
543 to be able to clone it or pull changes from it; they only need | |
544 \emph{read} permission. (This is \emph{not} a common feature among | |
545 revision control systems, so don't take it for granted! Most require | |
546 readers to be able to lock a repository to access it safely, and this | |
547 requires write permission on at least one directory, which of course | |
548 makes for all kinds of nasty and annoying security and administrative | |
549 problems.) | |
550 | |
551 Mercurial uses locks to ensure that only one process can write to a | |
552 repository at a time (the locking mechanism is safe even over | |
553 filesystems that are notoriously hostile to locking, such as NFS). If | |
554 a repository is locked, a writer will wait for a while to retry if the | |
555 repository becomes unlocked, but if the repository remains locked for | |
556 too long, the process attempting to write will time out after a while. | |
557 This means that your daily automated scripts won't get stuck forever | |
558 and pile up if a system crashes unnoticed, for example. (Yes, the | |
559 timeout is configurable, from zero to infinity.) | |
560 | |
561 \subsubsection{Safe dirstate access} | |
562 | |
563 As with revision data, Mercurial doesn't take a lock to read the | |
564 dirstate file; it does acquire a lock to write it. To avoid the | |
565 possibility of reading a partially written copy of the dirstate file, | |
566 Mercurial writes to a file with a unique name in the same directory as | |
567 the dirstate file, then renames the temporary file atomically to | |
568 \filename{dirstate}. The file named \filename{dirstate} is thus | |
569 guaranteed to be complete, not partially written. | |
570 | |
571 \subsection{Avoiding seeks} | |
572 | |
573 Critical to Mercurial's performance is the avoidance of seeks of the | |
574 disk head, since any seek is far more expensive than even a | |
575 comparatively large read operation. | |
576 | |
577 This is why, for example, the dirstate is stored in a single file. If | |
578 there were a dirstate file per directory that Mercurial tracked, the | |
579 disk would seek once per directory. Instead, Mercurial reads the | |
580 entire single dirstate file in one step. | |
581 | |
582 Mercurial also uses a ``copy on write'' scheme when cloning a | |
583 repository on local storage. Instead of copying every revlog file | |
584 from the old repository into the new repository, it makes a ``hard | |
585 link'', which is a shorthand way to say ``these two names point to the | |
586 same file''. When Mercurial is about to write to one of a revlog's | |
587 files, it checks to see if the number of names pointing at the file is | |
588 greater than one. If it is, more than one repository is using the | |
589 file, so Mercurial makes a new copy of the file that is private to | |
590 this repository. | |
591 | |
592 A few revision control developers have pointed out that this idea of | |
593 making a complete private copy of a file is not very efficient in its | |
594 use of storage. While this is true, storage is cheap, and this method | |
595 gives the highest performance while deferring most book-keeping to the | |
596 operating system. An alternative scheme would most likely reduce | |
597 performance and increase the complexity of the software, each of which | |
598 is much more important to the ``feel'' of day-to-day use. | |
599 | |
600 \subsection{Other contents of the dirstate} | |
601 | |
602 Because Mercurial doesn't force you to tell it when you're modifying a | |
603 file, it uses the dirstate to store some extra information so it can | |
604 determine efficiently whether you have modified a file. For each file | |
605 in the working directory, it stores the time that it last modified the | |
606 file itself, and the size of the file at that time. | |
607 | |
608 When you explicitly \hgcmd{add}, \hgcmd{remove}, \hgcmd{rename} or | |
609 \hgcmd{copy} files, Mercurial updates the dirstate so that it knows | |
610 what to do with those files when you commit. | |
611 | |
612 When Mercurial is checking the states of files in the working | |
613 directory, it first checks a file's modification time. If that has | |
614 not changed, the file must not have been modified. If the file's size | |
615 has changed, the file must have been modified. If the modification | |
616 time has changed, but the size has not, only then does Mercurial need | |
617 to read the actual contents of the file to see if they've changed. | |
618 Storing these few extra pieces of information dramatically reduces the | |
619 amount of data that Mercurial needs to read, which yields large | |
620 performance improvements compared to other revision control systems. | |
621 | |
622 %%% Local Variables: | |
623 %%% mode: latex | |
624 %%% TeX-master: "00book" | |
625 %%% End: |