# # # rename "branches" # to "wiki/Branches" # # add_file "wiki/Branches/Template.mdwn" # content [f8d1b1659e01493926c418b0dd1048a2d81c43ef] # # add_file "wiki/Branches/nvm.annotate.mdwn" # content [c2d66822458cffd612d0b502ae00389b4e491e77] # # add_file "wiki/Branches/nvm.automate-stdio-ticker.mdwn" # content [c98e02d718fe6ba4a705bdfa9410ee28e3e7d419] # # add_file "wiki/Branches/nvm.automate_show_conflict.mdwn" # content [e614291723111f29b2b83eb399c11476efcddf3c] # # add_file "wiki/Branches/nvm.botan.mdwn" # content [29eb336ec642e5c751dba2897ede7fe9f2391384] # # add_file "wiki/Branches/nvm.botan.system-switch.mdwn" # content [5cc133584d45fd932451853aad6c2eb072042d83] # # add_file "wiki/Branches/nvm.cvsimport-branch-reconstruction.mdwn" # content [83c19d7558a1159161ccf4aa44012bb0ae773928] # # add_file "wiki/Branches/nvm.cvssync-refactor.mdwn" # content [e4852492ff96ecaa17ed91331349a47bdbc045c8] # # add_file "wiki/Branches/nvm.cvssync.mdwn" # content [9f3a5e6db57d778187ef89e5495b4807aad24242] # # add_file "wiki/Branches/nvm.debian.mdwn" # content [13f601c8de2c403900ba46efeb000defc54eff03] # # add_file "wiki/Branches/nvm.experiment.db-compaction.mdwn" # content [db2201548663056054b2db1285788d811a288afd] # # add_file "wiki/Branches/nvm.experiment.encapsulation.mdwn" # content [db92405be2cbd75c5f6c66a19bac6df4e7b88de3] # # add_file "wiki/Branches/nvm.experiment.iface-refactor.mdwn" # content [3efc740b5e667617dcd7f7573544f35d44ed74bd] # # add_file "wiki/Branches/nvm.experiment.informal_messages_to_stdio.mdwn" # content [a52cd3b07095dc521d460795a8826a914d6d1fb3] # # add_file "wiki/Branches/nvm.experimental.win32_pipes.mdwn" # content [1874c6b071ec0daa42135b2c03b5db171f109c88] # # add_file "wiki/Branches/nvm.experimental.win32_pipes_2.mdwn" # content [980aff67b79b837072af9b90f286db7277e99b3c] # # add_file "wiki/Branches/nvm.gaps.mdwn" # content [88aaf75f63cce8e4e3c7b32c3b7ecd113267c5f6] # # add_file "wiki/Branches/nvm.git.mdwn" # content [1797b3b8ee35b554e046b4b145b9721a265a5cec] # # add_file "wiki/Branches/nvm.heights.mdwn" # content [e77e078cffce871729f03a9f2510b300702de163] # # add_file "wiki/Branches/nvm.lapo.color.mdwn" # content [e64ff7d14536d451e4b9f956e5d69c838b925fe3] # # add_file "wiki/Branches/nvm.levitte.usher.mdwn" # content [d4b708730e9591f0300f5eadde4ab6afffdb7b7f] # # add_file "wiki/Branches/nvm.partialpull.mdwn" # content [b45b0e7f1405fdd40059504b078439015a6230f8] # # add_file "wiki/Branches/nvm.revision_diff.mdwn" # content [52d330d77404a035b3d609a6c03b1e94150538e7] # # add_file "wiki/Branches/nvm.svn_import.mdwn" # content [94ceb699ea5c8b8cd1ee5e360c3b833bf2d8cf94] # # patch "wiki/BranchStatuses.mdwn" # from [7a8f04d2e77b7cc840c97e50050245a3cf292f39] # to [c5f23ac78f14ef0da75d86402fa3b16155bc6ca7] # # patch "wiki/Branches/nvm.automate-netsync.mdwn" # from [d656990d46fe0c3108cec09085dd62fdb6a5bb45] # to [501cce33bce9e6889472fdef8e50f68ec8a94a05] # # patch "wiki/Branches/nvm.automate_out_of_band.mdwn" # from [db92fdf51d2741f361f73ff161e8f714418936e1] # to [fec70ecf9298d9f4fe989467d4a30fc58744e13a] # # patch "wiki/Branches/nvm.commit_without_-b.mdwn" # from [750c9b07179b6e64e960d4c208ebca9b331a540a] # to [43d2d5c52a662a38454bc3f8cdf5104daab2e66a] # # patch "wiki/Branches/nvm.experiment.meta-selector.mdwn" # from [c2b2dd03c54a46bde58cd020aa35082667205660] # to [7e447c7a33673a187232fa4aea907f71d0fee823] # # patch "wiki/Branches/nvm.lapo.selectors.mdwn" # from [7111220eb4480865194682b44169167976f4b115] # to [cb2414bbce07a4ed0a6e81c41eaa5f1779e37150] # # patch "wiki/Branches/nvm.web.ikiwiki.mdwn" # from [259562b841f4250c2a256f2034d9ef0247044ba2] # to [fff881b85aa798a138ac02b1f8915385c450ffa0] # # patch "wiki/MtnSummit/2008.mdwn" # from [15fa9e1c23d3924a8d8d63d163f1dab2bfe7ab95] # to [ebe3cce0e2e9b2fa9d13c768b48ecadddc9f98f8] # ============================================================ --- wiki/Branches/Template.mdwn f8d1b1659e01493926c418b0dd1048a2d81c43ef +++ wiki/Branches/Template.mdwn f8d1b1659e01493926c418b0dd1048a2d81c43ef @@ -0,0 +1,7 @@ +## n.v.m.TEMPLATE ## + +Contact: [[People/WikiName]] + +*Synopsis* + +Status: ============================================================ --- wiki/Branches/nvm.annotate.mdwn c2d66822458cffd612d0b502ae00389b4e491e77 +++ wiki/Branches/nvm.annotate.mdwn c2d66822458cffd612d0b502ae00389b4e491e77 @@ -0,0 +1,12 @@ +[[!tag migration-wip]] +## n.v.m.annotate ## + +Contact: [[People/EmileSnyder]] + +Staging branch for work on the "annotate" command. As of 2006-01-30, there is work in progress on implementing per-file-DAGs of the revision graph in the db so that you can walk just the portion of the full graph in which changes were made to a given file. + +In order to try it, you must migrate your db and then run 'monotone db filedagify' on the database of interest. + +Todo: write tests for schema migration, fix kill_rev_locally to get rid of the node_revision_ancestry entries as well, figure out why new annotate is not identical to the old implementation, extend to handle all types of file changes (renames and attr changes) so it can be used to speed up restricted log too, roll filedagify into the migration? + +Status: Work in progress. ============================================================ --- wiki/Branches/nvm.automate-stdio-ticker.mdwn c98e02d718fe6ba4a705bdfa9410ee28e3e7d419 +++ wiki/Branches/nvm.automate-stdio-ticker.mdwn c98e02d718fe6ba4a705bdfa9410ee28e3e7d419 @@ -0,0 +1,13 @@ +[[!tag migration-wip]] +## n.v.m.automate-stdio-ticker ## + +Contact: [[People/ThomasKeller]] + +Tries to implement a stdio ticker so automate clients can +actually monitor the progress of a netsync operation. + +Status: Unusable, should probably be suspended and/or redone from +scratch (and maybe rethought even when / if [[Branches/nvm.nuskool]] +gets ready?) + +Superseded by [[Branches/nvm.automate_out_of_band]] ? ============================================================ --- wiki/Branches/nvm.automate_show_conflict.mdwn e614291723111f29b2b83eb399c11476efcddf3c +++ wiki/Branches/nvm.automate_show_conflict.mdwn e614291723111f29b2b83eb399c11476efcddf3c @@ -0,0 +1,10 @@ +[[!tag migration-wip]] +## n.v.m.automate\_show\_conflict ## + +Contact: [[People/StephenLeake]] + +Provide simple flow to resolve non-content conflicts. + +Strategy: Add 'automate show_conflicts', to aid in determining how to resolve the conflicts. Then add options to merge to specify how to resolve the conflicts. + +Status: Just started; 'automate show_conflicts' works for "file added on left and right" case. Need to add all other conflict cases. ============================================================ --- wiki/Branches/nvm.botan.mdwn 29eb336ec642e5c751dba2897ede7fe9f2391384 +++ wiki/Branches/nvm.botan.mdwn 29eb336ec642e5c751dba2897ede7fe9f2391384 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.botan ## + +Contact: [[People/MarkusSchiltknecht]] or [[People/TimothyBrownawell]] + +This is the staging branch for Botan, i.e. where we manually propagate new upstream Botan versions to, before landing on mainline. See also botan/README.botan-monotone. + +Status: Botan version 1.7.4 landed on mainline. ============================================================ --- wiki/Branches/nvm.botan.system-switch.mdwn 5cc133584d45fd932451853aad6c2eb072042d83 +++ wiki/Branches/nvm.botan.system-switch.mdwn 5cc133584d45fd932451853aad6c2eb072042d83 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.botan.system-switch ## + +Contact: [[People/MarkusSchiltknecht]] + +Adds a --with-system-botan configure switch, to allow using the system provided copy of botan. Especially note, that the system provided library most probably features the assembler optimizations for SHA1, where as the bundled botan currently does not. + +Status: Experimentation ============================================================ --- wiki/Branches/nvm.cvsimport-branch-reconstruction.mdwn 83c19d7558a1159161ccf4aa44012bb0ae773928 +++ wiki/Branches/nvm.cvsimport-branch-reconstruction.mdwn 83c19d7558a1159161ccf4aa44012bb0ae773928 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.cvsimport-branch-reconstruction ## + +Contact: [[People/MarkusSchiltknecht]] + +Features a graph-based cvs import algorithm, loosely based on the concepts of cvs2svn 2.0. + +Status: Still close to completion :-) - for more details, see [[CvsImport]] ============================================================ --- wiki/Branches/nvm.cvssync-refactor.mdwn e4852492ff96ecaa17ed91331349a47bdbc045c8 +++ wiki/Branches/nvm.cvssync-refactor.mdwn e4852492ff96ecaa17ed91331349a47bdbc045c8 @@ -0,0 +1,26 @@ +[[!tag migration-wip]] +## n.v.m.cvssync.refactor ## + +Contact: [[People/ChristofPetig]] + +A re-implementation of the cvssync architecture to be more modular, including a separate external process that interacts as a cvs client. + +Status: +What is done: + + * mtn_cvs pull, push and takeover work with side branches and all sorts of strange setups (see tests) and are now attribute based + +What needs to be done: + + * implement changed files + * implement sane branch connecting (or share with cvs_import) + * share the changeset-ification logic with cvs_import (I use the most simple approach for now) + * write documentation + * write migration helpers for the old branch + +What can be put into mainline: + + * the piece_table abstraction can be shared with cvs_import (once I had committed the change) + * all automate extensions (the synchronization commands are about to change again to use attributes, so they might wait) + * the mtn_automate class (C++ wrapper library to access monotone via automate) + * the mtn_cvs directory infrastucture can be put into mainline but can wait as well until it's finished ============================================================ --- wiki/Branches/nvm.cvssync.mdwn 9f3a5e6db57d778187ef89e5495b4807aad24242 +++ wiki/Branches/nvm.cvssync.mdwn 9f3a5e6db57d778187ef89e5495b4807aad24242 @@ -0,0 +1,14 @@ +[[!tag migration-wip]] +## n.v.m.cvssync ## + +(outdated) + +Contact: [[People/ChristofPetig]] + +Adds two-way syncing with (remote) CVS servers + +Status: Christof (and his collegues) use this branch for their daily work against their CVS servers, so it's definitely usable. Documentation is available. + +Open issues: the data structure (map) has difficulties and is inefficient for large (>1000 changesets) repositories; propagates gather too much changelog info; most problems arise when $Id$ tags get expanded differently; not yet reindented with GNU style. + +See also [[CvsSyncHints]]. ============================================================ --- wiki/Branches/nvm.debian.mdwn 13f601c8de2c403900ba46efeb000defc54eff03 +++ wiki/Branches/nvm.debian.mdwn 13f601c8de2c403900ba46efeb000defc54eff03 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.debian ## + +Contact: [[People/MatthewNicholson]] + +This branch adds a monotone-server debian package and also includes some tweaks to the existing package like installing the bash completion files. This package handles creation and management of a monotone database and key pair and also includes scripts for stopping and starting the server. The package will also attempt to do db migrate and similar operations if necessary during upgrades. + +Status: Merged into mainline. ============================================================ --- wiki/Branches/nvm.experiment.db-compaction.mdwn db2201548663056054b2db1285788d811a288afd +++ wiki/Branches/nvm.experiment.db-compaction.mdwn db2201548663056054b2db1285788d811a288afd @@ -0,0 +1,9 @@ +[[!tag migration-wip]] +## n.v.m.experiment.db-compaction ## + +Contact: [[People/MarkusSchiltknecht]] + +A branch for trying out things from [[DatabaseCompaction]]. It has been used for turning hex encoded hashes ones into binary data in the database. That change has landed on mainline on 31.03.2008. + +Status: landed on mainline + ============================================================ --- wiki/Branches/nvm.experiment.encapsulation.mdwn db92405be2cbd75c5f6c66a19bac6df4e7b88de3 +++ wiki/Branches/nvm.experiment.encapsulation.mdwn db92405be2cbd75c5f6c66a19bac6df4e7b88de3 @@ -0,0 +1,11 @@ +[[!tag migration-wip]] +## n.v.m.experiment.encapsulation ## + +Contact: [[People/ZackWeinberg]] + +Removed the `app_state` from lots of places, instead we only pass down +the required objects, which were formerly held in the +`app_state`. These include: the lua interpreter, the database, the key +store and the options. + +Status: landed on mainline ============================================================ --- wiki/Branches/nvm.experiment.iface-refactor.mdwn 3efc740b5e667617dcd7f7573544f35d44ed74bd +++ wiki/Branches/nvm.experiment.iface-refactor.mdwn 3efc740b5e667617dcd7f7573544f35d44ed74bd @@ -0,0 +1,15 @@ +[[!tag migration-wip]] +## n.v.m.experiment.iface-refactor ## + +Contact: [[People/NathanielSmith]] + +Some experimental UI and doc tweaks, in attempt to make things more +streamlined and friendly to new users. + +Current changes: `setup` is renamed to `new_project`. `pull` and +`setup` have `--new-db` switches, avoiding the need to `db init` in +almost all cases. Tempted to rename `genkey` too... + +Todo: get feedback; update docs accordingly; write tests + +Status: Work in progress. ============================================================ --- wiki/Branches/nvm.experiment.informal_messages_to_stdio.mdwn a52cd3b07095dc521d460795a8826a914d6d1fb3 +++ wiki/Branches/nvm.experiment.informal_messages_to_stdio.mdwn a52cd3b07095dc521d460795a8826a914d6d1fb3 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.experiment.informal\_messages\_to\_stdio ## + +Contact: [[People/ThomasKeller]] + +An attempt to bring warnings and informal messages properly encoded into automate stdio. + +Status: Doesn't compile, not even alpha state. Hope to find some time for this on the next summit. ============================================================ --- wiki/Branches/nvm.experimental.win32_pipes.mdwn 1874c6b071ec0daa42135b2c03b5db171f109c88 +++ wiki/Branches/nvm.experimental.win32_pipes.mdwn 1874c6b071ec0daa42135b2c03b5db171f109c88 @@ -0,0 +1,16 @@ +[[!tag migration-wip]] +## n.v.m.experimental.win32\_pipes ## + +Contact: [[People/StephenLeake]] + +mtn sync file: and mtn sync ssh: do _not_ work reliably on Windows [[MinGW]]. + +There core problem is that Win32 does not support `select` on pipes. + +This branch attempts to replace Win32 pipes by sockets. + +It fails, because ssh doesn't create sockets when it runs mtn. + +See comments in netxx_pipe.hh + +Status: on hold; use Cygwin instead, where things just work. ============================================================ --- wiki/Branches/nvm.experimental.win32_pipes_2.mdwn 980aff67b79b837072af9b90f286db7277e99b3c +++ wiki/Branches/nvm.experimental.win32_pipes_2.mdwn 980aff67b79b837072af9b90f286db7277e99b3c @@ -0,0 +1,14 @@ +[[!tag migration-wip]] +## n.v.m.experimental.win32\_pipes\_2 ## + +Contact: [[People/StephenLeake]] + +Second attempt to fix mtn sync file: and mtn sync ssh: on Windows [[MinGW]]. + +See n.v.m.experimental.win32_pipes + +This branch attempts to fix the named pipe solution that is in the main branch. + +See comments in netxx_pipe.hh + +Status: on hold; no actual work beyond planning done. ============================================================ --- wiki/Branches/nvm.gaps.mdwn 88aaf75f63cce8e4e3c7b32c3b7ecd113267c5f6 +++ wiki/Branches/nvm.gaps.mdwn 88aaf75f63cce8e4e3c7b32c3b7ecd113267c5f6 @@ -0,0 +1,20 @@ +[[!tag migration-wip]] +## n.v.m.gaps ## + +Contact: [[People/ChristofPetig]] and [[People/MarkusSchiltknecht]] respectively + +Connected to [[Branches/nvm.partialpull]]. + +Both branches are about partial pulls, i.e. storing only revisions +newer than those of a certain horizon (including them). See +[[PartialPull]] for more information and a nice illustration. Both +branches introduce some form of a sentinel, which covers an inexistant +or incomplete revision. The difference for n.v.m.gaps is, that these +sentinels don't just cover all revisions from the covered one until +the root (null revision), but to any arbitrary revision, from which we +have the revision data again. + +For more information, see this mailing list thread here: + + +Status: Experimentation ============================================================ --- wiki/Branches/nvm.git.mdwn 1797b3b8ee35b554e046b4b145b9721a265a5cec +++ wiki/Branches/nvm.git.mdwn 1797b3b8ee35b554e046b4b145b9721a265a5cec @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.git ## + +Contact: [[People/PetrBaudis]] + +Adds two-way syncing with git repositories (unix only). + +Status: I'm not quite sure. Petr? (ms) hasn't been touched for awhile, stalled. ============================================================ --- wiki/Branches/nvm.heights.mdwn e77e078cffce871729f03a9f2510b300702de163 +++ wiki/Branches/nvm.heights.mdwn e77e078cffce871729f03a9f2510b300702de163 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.heights ## + +Contact: [[People/ThomasMoschny]] + +Implemented [[RevisionNumbering]]. The branch also serves as testbed for developing and testing applications of the heights, e.g. fast restricted log and fast annotate. + +Status: Currently merged into mainline. ============================================================ --- wiki/Branches/nvm.lapo.color.mdwn e64ff7d14536d451e4b9f956e5d69c838b925fe3 +++ wiki/Branches/nvm.lapo.color.mdwn e64ff7d14536d451e4b9f956e5d69c838b925fe3 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.lapo.color ## + +Contact: [[People/LapoLuchini]] + +Making use of extra terminal features that may be available, such as colours (useful for diff and for asciik branch-lines). + +Status: rough and experimental ============================================================ --- wiki/Branches/nvm.levitte.usher.mdwn d4b708730e9591f0300f5eadde4ab6afffdb7b7f +++ wiki/Branches/nvm.levitte.usher.mdwn d4b708730e9591f0300f5eadde4ab6afffdb7b7f @@ -0,0 +1,10 @@ +[[!tag migration-wip]] +## n.v.m.levitte.usher ## + +Contact: [[People/RichardLevitte]] +Created: 2006-02-28 + +The purpose of this branch is to add a suite of tests for usher and make it a supported program instead of just a contributed thingy. + +Status: Work in progress + ============================================================ --- wiki/Branches/nvm.partialpull.mdwn b45b0e7f1405fdd40059504b078439015a6230f8 +++ wiki/Branches/nvm.partialpull.mdwn b45b0e7f1405fdd40059504b078439015a6230f8 @@ -0,0 +1,24 @@ +[[!tag migration-wip]] +## n.v.m.partialpull ## + +Contact: [[People/ChristofPetig]] + +Connected to [[Branches/nvm.gaps]]. + +Both branches are about partial pulls, i.e. storing only revisions +newer than those of a certain horizon (including them). See +[[PartialPull]] for more information and a nice illustration. Both +branches introduce some form of a sentinel, which covers an inexistant +or incomplete revision. The difference for n.v.m.gaps is, that these +sentinels don't just cover all revisions from the covered one until +the root (null revision), but to any arbitrary revision, from which we +have the revision data again. + +For more information, see this mailing list thread here: + + +Status: Experimentation + + + + ============================================================ --- wiki/Branches/nvm.revision_diff.mdwn 52d330d77404a035b3d609a6c03b1e94150538e7 +++ wiki/Branches/nvm.revision_diff.mdwn 52d330d77404a035b3d609a6c03b1e94150538e7 @@ -0,0 +1,17 @@ +[[!tag migration-wip]] +## n.v.m.revision_diff ## + +Contact: [[People/ThomasKeller]] + +Replaces `automate content_diff` by a generic `automate diff` command +which outputs the complete changeset (including node adds, drops, +renames and attribute changes) in an generic basic\_io format. The +actual diff is included in a `data` stanza in unified diff format. + +Status: Stalled for quite a long time, because there hasn't yet been +an consensus if this should really be the "official" format mtn should +use to express external changesets - primarily because once this is +set into stone we certainly want an `automate apply_diff` command to +complement this functionality. We also still have to find a way to +express binary deltas within this new format to make it really useful +for the `apply_diff` use case. ============================================================ --- wiki/Branches/nvm.svn_import.mdwn 94ceb699ea5c8b8cd1ee5e360c3b833bf2d8cf94 +++ wiki/Branches/nvm.svn_import.mdwn 94ceb699ea5c8b8cd1ee5e360c3b833bf2d8cf94 @@ -0,0 +1,8 @@ +[[!tag migration-wip]] +## n.v.m.svn\_import ## + +Contact: [[People/MarkusSchiltknecht]] + +An initial attempt at importing subversion repositories into monotone. Didn't touch that for a while, as the CVS importer is still bugging me. + +Status: Experimentation ============================================================ --- wiki/BranchStatuses.mdwn 7a8f04d2e77b7cc840c97e50050245a3cf292f39 +++ wiki/BranchStatuses.mdwn c5f23ac78f14ef0da75d86402fa3b16155bc6ca7 @@ -1,259 +1,5 @@ -[[!tag migration-done]] +[[!tag migration-wip]] Currently active development branches: +[[!inline pages="wiki/Branches/* and !wiki/Branches/Template" sort=title show=0 raw=yes]] -# n.v.m.cvssync (outdated) - -Contact: [[People/ChristofPetig]] - -Adds two-way syncing with (remote) CVS servers - -Status: Christof (and his collegues) use this branch for their daily work against their CVS servers, so it's definitely usable. Documentation is available. - -Open issues: the data structure (map) has difficulties and is inefficient for large (>1000 changesets) repositories; propagates gather too much changelog info; most problems arise when $Id$ tags get expanded differently; not yet reindented with GNU style. - -See also [[CvsSyncHints]]. - -# n.v.m.cvssync.refactor - -Contact: [[People/ChristofPetig]] - -A re-implementation of the cvssync architecture to be more modular, including a separate external process that interacts as a cvs client. - -Status: -What is done: - - * mtn_cvs pull, push and takeover work with side branches and all sorts of strange setups (see tests) and are now attribute based - -What needs to be done: - - * implement changed files - * implement sane branch connecting (or share with cvs_import) - * share the changeset-ification logic with cvs_import (I use the most simple approach for now) - * write documentation - * write migration helpers for the old branch - -What can be put into mainline: - - * the piece_table abstraction can be shared with cvs_import (once I had committed the change) - * all automate extensions (the synchronization commands are about to change again to use attributes, so they might wait) - * the mtn_automate class (C++ wrapper library to access monotone via automate) - * the mtn_cvs directory infrastucture can be put into mainline but can wait as well until it's finished - -# n.v.m.git - -Contact: [[People/PetrBaudis]] - -Adds two-way syncing with git repositories (unix only). - -Status: I'm not quite sure. Petr? (ms) hasn't been touched for awhile, stalled. - -# n.v.m.experiment.meta-selector - -(renamed from n.v.m.levitte.select-heads-of) - -Contact: [[People/RichardLevitte]] - -Adds a framework for [[MagicSelectors]]. Currently implements [[H:|MagicSelectors#heads]] and [[branch point/last common ancestor|MagicSelectors#branchpoint]]. - -Status: Ready for merge with n.v.m. - -# n.v.m.levitte.usher - -Contact: [[People/RichardLevitte]] -Created: 2006-02-28 - -The purpose of this branch is to add a suite of tests for usher and make it a supported program instead of just a contributed thingy. - -Status: Work in progress - -# n.v.m.experiment.iface-refactor - -Contact: [[People/NathanielSmith]] - -Some experimental UI and doc tweaks, in attempt to make things more streamlined and friendly to new users. - -Current changes: "setup" is renamed to "new_project". "pull" and "setup" have --new-db switches, avoiding the need to "db init" in almost all cases. Tempted to rename "genkey" too... - -Todo: get feedback; update docs accordingly; write tests - -Status: Work in progress. - -# n.v.m.annotate - -Contact: [[People/EmileSnyder]] - -Staging branch for work on the "annotate" command. As of 2006-01-30, there is work in progress on implementing per-file-DAGs of the revision graph in the db so that you can walk just the portion of the full graph in which changes were made to a given file. - -In order to try it, you must migrate your db and then run 'monotone db filedagify' on the database of interest. - -Todo: write tests for schema migration, fix kill_rev_locally to get rid of the node_revision_ancestry entries as well, figure out why new annotate is not identical to the old implementation, extend to handle all types of file changes (renames and attr changes) so it can be used to speed up restricted log too, roll filedagify into the migration? - -Status: Work in progress. - -# n.v.m.debian - -Contact: [[People/MatthewNicholson]] - -This branch adds a monotone-server debian package and also includes some tweaks to the existing package like installing the bash completion files. This package handles creation and management of a monotone database and key pair and also includes scripts for stopping and starting the server. The package will also attempt to do db migrate and similar operations if necessary during upgrades. - -Status: Merged into mainline. - -# n.v.m.cvsimport-branch-reconstruction - -Contact: [[People/MarkusSchiltknecht]] - -Features a graph-based cvs import algorithm, loosely based on the concepts of cvs2svn 2.0. - -Status: Still close to completion :-) - for more details, see [[CvsImport]] - -# n.v.m.experiment.db-compaction - -Contact: [[People/MarkusSchiltknecht]] - -A branch for trying out things from [[DatabaseCompaction]]. It has been used for turning hex encoded hashes ones into binary data in the database. That change has landed on mainline on 31.03.2008. - -Status: landed on mainline - -# n.v.m.experiment.encapsulation - -Contact: [[People/ZackWeinberg]] - -Removed the app_state from lots of places, instead we only pass down the required objects, which were formerly held in the app_state. These include: the lua interpreter, the database, the key store and the options. - -Status: landed on mainline - -# n.v.m.partialpull and n.v.m.gaps - -Contact: [[People/ChristofPetig]] and [[People/MarkusSchiltknecht]] respectively - -Both branches are about partial pulls, i.e. storing only revisions newer than those of a certain horizon (including them). See [[PartialPull]] for more information and a nice illustration. Both branches introduce some form of a sentinel, which covers an inexistant or incomplete revision. The difference for n.v.m.gaps is, that these sentinels don't just cover all revisions from the covered one until the root (null revision), but to any arbitrary revision, from which we have the revision data again. - -For more information, see this mailing list thread here: - -Status: Experimentation - -# n.v.m.botan - -Contact: [[People/MarkusSchiltknecht]] or [[TimothyBrownawell]] - -This is the staging branch for Botan, i.e. where we manually propagate new upstream Botan versions to, before landing on mainline. See also botan/README.botan-monotone. - -Status: Botan version 1.7.4 landed on mainline. - -# n.v.m.botan.system-switch - -Contact: [[People/MarkusSchiltknecht]] - -Adds a --with-system-botan configure switch, to allow using the system provided copy of botan. Especially note, that the system provided library most probably features the assembler optimizations for SHA1, where as the bundled botan currently does not. - -Status: Experimentation - -# n.v.m.svn_import - -Contact: [[People/MarkusSchiltknecht]] - -An initial attempt at importing subversion repositories into monotone. Didn't touch that for a while, as the CVS importer is still bugging me. - -Status: Experimentation - -# n.v.m.heights - -Contact: [[People/ThomasMoschny]] - -Implemented [[RevisionNumbering]]. The branch also serves as testbed for developing and testing applications of the heights, e.g. fast restricted log and fast annotate. - -Status: Currently merged into mainline. - -# n.v.m.revision_diff - -Contact: [[People/ThomasKeller]] - -Replaces "automate content_diff" by a generic "automate diff" command which outputs the complete changeset (including node adds, drops, renames and attribute changes) in an generic basic_io format. The actual diff is included in a "data" stanza in unified diff format. - -Status: Stalled for quite a long time, because there hasn't yet been an consensus if this should really be the "official" format mtn should use to express external changesets - primarily because once this is set into stone we certainly want an "automate apply_diff" command to complement this functionality. We also still have to find a way to express binary deltas within this new format to make it really useful for the "apply_diff" use case. - -# n.v.m.commit_without_-b - -Contact: [[People/ThomasKeller]] - -An attempt to remove the --branch option from "mtn commit" and replace the functionality by a new "mtn branch" command which explicitely sets the branch stanza in \_MTN/options. This basically works, but is not thoroughly thought through for now, basically because we loose the old branch information after "mtn branch", so subsequent commands like "mtn update" which still rely on the old_revision and the recorded branch name fail badly unless the workspace is committed again. So, what still needs to be done is - - 1. if mtn branch is triggered on an unmodified workspace, mtn commit should succeed and just add the new branch cert to old_revision - 1. if the branch is switched, the new branch name should be recorded as "new_branch" while keeping "branch" untouched unless commit happens, so "mtn update" and friends work properly - 1. mtn revert should remove any "new_branch" stanza from \_MTN/options - 1. eventually "mtn branch" should be renamed to "mtn switch" and get some more functionality (i.e. if switched to a named, existing branch, update the workspace to the head of this branch) - -Status: Stalled, decide what to do with all that. - -# n.v.m.experiment.informal_messages_to_stdio - -Contact: [[People/ThomasKeller]] - -An attempt to bring warnings and informal messages properly encoded into automate stdio. - -Status: Doesn't compile, not even alpha state. Hope to find some time for this on the next summit. - -# n.v.m.automate-netsync and n.v.m.automate-stdio-ticker - -Contact: [[People/ThomasKeller]] - -The former brings push/pull/sync to automate, while the latter tries to implement a stdio ticker so automate clients can actually monitor the progress of a netsync operation. - -Status: Unusable, should probably be suspended and/or redone from scratch (and maybe rethought even when / if n.v.m.nuskool gets ready?) - -# n.v.m.lapo.color - -Contact: [[People/LapoLuchini]] - -Making use of extra terminal features that may be available, such as colours (useful for diff and for asciik branch-lines). - -Status: rough and experimental - -# n.v.m.automate_show_conflict - -Contact: [[People/StephenLeake]] - -Goal: Provide simple flow to resolve non-content conflicts. - -Strategy: Add 'automate show_conflicts', to aid in determining how to resolve the conflicts. Then add options to merge to specify how to resolve the conflicts. - -Status: Just started; 'automate show_conflicts' works for "file added on left and right" case. Need to add all other conflict cases. - -# n.v.m.experimental.win32_pipes - -Contact: [[People/StephenLeake]] - -mtn sync file: and mtn sync ssh: do _not_ work reliably on Windows [[MinGW]]. - -There core problem is that Win32 does not support 'select' on pipes. - -This branch attempts to replace Win32 pipes by sockets. - -It fails, because ssh doesn't create sockets when it runs mtn. - -See comments in netxx_pipe.hh - -Status: on hold; use Cygwin instead, where things just work. - -# n.v.m.experimental.win32_pipes_2 - -Contact: [[People/StephenLeake]] - -Second attempt to fix mtn sync file: and mtn sync ssh: on Windows [[MinGW]]. - -See n.v.m.experimental.win32_pipes - -This branch attempts to fix the named pipe solution that is in the main branch. - -See comments in netxx_pipe.hh - -Status: on hold; no actual work beyond planning done. - -# n.v.m.TEMPLATE - -Contact: [[People/WikiName]] - -*Synopsis* - -Status: ============================================================ --- wiki/Branches/nvm.automate-netsync.mdwn d656990d46fe0c3108cec09085dd62fdb6a5bb45 +++ wiki/Branches/nvm.automate-netsync.mdwn 501cce33bce9e6889472fdef8e50f68ec8a94a05 @@ -1,8 +1,11 @@ -[[!tag branch MtnSummit2008]] +[[!tag migration-wip]] +[[!tag MtnSummit/2008]] -`nvm.automate-netsync`(Thomas K.) +## n.v.m.automate-netsync ## +Contact: [[People/ThomasKeller]] + Implements the netsync commands push, pull and sync in automate, especially for use within stdio. Enforces and checks the usage of a running ssh-agent instance to avoid password prompting. -Documentation is in place, tests are still missing. +Status: Documentation is in place, tests are still missing. ============================================================ --- wiki/Branches/nvm.automate_out_of_band.mdwn db92fdf51d2741f361f73ff161e8f714418936e1 +++ wiki/Branches/nvm.automate_out_of_band.mdwn fec70ecf9298d9f4fe989467d4a30fc58744e13a @@ -1,7 +1,13 @@ -[[!tag branch MtnSummit2008]] +[[!tag migration-wip]] +[[!tag MtnSummit/2008]] -`nvm.automate_out_of_band` (Christof, Thomas K.) +## nvm.automate\_out\_of\_band ## -Adds support for multiple streams into monotone stdio which includes separate streams for informational messages (infos, warnings, errors, ...) as well as tickers. To actually test tickers automate pull is already included here. +Contact: [[People/ChristofPetig]], [[People/ThomasKeller]] +Adds support for multiple streams into monotone stdio which includes +separate streams for informational messages (infos, warnings, errors, +...) as well as tickers. To actually test tickers automate pull is +already included here. + +Status: Documentation is in place, tests are still missing. -Documentation is in place, tests are still missing. ============================================================ --- wiki/Branches/nvm.commit_without_-b.mdwn 750c9b07179b6e64e960d4c208ebca9b331a540a +++ wiki/Branches/nvm.commit_without_-b.mdwn 43d2d5c52a662a38454bc3f8cdf5104daab2e66a @@ -1,9 +1,34 @@ -[[!tag branch MtnSummit2008]] +[[!tag migration-wip]] +[[!tag MtnSummit/2008]] -`nvm.commit_without_-b` (Richard) +## n.v.m.commit\_without\_-b ## +Contact: [[People/RichardLevitte]] + This branch implements the command `mtn branch` and consequently, removes the `-b` option from `mtn commit`. `mtn branch` fiddles with `_MTN/options`, adding a new option called `newbranch`, which `mtn commit` picks up at commit time. + +---- + +*Info from the old wiki:* + +Contact: [[People/ThomasKeller]] + +An attempt to remove the --branch option from "mtn commit" and replace +the functionality by a new "mtn branch" command which explicitely sets +the branch stanza in \_MTN/options. This basically works, but is not +thoroughly thought through for now, basically because we loose the old +branch information after "mtn branch", so subsequent commands like +"mtn update" which still rely on the old_revision and the recorded +branch name fail badly unless the workspace is committed again. So, +what still needs to be done is + + 1. if mtn branch is triggered on an unmodified workspace, mtn commit should succeed and just add the new branch cert to old_revision + 1. if the branch is switched, the new branch name should be recorded as "new_branch" while keeping "branch" untouched unless commit happens, so "mtn update" and friends work properly + 1. mtn revert should remove any "new_branch" stanza from \_MTN/options + 1. eventually "mtn branch" should be renamed to "mtn switch" and get some more functionality (i.e. if switched to a named, existing branch, update the workspace to the head of this branch) + +Status: Stalled, decide what to do with all that. ============================================================ --- wiki/Branches/nvm.experiment.meta-selector.mdwn c2b2dd03c54a46bde58cd020aa35082667205660 +++ wiki/Branches/nvm.experiment.meta-selector.mdwn 7e447c7a33673a187232fa4aea907f71d0fee823 @@ -1,8 +1,14 @@ -[[!tag branch MtnSummit2008]] +[[!tag migration-wip]] +[[!tag MtnSummit/2008]] -`nvm.experiment.meta-selector`(Richard) +## n.v.m.experiment.meta-selector ## -Implements a framework for [[MagicSelectors]] as well as a few simple ones. +(renamed from [[Branches/nvm.levitte.select-heads-of]]) -Tests are in place, documentation is still missing. +Contact: [[People/RichardLevitte]] +Implements a framework for [[MagicSelectors]] as well as a few +simple ones, like [[H:|MagicSelectors#heads]] and [[branch point/last +common ancestor|MagicSelectors#branchpoint]]. + +Status: Tests are in place, documentation is still missing. ============================================================ --- wiki/Branches/nvm.lapo.selectors.mdwn 7111220eb4480865194682b44169167976f4b115 +++ wiki/Branches/nvm.lapo.selectors.mdwn cb2414bbce07a4ed0a6e81c41eaa5f1779e37150 @@ -1,5 +1,8 @@ -[[!tag branch MtnSummit2008]] +[[!tag migration-wip]] +[[!tag MtnSummit/2008]] -`nvm.lapo.selectors` (Lapo) +## n.v.m.lapo.selectors ## +Contact: [[People/LapoLuchini]] + Rewrite of selectors to actually be a language capable of generic operations on revision sets. ============================================================ --- wiki/Branches/nvm.web.ikiwiki.mdwn 259562b841f4250c2a256f2034d9ef0247044ba2 +++ wiki/Branches/nvm.web.ikiwiki.mdwn fff881b85aa798a138ac02b1f8915385c450ffa0 @@ -1,5 +1,8 @@ -[[!tag branch MtnSummit2008]] +[[!tag migration-wip]] +[[!tag MtnSummit/2008]] -`nvm.web.ikiwiki` (Dan, all) +## n.v.m.web.ikiwiki ## +Contact: [[People/DanielCarosone]], all [[Developers]] + Migration of website content and MoinMoin wiki to [[ikiwiki]]. ============================================================ --- wiki/MtnSummit/2008.mdwn 15fa9e1c23d3924a8d8d63d163f1dab2bfe7ab95 +++ wiki/MtnSummit/2008.mdwn ebe3cce0e2e9b2fa9d13c768b48ecadddc9f98f8 @@ -8,4 +8,4 @@ The branches which we've worked upon on The branches which we've worked upon on the 2008 summit and which should be reviewed by others: +[[!inline pages="wiki/Branches/* and link(MtnSummit/2008)" sort=title]] -[[!inline pages="branches/* and link(MtnSummit2008)" sort=title]]