mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2866 commits 13 branches 442 tags 103 MiB
Commit graph

2866 commits

This branch
This branch
All branches
Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY
9698eecf0f 2011-12-18 09:35:40 +00:00
Joey Hess
87c1c103ea add back message 2011-12-16 16:56:31 -04:00
Joey Hess
9e82c348b7 Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-16 14:21:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko
a3e4bf8c16 2011-12-16 09:23:21 +00:00
Joey Hess
718a278f97 simplify 2011-12-15 22:19:05 -04:00
http://gebi.myopenid.com/
ec11908799 2011-12-16 00:13:54 +00:00
Joey Hess
9901fc04a0 move 2011-12-15 18:23:07 -04:00
Joey Hess
95d2391f58 more partial function removal 
Left a few Prelude.head's in where it was checked not null and too hard to
remove, etc.
 2011-12-15 18:19:36 -04:00
Joey Hess
b7e0d39abb remove some partial functions 
A few were too hard to get rid of, and safe since the code
does check for an empty line.
 2011-12-15 16:59:48 -04:00
Joey Hess
817b1936e6 add beginning, end 
Safe versions of init and last
 2011-12-15 16:59:18 -04:00
Joey Hess
0f9859ae51 avoid partial function 2011-12-15 16:58:58 -04:00
Joey Hess
fbc3d32f7d avoid partial function, and parse git-ref output better 
It's possible that a ref name might contain a space, this properly
preserves the space.
 2011-12-15 16:58:04 -04:00
Joey Hess
eb132a854e avoid partial head function 
(although it was used safely)
 2011-12-15 16:04:08 -04:00
Joey Hess
111b6937ec avoid partial functions, and added check for correct sha content 2011-12-15 15:57:47 -04:00
Joey Hess
e7a555bf21 fix types 2011-12-15 15:39:33 -04:00
Joey Hess
38b02de1a8 update 2011-12-15 15:21:03 -04:00
Joey Hess
52fe8a17f3 remove leftover debug print 2011-12-15 13:12:17 -04:00
Joey Hess
a8643ca44c refactor 2011-12-15 13:05:47 -04:00
Joey Hess
09cd042775 Properly handle multiline git config values. 
A crash on parsing was fixed a while ago. This adds support for fully
correctly parsing multiline git config values, using git config --null.

Since git-annex-shell configlist uses normal git config output, I left in
support for that too; the two forms of config output can be easily
identified by the parser. Since configlist only prints the annex.uuid
config, there's no risk of multiline values there, so no need to change it.
 2011-12-15 12:48:27 -04:00
Joey Hess
ef28b3fef7 split out Git/Command.hs 2011-12-14 15:56:11 -04:00
Joey Hess
02f1bd2bf4 split more stuff out of Git.hs 2011-12-14 15:43:13 -04:00
Joey Hess
2b24e16a63 typo 2011-12-14 13:32:13 -04:00
Joey Hess
7248483922 Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-14 13:31:59 -04:00
http://joey.kitenet.net/
25a5f6664e Added a comment 2011-12-14 17:31:31 +00:00
http://adamspiers.myopenid.com/
020c845058 2011-12-13 23:26:58 +00:00
http://adamspiers.myopenid.com/
c92d407efd add a link to git-union-merge 2011-12-13 22:01:13 +00:00
http://joey.kitenet.net/
490810ff9f Added a comment 2011-12-13 20:53:23 +00:00
Joey Hess
3c85136875 remove dead code 2011-12-13 15:27:38 -04:00
Joey Hess
9db8ec210f split out two more Git modules 2011-12-13 15:24:23 -04:00
Joey Hess
25b2cc4148 move commit to Git.Branch 2011-12-13 15:08:44 -04:00
Joey Hess
13fff71f20 split out three modules from Git 
Constructors and configuration make sense in separate modules.
A separate Git.Types is needed to avoid cycles.
 2011-12-13 15:06:49 -04:00
http://www.joachim-breitner.de/
1a06455f5c Added a comment 2011-12-13 18:47:18 +00:00
http://www.joachim-breitner.de/
51b95fbc07 Added a comment 2011-12-13 18:16:09 +00:00
Joey Hess
46588674b0 avoid closing pipe before all the shas are read from it 
Could have just used hGetContentsStrict here, but that would require
storing all the shas in memory. Since this is called at the end of a
git-annex run, it may have created a *lot* of shas, so I avoid that memory
use and stream them out like before.
 2011-12-12 21:41:37 -04:00
Joey Hess
0e45b762a0 broke out Git/HashObject.hs 2011-12-12 21:24:55 -04:00
Joey Hess
31a0c07ee9 broke out Git/Branch.hs and reorganized 2011-12-12 21:12:51 -04:00
Joey Hess
543d0d2501 split out Git/Ref.hs 2011-12-12 18:30:33 -04:00
Joey Hess
da95cbadca split out Annex/Journal.hs 2011-12-12 18:03:28 -04:00
Joey Hess
98dfc0c9b0 split out Annex/BranchState.hs 2011-12-12 17:38:46 -04:00
Joey Hess
b2f934e07a update comment 2011-12-12 17:24:12 -04:00
Joey Hess
6edaabd040 reinject: Add a sanity check for using an annexed file as the source file. 2011-12-12 13:43:52 -04:00
Joey Hess
79345ad5fc optimisation 
avoids a redundant call to git show-ref
 2011-12-12 03:30:47 -04:00
Joey Hess
f9cd3f6ad1 optimisation 
avoids a useless diff from git-annex..refs/heads/git-annex
 2011-12-12 02:31:07 -04:00
Joey Hess
c7e65bbb12 optimiation 
avoids reading the config of a local remote twice in a row
 2011-12-12 02:24:37 -04:00
Joey Hess
2332afb4bc cleanup 2011-12-12 02:04:48 -04:00
Joey Hess
acd7a52dfd always find optimal merge 
Testing b9ac585454, it didn't find the
optimal union merge, the second sha was the one to use, at least in
the case I tried. Let's just try all shas to see if any can be reused.

I stopped using the expensive nub, so despite the use of sets to
sort/uniq file contents, this is probably as fast or faster than it
was before.
 2011-12-12 01:59:29 -04:00
Joey Hess
0cbab5de65 refactor 2011-12-12 00:48:25 -04:00
Joey Hess
b9ac585454 more efficient union merges 
Tries to avoid generating a new object when the merged content has the same
lines that were in the old object.

I've noticed some merge commits that only move lines around, like this:

- 1323478057.181191s 1 be23c3ac-0ee5-11e0-b185-3b0f9b5b00c5
  1323204972.062151s 1 87e06c7a-7388-11e0-ba07-03cdf300bd87
++1323478057.181191s 1 be23c3ac-0ee5-11e0-b185-3b0f9b5b00c5

Unsure if this will really save anything in practice, since it only looks
at one of the two old objects, and maybe I didn't pick the best one.
 2011-12-11 23:02:25 -04:00
Joey Hess
d3d9c8a9a6 add news item for git-annex 3.20111211 2011-12-11 21:56:17 -04:00
Joey Hess
acb2d5a5a6 releasing version 3.20111211 2011-12-11 21:55:51 -04:00