# Bazaar revision bundle v0.9 # # message: # change generated documentation extension from htm to html # committer: Alexander Belchenko # date: Thu 2007-08-02 13:28:36.318000078 +0300 === renamed file doc/developers/HACKING // doc/developers/HACKING.txt --- doc/developers/HACKING +++ doc/developers/HACKING.txt @@ -6,7 +6,7 @@ (The current version of this document is available in the file ``HACKING`` in the source tree, or at -http://doc.bazaar-vcs.org/bzr.dev/developers/HACKING.htm) +http://doc.bazaar-vcs.org/bzr.dev/developers/HACKING.html) Getting Started === modified file .bzrignore --- .bzrignore +++ .bzrignore @@ -24,7 +24,7 @@ # Mac droppings .DS_Store # win32 installer generated files -./doc/*.htm +./doc/*.html ./doc/bzr_man.txt ./py2exe.log ./tools/win32/bzr.iss @@ -34,7 +34,7 @@ ./html_docs ./pretty_docs ./api -doc/**/*.htm +doc/**/*.html doc/developers/performance.png bzrlib/_dirstate_helpers_c.c bzrlib/_knit_load_data_c.c === modified file Makefile --- Makefile +++ Makefile @@ -74,29 +74,26 @@ # translate txt docs to html doc_dir := doc txt_files := $(wildcard $(addsuffix /*.txt, $(doc_dir))) doc/bzr_man.txt -htm_files := $(patsubst %.txt, %.htm, $(txt_files)) +htm_files := $(patsubst %.txt, %.html, $(txt_files)) dev_txt_files := $(wildcard $(addsuffix /*.txt, doc/developers)) -dev_htm_files := $(patsubst %.txt, %.htm, $(dev_txt_files)) +dev_htm_files := $(patsubst %.txt, %.html, $(dev_txt_files)) pretty-html-docs: pretty_files pretty_docs: python -c "import os; os.mkdir('$(PRETTYDIR)')" -pretty_files: $(patsubst doc/%.txt, $(PRETTYDIR)/%.htm, $(txt_files)) - -doc/developers/%.htm: doc/developers/%.txt - python tools/rst2html.py --link-stylesheet --stylesheet=../default.css --footnote-references=superscript $< $@ - -doc/developers/HACKING.htm: doc/developers/HACKING - python tools/rst2html.py --link-stylesheet --stylesheet=../default.css --footnote-references=superscript $< $@ - -%.htm: %.txt +pretty_files: $(patsubst doc/%.txt, $(PRETTYDIR)/%.html, $(txt_files)) + +doc/developers/%.html: doc/developers/%.txt + python tools/rst2html.py --link-stylesheet --stylesheet=../default.css --footnote-references=superscript $< $@ + +%.html: %.txt python tools/rst2html.py --link-stylesheet --stylesheet=default.css --footnote-references=superscript $< $@ -$(PRETTYDIR)/%.htm: pretty_docs doc/%.txt +$(PRETTYDIR)/%.html: pretty_docs doc/%.txt python tools/rst2prettyhtml.py doc/bazaar-vcs.org.kid doc/$*.txt \ - $(PRETTYDIR)/$*.htm + $(PRETTYDIR)/$*.html MAN_DEPENDENCIES = bzrlib/builtins.py \ bzrlib/bundle/commands.py \ @@ -113,15 +110,14 @@ man1/bzr.1: $(MAN_DEPENDENCIES) python generate_docs.py -o $@ man -ALL_DOCS = $(htm_files) $(MAN_PAGES) doc/developers/HACKING.htm $(dev_htm_files) doc/developers/performance.png +ALL_DOCS = $(htm_files) $(MAN_PAGES) $(dev_htm_files) doc/developers/performance.png docs: $(ALL_DOCS) copy-docs: docs python tools/win32/ostools.py copytodir $(htm_files) \ doc/default.css NEWS README \ win32_bzr.exe/doc - python tools/win32/ostools.py copytodir doc/developers/HACKING.htm \ - $(dev_htm_files) \ + python tools/win32/ostools.py copytodir $(dev_htm_files) \ win32_bzr.exe/doc/developers # clean produced docs @@ -158,12 +154,10 @@ # clean on win32 all installer-related files and directories -clean-win32: +clean-win32: clean-docs python tools/win32/ostools.py remove build python tools/win32/ostools.py remove win32_bzr.exe python tools/win32/ostools.py remove py2exe.log - python tools/win32/ostools.py remove doc/*.htm - python tools/win32/ostools.py remove doc/developers/*.htm python tools/win32/ostools.py remove doc/bzr_man.txt python tools/win32/ostools.py remove tools/win32/bzr.iss python tools/win32/ostools.py remove bzr-setup*.exe === modified file NEWS --- NEWS +++ NEWS @@ -222,7 +222,7 @@ * Use exact encoding for merge directives. (Adeodato Simó, #120591) * Fix tempfile permissions error in smart server tar bundling under - Windows. (Martin_, #119330) + Windows. (Martin _, #119330) * Fix detection of directory entries in the inventory. (James Westby) @@ -231,7 +231,7 @@ * Issue a CONNECT request when connecting to an https server via a proxy to enable SSL tunneling. - (Vincent Ladeuil, #120678) + (Vincent Ladeuil, #120678) * Fix ``bzr log -r`` to support selecting merge revisions, both individually and as part of revision ranges. @@ -323,7 +323,7 @@ LIBRARY API BREAKS: * Testing cleanups - - ``bzrlib.repository.RepositoryTestProviderAdapter`` has been moved + ``bzrlib.repository.RepositoryTestProviderAdapter`` has been moved to ``bzrlib.tests.repository_implementations``; ``bzrlib.repository.InterRepositoryTestProviderAdapter`` has been moved to ``bzrlib.tests.interrepository_implementations``; === modified file doc/developers/bundles.txt --- doc/developers/bundles.txt +++ doc/developers/bundles.txt @@ -43,7 +43,7 @@ ================ `Bundle Format 4 spec`_ -.. _Bundle Format 4 spec: bundle-format4.htm +.. _Bundle Format 4 spec: bundle-format4.html Future Plans === modified file doc/developers/index.txt --- doc/developers/index.txt +++ doc/developers/index.txt @@ -9,40 +9,31 @@ Process ======= -* `General HACKING HOWTO `_ - - Guide to policies and tools for working on Bazaar itself. - -* `Profiling notes `_ - - Instructions on how to profile bzr code and visualize the results. +* `General HACKING HOWTO `_ |--| Guide to policies and tools + for working on Bazaar itself. + +* `Profiling notes `_ |--| Instructions on how to profile + bzr code and visualize the results. Plans ===== -* `Performance roadmap `_ - - The roadmap for fixing performance in bzr over the next few releases. +* `Performance roadmap `_ |--| The roadmap + for fixing performance in bzr over the next few releases. Specifications ============== -* `API versioning `_ - - bzrlib API versioning. - -* `Bundles `_ - - All about bzr bundles. - -* `Container format `_ - - Notes on a container format for streaming and storing Bazaar data. - -* `Indices `_ - - The index facilities available within bzrlib. - -* `Repositories `_ - - What repositories do and are used for. +* `API versioning `_ |--| bzrlib API versioning. + +* `Bundles `_ |--| All about bzr bundles. + +* `Container format `_ |--| Notes on a container format + for streaming and storing Bazaar data. + +* `Indices `_ |--| The index facilities available within bzrlib. + +* `Repositories `_ |--| What repositories do and are used for. + + +.. |--| unicode:: U+2014 === modified file doc/http_smart_server.txt --- doc/http_smart_server.txt +++ doc/http_smart_server.txt @@ -11,7 +11,7 @@ For more information on the smart server, and other ways to configure it see the main `smart server documentation`_. -.. _smart server documentation: server.htm +.. _smart server documentation: server.html Example ======= === modified file doc/index.txt --- doc/index.txt +++ doc/index.txt @@ -11,54 +11,40 @@ and what is documented on the wiki. -* `Tutorial `_ - (wiki page: http://bazaar-vcs.org/IntroductionToBzr) - - Explains how to use bzr. Loaded with examples. - -* `Configuration `_ - (wiki page: http://bazaar-vcs.org/ConfiguringBzr) - - Information on how to configure Bazaar. - -* `Setting up email `_ - (wiki page: http://bazaar-vcs.org/BzrSettingEmail) - - The various ways that exist to tell Bazaar your email address for - commits. - -* `Conflict handling `_ - - The various kind of conflicts you may encounter, and how to handle them. - -* `Plugins `_ - (wiki page: http://bazaar-vcs.org/BzrPlugins) - - Information on how to use plugins in Bazaar. - -* `Specifying revision `_ - (wiki page: http://bazaar-vcs.org/BzrRevisionSpec) - - Description of the subarguments for ``-r`` as used by commands such as - **bzr log** and **bzr merge**. - -* `Using aliases `_ - (wiki page: http://bazaar-vcs.org/CommandAliases) - - How to set up and use command aliases. - -* `Running a Bazaar server `_ - - How to run a server to allow remote access to Bazaar branches. - -* `Running a Bazaar HTTP server `_ - - How to run a smart HTTP server to allow remote access to Bazaar branches. - -* `Guidelines for modifying bzr `_ - - Guide to policies and tools for working on Bazaar itself. +* `Tutorial `_ |--| Explains how to use bzr. + Loaded with examples. + +* `Configuration `_ |--| Information on how to configure + Bazaar. + +* `Setting up email `_ |--| The various ways that exist + to tell Bazaar your email address for commits. + +* `Conflict handling `_ |--| The various kind of conflicts + you may encounter, and how to handle them. + +* `Plugins `_ |--| Information on how to use plugins in Bazaar. + +* `Specifying revision `_ |--| Description + of the subarguments for ``-r`` as used by commands such as + **bzr log** and **bzr merge**. + +* `Using aliases `_ |--| How to set up + and use command aliases. + +* `Running a Bazaar server `_ |--| How to run a server + to allow remote access to Bazaar branches. + +* `Running a Bazaar HTTP server `_ |--| How to run + a smart HTTP server to allow remote access to Bazaar branches. + +* `Guidelines for modifying bzr `_ |--| Guide + to policies and tools for working on Bazaar itself. + This document automatically created based on output of **bzr help**: * `Man page (help for bzr commands) `_ + + +.. |--| unicode:: U+2014 === modified file setup.py --- setup.py +++ setup.py @@ -209,8 +209,8 @@ if 'bdist_wininst' in sys.argv: import glob # doc files - docs = glob.glob('doc/*.htm') + ['doc/default.css'] - dev_docs = glob.glob('doc/developers/*.htm') + docs = glob.glob('doc/*.html') + ['doc/default.css'] + dev_docs = glob.glob('doc/developers/*.html') # python's distutils-based win32 installer ARGS = {'scripts': ['bzr', 'tools/win32/bzr-win32-bdist-postinstall.py'], 'ext_modules': ext_modules, @@ -295,7 +295,7 @@ 'cmdclass': command_classes, 'ext_modules': ext_modules, } - + ARGS.update(META_INFO) ARGS.update(BZRLIB) ARGS.update(PKG_DATA) === modified file tools/win32/bzr-win32-bdist-postinstall.py --- tools/win32/bzr-win32-bdist-postinstall.py +++ tools/win32/bzr-win32-bdist-postinstall.py @@ -111,7 +111,7 @@ directory_created(fldr) # link to documentation - docs = os.path.join(sys.exec_prefix, 'Doc', 'Bazaar', 'index.htm') + docs = os.path.join(sys.exec_prefix, 'Doc', 'Bazaar', 'index.html') dst = os.path.join(fldr, 'Documentation.lnk') create_shortcut(docs, 'Bazaar Documentation', dst) file_created(dst) === modified file tools/win32/bzr.iss.cog --- tools/win32/bzr.iss.cog +++ tools/win32/bzr.iss.cog @@ -120,7 +120,7 @@ [Icons] -Name: "{group}\Documentation index"; Filename: "{app}\doc\index.htm"; WorkingDir: "{app}\doc"; +Name: "{group}\Documentation index"; Filename: "{app}\doc\index.html"; WorkingDir: "{app}\doc"; Name: "{group}\Bazaar Home Page"; Filename: "{app}\bazaar.url"; Comment: "http://www.bazaar-vcs.org"; Name: "{group}\Start Bzr in cmd shell"; Filename: "{cmd}"; Parameters: "/K start_bzr.bat"; WorkingDir: "{app}"; IconFilename: "{app}\bzr.exe"; Comment: "Open new Bzr session"; Name: "{group}\Uninstall Bazaar"; Filename: "{uninstallexe}"; IconFileName: "{sys}\shell32.dll"; IconIndex: 101; Comment: "Remove Bzr completely"; === modified directory // last-changed:bialix@ukr.net-20070802102836-45ys1axb2 ... uak8rno # revision id: bialix@ukr.net-20070802102836-45ys1axb2uak8rno # sha1: 05b49a4b1ae5cf59916389d0b2961775f9bc7642 # inventory sha1: 94e3b12a0f2d666ecb6be3d10d4183b8407cd5d2 # parent ids: # pqm@pqm.ubuntu.com-20070801171451-en3tds1hzlru2j83 # base id: pqm@pqm.ubuntu.com-20070801171451-en3tds1hzlru2j83 # properties: # branch-nick: htm2html