summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* releasing version 3.201106243.20110624Gravatar Joey Hess2011-06-24
|
* fix upgrade when .git-annex has already been entirely convertedGravatar Joey Hess2011-06-24
|
* better setup of git-annex branch pushing on upgradeGravatar Joey Hess2011-06-24
|
* save state before messageGravatar Joey Hess2011-06-24
| | | | to avoid long delay after
* more upgrades fixes for bare reposGravatar Joey Hess2011-06-24
|
* fixes for upgrading bare reposGravatar Joey Hess2011-06-24
|
* cache the trustmapGravatar Joey Hess2011-06-23
| | | | Doubles the speed of fsck, and speeds up drop as well.
* addGravatar Joey Hess2011-06-23
|
* tweak fsck wording so file is at the end of the lineGravatar Joey Hess2011-06-23
|
* fix merge_tree_indexGravatar Joey Hess2011-06-23
| | | | | --cached is needed when calling git-diff-index, as it is not diffing against currently checked out branch.
* simplified to use existing functionsGravatar Joey Hess2011-06-23
|
* layoutGravatar Joey Hess2011-06-23
|
* commit after merge if any journal files were stagedGravatar Joey Hess2011-06-23
|
* fix consistency, and partially close a race during mergeGravatar Joey Hess2011-06-23
| | | | | | | | | | | | | | | | | Only "partially" because the journal is not locked during the merge, so there's a small window where a different git-annex process could write info to the journal that overwrites info taken from the merge. That could be dealt with by locking, but the lock would really need to be around the whole git-annex, to only let one run at a time. Otherwise, even with the journal locked during the merge, another git-annex could already be running, generate an overwriting change, and only store it in the journal after the merge was complete. And similarly, two git-annex processes could fight and overwrite each other's information independant of any merging. So, a toplevel lock for git-annex may get added; it's something I've considered before, as these potential, unlikely problems are not new. (OTOH, fsck will deal with such problems.)
* fix bootstrapping, broken by move of .git/annex/indexGravatar Joey Hess2011-06-23
|
* refactorGravatar Joey Hess2011-06-23
|
* improve post-upgrade push instructionsGravatar Joey Hess2011-06-23
|
* avoid unnecessary read of trust.logGravatar Joey Hess2011-06-23
|
* fix gotcha with closed stderr and --debugGravatar Joey Hess2011-06-23
|
* unused command updates for branchesGravatar Joey Hess2011-06-23
| | | | | Now that branches are more likely, unused needs to more explicitly warn that it does not look in them.
* rename git-annex index fileGravatar Joey Hess2011-06-23
|
* updatesGravatar Joey Hess2011-06-23
|
* v3 upgrade is fast!Gravatar Joey Hess2011-06-23
| | | | | The journal sped this up approximatly 100-fold; it runs in just a few minutes for a large repository with 30 thousand log files.
* add journaling to speed up changes to the git-annex branchGravatar Joey Hess2011-06-23
| | | | | | | | git is slow when the index file is large and has to be rewritten each time a file is changed. To speed this up, added a journal where changes are recorded before being fed into the index file and committed to the git-annex branch. The entire journal can be fed into git with just 2 commands, and only one write of the index file.
* update re git-annex branch direct modificationGravatar Joey Hess2011-06-23
|
* updateGravatar Joey Hess2011-06-23
|
* remove stateDirGravatar Joey Hess2011-06-23
|
* v3 upgrade code worksGravatar Joey Hess2011-06-23
| | | | but write the index file a lot, so slow
* docsGravatar Joey Hess2011-06-22
|
* rewrite loggedkeys to use git-annex branchGravatar Joey Hess2011-06-22
| | | | | | That sucking sound is a whole page of code vanishing to be replaced with return . catMaybes . map (logFileKey . takeFileName) =<< Branch.files What can I say, git is my database, and haskell my copilot.
* let's have the major version number be annex.versionGravatar Joey Hess2011-06-22
|
* bugfix: restore index file env varGravatar Joey Hess2011-06-22
| | | | | | | | | This fixes precommit, since in that hook, git sets the env var to write to the lock file, which avoids git add failing due to the presence of the lock file. (Took me a good hour and a half of confusion to figure this out.) Test suite now passes 100%! Only the upgrade code still remains to be written.
* commit git-annex branch when copying to a remote (locally)Gravatar Joey Hess2011-06-22
| | | | | | | Otherwise, the location log changes are only staged in its index, and this can confuse matters if pulling or cloning from the remote. The test suite was failing because this wasn't done.
* sshGravatar Joey Hess2011-06-22
|
* merge bugfixGravatar Joey Hess2011-06-22
| | | | | Use GitRepo functions to call git, the bug occurred when it was run in a git repo that was not the same as the repo being acted on.
* reove 2 tests that no longer make sense (state is not autocommitted)Gravatar Joey Hess2011-06-22
|
* squelched git-cat-file's error message when file DNEGravatar Joey Hess2011-06-22
| | | | | This seemed much too hard to do. I just wanted to close stderr when running it.
* decruftGravatar Joey Hess2011-06-22
|
* add merge subcommandGravatar Joey Hess2011-06-22
|
* improve bare repo handingGravatar Joey Hess2011-06-22
| | | | | Many more commands can work in bare repos now, thanks to the git-annex branch.
* improve version checking for v3Gravatar Joey Hess2011-06-22
| | | | | | | | | Do not set annex.version whenever any command is run. Just do it in init. This ensures that, if a repo has annex.version=3, it has a git-annex branch, so we don't have to run a command every time to check for the branch. Remove the old ad-hoc logic for v0 and v1, to simplify version checking.
* updateGravatar Joey Hess2011-06-22
|
* stub in v2 upgradeGravatar Joey Hess2011-06-22
|
* adjust walkthrough for git-annex branchGravatar Joey Hess2011-06-22
| | | | don't just pull master.. pull everything
* better branch displayGravatar Joey Hess2011-06-22
|
* update documentation that mentioned .git-annex/Gravatar Joey Hess2011-06-22
|
* remove some tests that no longer make senseGravatar Joey Hess2011-06-22
|
* store trust.log and remote.log in the git-annex branchGravatar Joey Hess2011-06-22
| | | | .. and I think that's everything that will use the branch
* moveGravatar Joey Hess2011-06-22
|
* fixed logFileGravatar Joey Hess2011-06-22
|