# HG changeset patch # User Bryan O'Sullivan # Date 1236747483 25200 # Node ID bebd5ff7fe7f34a95a16a677e0bad562869f9421 # Parent ad304b606163e5ba8c9706f5101473e74daed7c5 And there was much tidying, and the result was good. diff -r ad304b606163 -r bebd5ff7fe7f en/99book.bib --- a/en/99book.bib Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -@Unpublished{gruenbacher:2005, - author = {Andreas Gruenbacher}, - title = {How To Survive With Many Patches (Introduction to \texttt{quilt})}, - year = {2005}, - month = {June}, - note = {\url{http://www.suse.de/~agruen/quilt.pdf}}, -} - -@InProceedings{web:europython, - author = {Bryan O'Sullivan}, - title = {Achieving High Performance in Mercurial}, - booktitle = {EuroPython Conference}, - year = {2006}, - month = {July}, - note = {\url{XXX}}, -} - -@Misc{web:diffstat, - author = {Thomas Dickey}, - title = {\texttt{diffstat}--make a histogram of \texttt{diff} output}, - note = {\url{http://dickey.his.com/diffstat/diffstat.html}}, -} - -@Misc{web:quilt, - author = {Andreas Gruenbacher, Martin Quinson, Jean Delvare}, - title = {Patchwork Quilt}, - note = {\url{http://savannah.nongnu.org/projects/quilt}}, -} - -@Misc{web:patchutils, - author = {Tim Waugh}, - title = {\texttt{patchutils}--programs that operate on patch files}, - note = {\url{http://cyberelk.net/tim/patchutils/}}, -} - -@Misc{web:mpatch, - author = {Chris Mason}, - title = {\texttt{mpatch}--help solve patch rejects}, - note = {\url{http://oss.oracle.com/~mason/mpatch/}}, -} - -@Misc{web:wiggle, - author = {Neil Brown}, - title = {\texttt{wiggle}--apply conflicting patches}, - note = {\url{http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/}}, -} - -@Misc{web:mysql-python, - author = {Andy Dustman}, - title = {MySQL for Python}, - note = {\url{http://sourceforge.net/projects/mysql-python}}, -} - -@Misc{web:changelog, - author = {Richard Stallman, GNU Project volunteers}, - title = {GNU Coding Standards---Change Logs}, - note = {\url{http://www.gnu.org/prep/standards/html_node/Change-Logs.html}}, -} - -@Misc{web:macpython, - author = {Bob Ippolito, Ronald Oussoren}, - title = {Universal MacPython}, - note = {\url{http://bob.pythonmac.org/archives/2006/04/10/python-and-universal-binaries-on-mac-os-x/}}, -} - -@Misc{web:putty, - author = {Simon Tatham}, - title = {PuTTY---open source ssh client for Windows}, - note = {\url{http://www.chiark.greenend.org.uk/~sgtatham/putty/}}, -} - -@Misc{web:configparser, - author = {Python.org}, - title = {\texttt{ConfigParser}---Configuration file parser}, - note = {\url{http://docs.python.org/lib/module-ConfigParser.html}}, -} diff -r ad304b606163 -r bebd5ff7fe7f en/Makefile --- a/en/Makefile Tue Mar 10 21:42:19 2009 -0700 +++ b/en/Makefile Tue Mar 10 21:58:03 2009 -0700 @@ -67,6 +67,21 @@ tour \ tour-merge-conflict +obj-web := html +obj-websup := html/support + +extras-web-base := \ + $(obj-web)/index.html \ + $(obj-web)/robots.txt \ + $(obj-websup)/form-min.js \ + $(obj-websup)/form.js \ + $(obj-websup)/hsbook.js \ + $(obj-websup)/jquery-min.js \ + $(obj-websup)/jquery.js \ + $(obj-websup)/styles.css + +extras-web := $(extras-web-base) $(extras-web-base:%=%.gz) + xsltproc := xsltproc xsltproc-opts := --nonet --xinclude --path '$(xml-path)' @@ -109,13 +124,25 @@ hg-version = $(shell hg version -q | \ sed 's,.*(version \(unknown\|[a-f0-9+]*\)),\1,') -all: html +all: web ../xsl/system-xsl: $(system-xsl-dir) ln -s $< $@ +web: websup html + html: ../xsl/system-xsl $(xml-src-files) valid - xsltproc $(xsltproc-opts) -o html/x ../xsl/chunk-stylesheet.xsl 00book.xml + xsltproc $(xsltproc-opts) -o html/read/x ../xsl/chunk-stylesheet.xsl 00book.xml + for i in html/read/*.html; do \ + gzip -9 -c $$i > $$i.gz; \ + done + +websup: $(extras-web) + mkdir -p $(obj-websup)/figs + cp ../xsl/system-xsl/images/*.png $(obj-websup)/figs + cp -f ../web/icons/*.png $(obj-websup)/figs + +web: websup valid: .validated-00book.xml @@ -153,3 +180,29 @@ rsync: install rsync -avz --delete dist sp.red-bean.com:public_html/hgbook + +vpath %.css ../web +vpath %.js ../web/javascript + +$(obj-websup)/%.css: %.css + @mkdir -p $(dir $@) + cp $< $@ + +$(obj-websup)/%.jpg: %.jpg + @mkdir -p $(dir $@) + cp $< $@ + +$(obj-websup)/%.js: %.js + @mkdir -p $(dir $@) + cp $< $@ + +$(obj-web)/%: ../web/% + @mkdir -p $(dir $@) + cp $< $@ + +$(obj-web)/%.html: %.html.in + @mkdir -p $(dir $@) + python ../web/texpand.py $< $@ + +%.gz: % + gzip -9 -c $< > $@ diff -r ad304b606163 -r bebd5ff7fe7f en/bookhtml.cfg --- a/en/bookhtml.cfg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -% -*- latex -*- - -\Preamble{xhtml} - -% Tex4ht's default definition of lists is complete crap. -% Unfortunately, it can't distinguish between "ul" and "dl" lists. - -\ConfigureList{itemize}% - {\EndP\HCode{}\ShowPar} - {\endItem \def\endItem{\EndP\Tg}\HCode{
  • }} - {\HCode{}} -\def\textbullet{} - -\begin{document} - -\EndPreamble diff -r ad304b606163 -r bebd5ff7fe7f en/feature-branches.dot --- a/en/feature-branches.dot Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -digraph feature_branches { - master -> crypto; - master -> filesystems; - master -> ipc; - master -> memory; - master -> network; - master -> security; -} diff -r ad304b606163 -r bebd5ff7fe7f en/figs/feature-branches.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/feature-branches.dot Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,8 @@ +digraph feature_branches { + master -> crypto; + master -> filesystems; + master -> ipc; + master -> memory; + master -> network; + master -> security; +} diff -r ad304b606163 -r bebd5ff7fe7f en/figs/filelog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/filelog.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + .hg/store/data/README.i + + + + + README + + + + + + + + + .hg/store/data/src/hello.c.d + .hg/store/data/src/hello.c.i + + + + + src/hello.c + + + + Working directory + Repository + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/kdiff3.png Binary file en/figs/kdiff3.png has changed diff -r ad304b606163 -r bebd5ff7fe7f en/figs/metadata.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/metadata.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,328 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Changelog + Manifest + Filelogs + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/mq-stack.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/mq-stack.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,270 @@ + + + + + + + + + image/svg+xml + + + + + + + prevent-compiler-reorder.patch + + namespace-cleanup.patch + + powerpc-port-fixes.patch + + report-devinfo-correctly.patch + { + { + present in series,but not applied + patches applied,changesets present + topmostapplied patch + 201ad3209902 + 126b84e593ae + a655daf15409 + e50d59aaea3a + + forbid-illegal-params.patch + + fix-memory-leak.patch + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/note.png Binary file en/figs/note.png has changed diff -r ad304b606163 -r bebd5ff7fe7f en/figs/revlog.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/revlog.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,1155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Second parent + 32bf9a5f22c0 + + + + Revision hash + 34b8b7a15ea1 + + + + ... + Revision data (delta or snapshot) + + + + + + + First parent + 000000000000 + + + + Second parent + 000000000000 + + + + + Revision hash + ff9dc8bc2a8b + + + + ... + Revision data (delta or snapshot) + + + + + + + First parent + 34b8b7a15ea1 + + + + Second parent + 000000000000 + + + + Revision hash + 1b67dc96f27a + + + + ... + Revision data (delta or snapshot) + + + + + + + + First parent + ff9dc8bc2a8b + + + + Second parent + 000000000000 + + + + Revision hash + 5b80c922ebdd + + + + ... + Revision data (delta or snapshot) + + + + + + + First parent + ecacb6b4c9fd + + + + Second parent + 000000000000 + + + + Revision hash + 32bf9a5f22c0 + + + + ... + Revision data (delta or snapshot) + + + + + + First parent + ff9dc8bc2a8b + + + + Second parent + 000000000000 + + + + Revision hash + ecacb6b4c9fd + + + + ... + Revision data (delta or snapshot) + + + + + + + Head revision(no children) + Merge revision(two parents) + Branches(two revisions,same parent) + + + First revision(both parents null) + + First parent + 5b80c922ebdd + + + + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/snapshot.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/snapshot.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,202 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + Index, rev 7 + + Revlog index (.i file) + Revlog data (.d file) + + + Snapshot, rev 4 + + Delta, rev 4 to 5 + + Delta, rev 5 to 6 + + Delta, rev 6 to 7 + + Delta, rev 2 to 3 + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/tour-history.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/tour-history.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + (newest) + (oldest) + + 4: REV4 + + + revisionnumber + changesetidentifier + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/tour-merge-conflict.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/tour-merge-conflict.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,210 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Greetings!I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing + + + + + + Greetings!I am Shehu Musa Abacha, cousin to the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing + + + + + + Greetings!I am Alhaji Abba Abacha, son of the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing + + + Base version + Our changes + Their changes + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/tour-merge-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/tour-merge-merge.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + 4: REV4 + + + 5: REV_my_new_hello + + + 6: REV6_my_new_hello + + tip (and head) + head + + + + merge + working directoryduring merge + + 4: REV4 + + + 5: REV_my_new_hello + + + 6: REV6_my_new_hello + + tip + + + 7: REV7_my_new_hello + Working directory during merge + Repository after merge committed + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/tour-merge-pull.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/tour-merge-pull.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + 5: REV_my_new_hello + + + 6: REV6_my_new_hello + + tip (and head) + head + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/tour-merge-sep-repos.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/tour-merge-sep-repos.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + 5: REV_my_hello + + my-hello + + 0: REV0 + + 1: REV1 + + 2: REV2 + + 3: REV3 + + 4: REV4 + + + + + + 5: REV_my_new_hello + + my-new-hello + newest changesdiffer + common history + + + + + + + head revision(has no children) + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/undo-manual-merge.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/undo-manual-merge.dot Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,8 @@ +digraph undo_manual { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; + "third change" -> "manual\nmerge"; + backout -> "manual\nmerge"; +} diff -r ad304b606163 -r bebd5ff7fe7f en/figs/undo-manual.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/undo-manual.dot Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,6 @@ +digraph undo_manual { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; +} diff -r ad304b606163 -r bebd5ff7fe7f en/figs/undo-non-tip.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/undo-non-tip.dot Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,9 @@ +digraph undo_non_tip { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; + merge [label="automated\nmerge", shape=box]; + "third change" -> merge; + backout -> merge; +} diff -r ad304b606163 -r bebd5ff7fe7f en/figs/undo-simple.dot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/undo-simple.dot Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,4 @@ +digraph undo_simple { + "first change" -> "second change"; + "second change" -> "back out\nsecond change"; +} diff -r ad304b606163 -r bebd5ff7fe7f en/figs/wdir-after-commit.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/wdir-after-commit.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + dfbbb33f3fa3 + + + e7639888bb2f + + 7b064d8bac5e + + + + 000000000000 + + History in repository + + + + dfbbb33f3fa3 + + + + 000000000000 + + First parent + Second parent + Parents of working directory + + + Newchangeset + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/wdir-branch.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/wdir-branch.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + e7639888bb2f + + + + 7b064d8bac5e + + + + 000000000000 + + + + + ffb20e1701ea + + + + 000000000000 + + First parent + Second parent + Parents of working directory + + + + + ffb20e1701ea + + + Pre-existing head + Newly created head (and tip) + + + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/wdir-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/wdir-merge.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + 7b064d8bac5e + + + + 000000000000 + + + + + ffb20e1701ea + + + + e7639888bb2f + + First parent (unchanged) + Second parent + Parents of working directory + + + + + ffb20e1701ea + + + Pre-existing head + Newly created head (and tip) + + + + + + e7639888bb2f + + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/wdir-pre-branch.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/wdir-pre-branch.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + e7639888bb2f + + + 7b064d8bac5e + + + + 000000000000 + + History in repository + + + + 7b064d8bac5e + + + + 000000000000 + + First parent + Second parent + Parents of working directory + + + + diff -r ad304b606163 -r bebd5ff7fe7f en/figs/wdir.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/wdir.svg Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + e7639888bb2f + + 7b064d8bac5e + + + 000000000000 + + + History in repository + + + + + e7639888bb2f + + + + 000000000000 + + First parent + Second parent + + Parents of working directory + + + + diff -r ad304b606163 -r bebd5ff7fe7f en/filelog.svg --- a/en/filelog.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - .hg/store/data/README.i - - - - - README - - - - - - - - - .hg/store/data/src/hello.c.d - .hg/store/data/src/hello.c.i - - - - - src/hello.c - - - - Working directory - Repository - - diff -r ad304b606163 -r bebd5ff7fe7f en/fixhtml.py --- a/en/fixhtml.py Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -#!/usr/bin/env python -# -# This script attempts to work around some of the more bizarre and -# quirky behaviours of htlatex. -# -# - We've persuaded htlatex to produce UTF-8, which unfortunately -# causes it to use huge character sequences to represent even the -# safe 7-bit ASCII subset of UTF-8. We fix that up. -# -# - BUT we have to treat angle brackets (for example, redirections in -# shell script snippets) specially, otherwise they'll break the -# generated HTML. (Reported by Johannes Hoff.) -# -# - For some reason, htlatex gives a unique ID to each fancyvrb -# environment, which makes writing a sane, small CSS stylesheet -# impossible. We squish all those IDs down to nothing. - -import os -import sys -import re - -angle_re = re.compile(r'([CE];)') -unicode_re = re.compile(r'�([0-7][0-9A-F]);') -fancyvrb_re = re.compile(r'id="fancyvrb\d+"', re.I) -ligature_re = re.compile(r'ྰ([0-4]);') - -tmpsuffix = '.tmp.' + str(os.getpid()) - -def hide_angle(m): - return m.group(1).lower() - -def fix_ascii(m): - return chr(int(m.group(1), 16)) - -ligatures = ['ff', 'fi', 'fl', 'ffi', 'ffl'] - -def expand_ligature(m): - return ligatures[int(m.group(1))] - -for name in sys.argv[1:]: - tmpname = name + tmpsuffix - ofp = file(tmpname, 'w') - for line in file(name): - line = angle_re.sub(hide_angle, line) - line = unicode_re.sub(fix_ascii, line) - line = ligature_re.sub(expand_ligature, line) - line = fancyvrb_re.sub('id="fancyvrb"', line) - ofp.write(line) - ofp.close() - os.rename(tmpname, name) diff -r ad304b606163 -r bebd5ff7fe7f en/hgbook.css --- a/en/hgbook.css Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,441 +0,0 @@ -body { - font: 12px/1.5 Verdana, sans-serif; - padding-top: 50px; - padding-left: 80px; - padding-right: 80px; - padding-bottom: 90px; -} -.ptmr7t- { - font-family: monospace; -} -.ptmr7t-x-x-172 { - font-size: 172%; - font-family: monospace; -} -.ptmr7t-x-x-120 { - font-size: 120%; -} -.zpzccmry-x-x-120 { - font-size: 120%; - font-weight: bold; - font-style: italic; -} -.zpzccmry-x-x-120 { - font-weight: bold; - font-style: italic; -} -.pcrr7tn- { - font-family: monospace; -} -.ptmri7t- { - font-style: italic; -} -.ptmr7t-x-x-50 { - font-size: 50%; - font-family: monospace; -} -.ptmb7t- { - font-weight: bold; -} -.zptmcmr- { - font-style: italic; -} -.zptmcmrm- { - font-style: italic; -} -.zpzccmry- { - font-weight: bold; - font-style: italic; -} -.pcrb7t- { - font-family: monospace; - font-weight: bold; -} -.pcrro7t- { - font-family: monospace; - font-style: oblique; -} -p.noindent { - text-indent: 0em; - margin: 0em; -} -p.nopar { - text-indent: 0em; -} -p.indent { - text-indent: 1.5em; - margin: 0em; -} -a img { - border-top: 0; - border-left: 0; - border-right: 0; -} -center { - margin-top: 1em; - margin-bottom: 1em; -} -td center { - margin-top: 0em; - margin-bottom: 0em; -} -.Canvas { - position: relative; -} -img.math { - vertical-align: middle; -} -li p.indent { - text-indent: 0em; -} -.enumerate1 { - list-style-type: decimal; -} -.enumerate2 { - list-style-type: lower-alpha; -} -.enumerate3 { - list-style-type: lower-roman; -} -.enumerate4 { - list-style-type: upper-alpha; -} -div.newtheorem { - margin-bottom: 2em; - margin-top: 2em; -} -.obeylines-h,.obeylines-v { - white-space: nowrap; -} -div.obeylines-v p { - margin-top: 0; - margin-bottom: 0; -} -.overline { - text-decoration: overline; -} -.overline img { - border-top: 1px solid black; -} -td.displaylines { - text-align: center; - white-space: nowrap; -} -.centerline { - text-align: center; -} -.rightline { - text-align: right; -} -div.verbatim { - font-family: monospace; - white-space: nowrap; -} -table.verbatim { - width: 100%; -} -.fbox { - background: url(note.png) no-repeat #cec; - padding-left: 65px; - padding-top: 1em; - padding-bottom: 1em; - padding-right: 1em; - text-indent: 0pt; - border: dotted black 1px; -} -div.center div.fbox { - text-align: center; - clear: both; - padding-left: 3.0pt; - padding-right: 3.0pt; - text-indent: 0pt; - border: solid black 0.4pt; -} -table.minipage { - width: 100%; -} -div.center, div.center div.center { - text-align: center; - margin-left: 1em; - margin-right: 1em; -} -div.center div { - text-align: left; -} -div.flushright, div.flushright div.flushright { - text-align: right; -} -div.flushright div { - text-align: left; -} -div.flushleft { - text-align: left; -} -.underline { - text-decoration: underline; -} -.underline img { - border-bottom: 1px solid black; - margin-bottom: 1pt; -} -.framebox-c, .framebox-l, .framebox-r { - padding-left: 3.0pt; - padding-right: 3.0pt; - text-indent: 0pt; - border: solid black 0.4pt; -} -.framebox-c { - text-align: center; -} -.framebox-l { - text-align: left; -} -.framebox-r { - text-align: right; -} -span.thank-mark { - vertical-align: super -} -span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript { - font-size: 80%; -} -div.tabular, div.center div.tabular { - text-align: center; - margin-top: 0.5em; - margin-bottom: 0.5em; -} -table.tabular td p { - margin-top: 0em; -} -table.tabular { - margin-left: auto; - margin-right: auto; -} -div.td00 { - margin-left: 0pt; - margin-right: 0pt; -} -div.td01 { - margin-left: 0pt; - margin-right: 5pt; -} -div.td10 { - margin-left: 5pt; - margin-right: 0pt; -} -div.td11 { - margin-left: 5pt; - margin-right: 5pt; -} -table[rules] { - border-left: solid black 0.4pt; - border-right: solid black 0.4pt; -} -td.td00 { - padding-left: 0pt; - padding-right: 0pt; -} -td.td01 { - padding-left: 0pt; - padding-right: 5pt; -} -td.td10 { - padding-left: 5pt; - padding-right: 0pt; -} -td.td11 { - padding-left: 5pt; - padding-right: 5pt; -} -table[rules] { - border-left: solid black 0.4pt; - border-right: solid black 0.4pt; -} -.hline hr, .cline hr { - height : 1px; - margin: 0px; -} -.tabbing-right { - text-align: right; -} -span.TEX { - letter-spacing: -0.125em; -} -span.TEX span.E { - position: relative;top: 0.5ex;left: -0.0417em; -} -a span.TEX span.E { - text-decoration: none; -} -span.LATEX span.A { - position: relative; - top: -0.5ex; - left: -0.4em; - font-size: 85%; -} -span.LATEX span.TEX { - position: relative; - left: -0.4em; -} -div.float img, div.float .caption { - text-align: center; -} -div.figure img, div.figure .caption { - text-align: center; -} -.marginpar { - width: 20%; - float: right; - text-align: left; - margin-left: auto; - margin-top: 0.5em; - font-size: 85%; - text-decoration: underline; -} -.marginpar p { - margin-top: 0.4em; - margin-bottom: 0.4em; -} -table.equation { - width: 100%; -} -.equation td { - text-align: center; -} -td.equation { - margin-top: 1em; - margin-bottom: 1em; -} -td.equation-label { - width: 5%; - text-align: center; -} -td.eqnarray4 { - width: 5%; - white-space: normal; -} -td.eqnarray2 { - width: 5%; -} -table.eqnarray-star, table.eqnarray { - width: 100%; -} -div.eqnarray { - text-align: center; -} -div.array { - text-align: center; -} -div.pmatrix { - text-align: center; -} -table.pmatrix { - width: 100%; -} -span.pmatrix img { - vertical-align: middle; -} -div.pmatrix { - text-align: center; -} -table.pmatrix { - width: 100%; -} -img.cdots { - vertical-align: middle; -} -.partToc a, .partToc, .likepartToc a, .likepartToc { - line-height: 200%; - font-weight: bold; - font-size: 110%; -} -.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc, .appendixToc a, .appendixToc { - line-height: 200%; - font-weight: bold; -} -.caption td.id { - font-weight: bold; - white-space: nowrap; -} -table.caption { - text-align: center; -} -h1.partHead { - text-align: center; -} -p.bibitem { - text-indent: -2em; - margin-left: 2em; - margin-top: 0.6em; - margin-bottom: 0.6em; -} -p.bibitem-p { - text-indent: 0em; - margin-left: 2em; - margin-top: 0.6em; - margin-bottom: 0.6em; -} -.paragraphHead, .likeparagraphHead { - margin-top: 2em; - font-weight: bold; -} -.subparagraphHead, .likesubparagraphHead { - font-weight: bold; -} -.quote { - margin-bottom: 0.25em; - margin-top: 0.25em; - margin-left: 1em; - margin-right: 1em; - text-align: justify; -} -.verse { - white-space: nowrap; - margin-left: 2em} -div.maketitle { - text-align: center; -} -h2.titleHead { - text-align: center; -} -div.maketitle { - margin-bottom: 2em; -} -div.author, div.date { - text-align: center; -} -div.thanks { - text-align: left; - margin-left: 10%; - font-size: 85%; - font-style: italic; -} -div.author { - white-space: nowrap; -} -.quotation { - margin-bottom: 0.25em; - margin-top: 0.25em; - margin-left: 1em; -} -h1.partHead { - text-align: center; -} -img.graphics { - margin-left: 10%; -} -.figure { - width: 100%; -} -P.fancyvrb { - white-space: nowrap; -} -hr { - border: 0; - height: 1px; -} -div#fancyvrb { - white-space: nowrap; - background: #eee; - padding: 1em; -} diff -r ad304b606163 -r bebd5ff7fe7f en/htlatex.book --- a/en/htlatex.book Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#!/bin/bash -# -# This script is horrible. It's essentially a hacked copy of -# /usr/bin/htlatex from Fedora Core 6. I apologise for any lasting -# pain reading it causes. - -latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 -(cd $4 && bibtex hgbook) -(cd $4 && makeindex hgbook) -latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 -latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 -echo status $$ diff -r ad304b606163 -r bebd5ff7fe7f en/kdiff3.png Binary file en/kdiff3.png has changed diff -r ad304b606163 -r bebd5ff7fe7f en/metadata.svg --- a/en/metadata.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,328 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Changelog - Manifest - Filelogs - - diff -r ad304b606163 -r bebd5ff7fe7f en/mq-stack.svg --- a/en/mq-stack.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,270 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - prevent-compiler-reorder.patch - - namespace-cleanup.patch - - powerpc-port-fixes.patch - - report-devinfo-correctly.patch - { - { - present in series,but not applied - patches applied,changesets present - topmostapplied patch - 201ad3209902 - 126b84e593ae - a655daf15409 - e50d59aaea3a - - forbid-illegal-params.patch - - fix-memory-leak.patch - - diff -r ad304b606163 -r bebd5ff7fe7f en/note.png Binary file en/note.png has changed diff -r ad304b606163 -r bebd5ff7fe7f en/revlog.svg --- a/en/revlog.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Second parent - 32bf9a5f22c0 - - - - Revision hash - 34b8b7a15ea1 - - - - ... - Revision data (delta or snapshot) - - - - - - - First parent - 000000000000 - - - - Second parent - 000000000000 - - - - - Revision hash - ff9dc8bc2a8b - - - - ... - Revision data (delta or snapshot) - - - - - - - First parent - 34b8b7a15ea1 - - - - Second parent - 000000000000 - - - - Revision hash - 1b67dc96f27a - - - - ... - Revision data (delta or snapshot) - - - - - - - - First parent - ff9dc8bc2a8b - - - - Second parent - 000000000000 - - - - Revision hash - 5b80c922ebdd - - - - ... - Revision data (delta or snapshot) - - - - - - - First parent - ecacb6b4c9fd - - - - Second parent - 000000000000 - - - - Revision hash - 32bf9a5f22c0 - - - - ... - Revision data (delta or snapshot) - - - - - - First parent - ff9dc8bc2a8b - - - - Second parent - 000000000000 - - - - Revision hash - ecacb6b4c9fd - - - - ... - Revision data (delta or snapshot) - - - - - - - Head revision(no children) - Merge revision(two parents) - Branches(two revisions,same parent) - - - First revision(both parents null) - - First parent - 5b80c922ebdd - - - - - diff -r ad304b606163 -r bebd5ff7fe7f en/snapshot.svg --- a/en/snapshot.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,202 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - Index, rev 7 - - Revlog index (.i file) - Revlog data (.d file) - - - Snapshot, rev 4 - - Delta, rev 4 to 5 - - Delta, rev 5 to 6 - - Delta, rev 6 to 7 - - Delta, rev 2 to 3 - - diff -r ad304b606163 -r bebd5ff7fe7f en/tour-history.svg --- a/en/tour-history.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,289 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - (newest) - (oldest) - - 4: REV4 - - - revisionnumber - changesetidentifier - - diff -r ad304b606163 -r bebd5ff7fe7f en/tour-merge-conflict.svg --- a/en/tour-merge-conflict.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Greetings!I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing - - - - - - Greetings!I am Shehu Musa Abacha, cousin to the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing - - - - - - Greetings!I am Alhaji Abba Abacha, son of the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing - - - Base version - Our changes - Their changes - - diff -r ad304b606163 -r bebd5ff7fe7f en/tour-merge-merge.svg --- a/en/tour-merge-merge.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,380 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - 4: REV4 - - - 5: REV_my_new_hello - - - 6: REV6_my_new_hello - - tip (and head) - head - - - - merge - working directoryduring merge - - 4: REV4 - - - 5: REV_my_new_hello - - - 6: REV6_my_new_hello - - tip - - - 7: REV7_my_new_hello - Working directory during merge - Repository after merge committed - - diff -r ad304b606163 -r bebd5ff7fe7f en/tour-merge-pull.svg --- a/en/tour-merge-pull.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - 5: REV_my_new_hello - - - 6: REV6_my_new_hello - - tip (and head) - head - - diff -r ad304b606163 -r bebd5ff7fe7f en/tour-merge-sep-repos.svg --- a/en/tour-merge-sep-repos.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,466 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - 5: REV_my_hello - - my-hello - - 0: REV0 - - 1: REV1 - - 2: REV2 - - 3: REV3 - - 4: REV4 - - - - - - 5: REV_my_new_hello - - my-new-hello - newest changesdiffer - common history - - - - - - - head revision(has no children) - - diff -r ad304b606163 -r bebd5ff7fe7f en/undo-manual-merge.dot --- a/en/undo-manual-merge.dot Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -digraph undo_manual { - "first change" -> "second change"; - "second change" -> "third change"; - backout [label="back out\nsecond change", shape=box]; - "second change" -> backout; - "third change" -> "manual\nmerge"; - backout -> "manual\nmerge"; -} diff -r ad304b606163 -r bebd5ff7fe7f en/undo-manual.dot --- a/en/undo-manual.dot Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -digraph undo_manual { - "first change" -> "second change"; - "second change" -> "third change"; - backout [label="back out\nsecond change", shape=box]; - "second change" -> backout; -} diff -r ad304b606163 -r bebd5ff7fe7f en/undo-non-tip.dot --- a/en/undo-non-tip.dot Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -digraph undo_non_tip { - "first change" -> "second change"; - "second change" -> "third change"; - backout [label="back out\nsecond change", shape=box]; - "second change" -> backout; - merge [label="automated\nmerge", shape=box]; - "third change" -> merge; - backout -> merge; -} diff -r ad304b606163 -r bebd5ff7fe7f en/undo-simple.dot --- a/en/undo-simple.dot Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -digraph undo_simple { - "first change" -> "second change"; - "second change" -> "back out\nsecond change"; -} diff -r ad304b606163 -r bebd5ff7fe7f en/wdir-after-commit.svg --- a/en/wdir-after-commit.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - dfbbb33f3fa3 - - - e7639888bb2f - - 7b064d8bac5e - - - - 000000000000 - - History in repository - - - - dfbbb33f3fa3 - - - - 000000000000 - - First parent - Second parent - Parents of working directory - - - Newchangeset - - diff -r ad304b606163 -r bebd5ff7fe7f en/wdir-branch.svg --- a/en/wdir-branch.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - e7639888bb2f - - - - 7b064d8bac5e - - - - 000000000000 - - - - - ffb20e1701ea - - - - 000000000000 - - First parent - Second parent - Parents of working directory - - - - - ffb20e1701ea - - - Pre-existing head - Newly created head (and tip) - - - - diff -r ad304b606163 -r bebd5ff7fe7f en/wdir-merge.svg --- a/en/wdir-merge.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,425 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - 7b064d8bac5e - - - - 000000000000 - - - - - ffb20e1701ea - - - - e7639888bb2f - - First parent (unchanged) - Second parent - Parents of working directory - - - - - ffb20e1701ea - - - Pre-existing head - Newly created head (and tip) - - - - - - e7639888bb2f - - - diff -r ad304b606163 -r bebd5ff7fe7f en/wdir-pre-branch.svg --- a/en/wdir-pre-branch.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,364 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - e7639888bb2f - - - 7b064d8bac5e - - - - 000000000000 - - History in repository - - - - 7b064d8bac5e - - - - 000000000000 - - First parent - Second parent - Parents of working directory - - - - diff -r ad304b606163 -r bebd5ff7fe7f en/wdir.svg --- a/en/wdir.svg Tue Mar 10 21:42:19 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - e7639888bb2f - - 7b064d8bac5e - - - 000000000000 - - - History in repository - - - - - e7639888bb2f - - - - 000000000000 - - First parent - Second parent - - Parents of working directory - - - -