summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAge
* add some OSX thingGravatar Joey Hess2012-11-09
|
* cleanupGravatar Joey Hess2012-09-25
|
* add osxapp targetGravatar Joey Hess2012-09-24
| | | | Not fully tested.
* Ignore some OSX related files which should never end up in the repoGravatar Jimmy Tang2012-09-23
|
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-20
|\ | | | | | | | | | | Conflicts: Makefile debian/copyright
| * ignore build-stampGravatar Joey Hess2012-08-20
| |
* | extacted Mounts.hsc from hsshellscriptGravatar Joey Hess2012-07-19
|/ | | | | | | | | Converted from using c2hs to using hsc2hs, just because other code in git-annex uses hsc2hs. Various cleanups. This code is LGPLed, so I had to include that licence.
* skeleton C library for calling kqueueGravatar Joey Hess2012-06-18
|
* remove cabal fileGravatar Joey Hess2012-06-12
|
* Remove .dir-locals.el and add doc/contributing.mdwn.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | Add link CONTRIBUTING -> doc/contributing.mdwn, so that it's easy to find (many files in doc/). Add .dir-locals.el to .gitignore, now that it's no longer versioned. The CONTRIBUTING file gives a reference to a page on the Emacs wiki that shows how to set up a .dir-locals.el that sets up tabs for indentation. I updated the wiki page to include the `(highlight-regexp "^ *")` part, which had been the hardest to discover.
* Refactor generation of git-annex.cabal and incorporate man pages.Gravatar Nathan Collins2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing `sed | find | perl` hack in the Makefile was not including the man pages in the generated git-annex.cabal. I couldn't figure out why it didn't work; running the `find | perl` part of the command *did* list the man pages ... So, I set up a new hack. It produces a cleaner .cabal file and includes the man pages in the sdist. I changed git-annex.cabal and its generation as follows: - git-annex.cabal is now generated by a here document in git-annex.cabal.template.sh. The here document has inline file list insertion, whereas before the file lists were inserted with sed. - The 'Extra-Source-Files:' field now only includes the non-source files: the man pages, plain text documentation, and license. - The source dependencies are now listed in 'Other-Modules' sections in the 'Executable' and 'Test-Suite' sections. The list of dependencies is generated by `gen-other-modules.sh`. - The ./debian and ./doc are no longer included in the sdist package. These were not installed anywhere by `cabal install`. A user that wants them could clone the git repo. Running the tests with cabal is not yet working, i.e. cabal configure --enable-tests && cabal build && cabal test and cabal install --enable-tests fail to find Utility.Touch. However, I did not break this: it doesn't work for the git-annex package on Hackage either. Next step is to figure out how to deal with HSC in cabal ... or not bother, because `make test` works. I'm worried this is a cabal bug. To test building from sdist, I've been running cd ../.. ; cabal sdist ; cd dist ; tar xf git-annex-3.20120605.tar.gz && cd git-annex-3.20120605 && rm -fr /tmp/git-annex && cabal install --prefix=/tmp/git-annex && tree -A /tmp/git-annex in the dist directory. Using `cabal-dev install` is a better test, but is very slow.
* Add cabal-dev to .gitignore.Gravatar Nathan Collins2012-06-10
|
* updateGravatar Joey Hess2012-04-30
|
* makefile tweaksGravatar Joey Hess2012-03-15
| | | | Put build cruft in a subdir
* update ignoresGravatar Joey Hess2012-01-05
|
* split groups of related functions out of UtilityGravatar Joey Hess2011-08-22
|
* moved files aroundGravatar Joey Hess2011-08-20
|
* cabal can now be used to build git-annex.Gravatar Joey Hess2011-06-30
| | | | | | This is substantially slower than using make, does not build or install documentation, does not run the test suite, and is not particularly recommended, but could be useful to some.
* add git-union-mergeGravatar Joey Hess2011-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | This is a new git subcommand, that does a generic union merge operation between two refs, storing the result in a branch. It operates efficiently without touching the working tree. It does need to write out a temporary index file, and may need to write out some other temp files as well. This could be useful for anything that stores data in a branch, and needs to merge changes into that branch without actually checking the branch out. Since conflict handling can't be done without a working copy, the merge type is always a union merge, which is fine for data stored in log format (as git-annex does), or in non-conflicting files (as pristine-tar does). This probably belongs in git proper, but it will live in git-annex for now. --- Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge to handle merging changes when pulling from remotes. Some preliminary benchmarking using real .git-annex/ data indicates that it's quite fast, except for the "git add" call, which is as slow as "git add" tends to be with a big index.
* add Remote.DirectoryGravatar Joey Hess2011-03-30
|
* add StatFS.hsc, copied from xmobarGravatar Joey Hess2011-03-22
|
* symlink touching funGravatar Joey Hess2011-03-14
| | | | | | | When adding files to the annex, the symlinks pointing at the annexed content are made to have the same mtime as the original file. While git does not preserve that information, this allows a tool like metastore to be used with annexed files.
* workaround ghc weirdness with -odirGravatar Joey Hess2011-01-07
| | | | | | The option cause it to always build to build/Main.o, no matter what binary it was building. This caused extra work, and in some cases, could cause the wrong code to be put into the final binary.
* add testcoverage target using hpcGravatar Joey Hess2011-01-04
| | | | added a test for key read and show
* add git-annex-shell commandGravatar Joey Hess2010-12-30
| | | | This is not yet complete, as it does not allow starting rsync or scp.
* Add configure step to build process.Gravatar Joey Hess2010-11-18
| | | | | * configure: Check to see if cp -a can be used. * configure: Check to see if cp --reflink=auto can be used.
* updateGravatar Joey Hess2010-11-10
|
* updateGravatar Joey Hess2010-10-19
|
* build in subdirGravatar Joey Hess2010-10-14
|
* addGravatar Joey Hess2010-10-10