Skip to content
Snippets Groups Projects
  1. Jun 30, 2011
    • Joey Hess's avatar
      add a filelist for cabal sdist · b3ab44f8
      Joey Hess authored
      I hate hard-coded 40 kilobyte lone file lists, and just once would like to
      see a build system that does not assume it's a good idea to have a file
      list, or a hardcoded file list, or a file list that can only be generated
      with a crippled form of globs. But not today, thank you cabal.
      b3ab44f8
    • Joey Hess's avatar
      cabal can now be used to build git-annex. · 56aeeb45
      Joey Hess authored
      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.
      56aeeb45
  2. Jun 23, 2011
  3. Jun 21, 2011
    • Joey Hess's avatar
      add git-union-merge · c835166a
      Joey Hess authored
      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.
      c835166a
  4. May 15, 2011
    • Joey Hess's avatar
      don't optimise test suite · db540b74
      Joey Hess authored
      This avoids needing to adjust -fspec-constr-count, which
      continues to need high values (> 8 now) when building the test suite.
      db540b74
  5. Apr 29, 2011
  6. Apr 25, 2011
  7. Apr 21, 2011
  8. Apr 07, 2011
  9. Apr 05, 2011
  10. Mar 30, 2011
    • Joey Hess's avatar
      nasty hack to build when hS3 is not available · 9c96d865
      Joey Hess authored
      So, it would be nicer to just use Cabal and take advantage
      of its conditional compilation support. But, Cabal seems to
      lack good support for a package with an internal library that is used by
      multiple executables. It wants to build everything twice or more.
      That's too slow for me.
      
      Anyway, fairly soon, I expect to upgrade hS3 to a requirment, and I
      can just revert this.
      9c96d865
  11. Mar 28, 2011
  12. Mar 22, 2011
  13. Mar 16, 2011
    • Joey Hess's avatar
      first pass at using new keys · 9d49fe2c
      Joey Hess authored
      It compiles. It sorta works. Several subcommands are FIXME marked and
      broken, because things that used to accept separate --backend and --key
      params need to be changed to accept just a --key that encodes all the key
      info, now that there is metadata in keys.
      9d49fe2c
  14. Mar 15, 2011
    • Joey Hess's avatar
      symlink touching fun · bc5c54c9
      Joey Hess authored
      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.
      bc5c54c9
  15. Feb 08, 2011
  16. Jan 25, 2011
  17. Jan 20, 2011
  18. Jan 07, 2011
    • Joey Hess's avatar
      workaround ghc weirdness with -odir · f189929b
      Joey Hess authored
      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.
      f189929b
    • Joey Hess's avatar
      more tests · 87f424ec
      Joey Hess authored
      87f424ec
  19. Jan 05, 2011
  20. Dec 30, 2010
  21. Dec 12, 2010
  22. Dec 11, 2010
  23. Dec 03, 2010
  24. Nov 18, 2010
  25. Nov 14, 2010
  26. Nov 11, 2010
  27. Nov 10, 2010
  28. Nov 02, 2010
  29. Oct 31, 2010