Commit graph

5067 commits

Author SHA1 Message Date
http://joeyh.name/
36c90c327a Added a comment 2012-08-07 17:53:35 +00:00
Joey Hess
cb552f4a44 add news item for git-annex 3.20120807 2012-08-07 13:50:26 -04:00
Joey Hess
d99abc1255 releasing version 3.20120807 2012-08-07 13:49:58 -04:00
Joey Hess
7e2d07484f Merge branch 'master' into assistant 2012-08-07 13:31:43 -04:00
Joey Hess
2a9077f4e9 fix transfer log cleanup crash
Avoid crashing when "git annex get" fails to download from one location,
and falls back to downloading from a second location.

The problem is that git annex get calls download recursively from within
itself if the first download attempt fails. So the first time through, it
writes a transfer info file, which is then overwritten on the second,
recursive call. Then on cleanup, it tries to delete the file twice, which
of course doesn't work.

Fixed both by not crashing if the transfer file is removed, and by
changing Get to not run download recursively like that. It's the only
thing that did so, and it just seems like a bad idea.
2012-08-07 13:30:08 -04:00
Joey Hess
a66e1f68ca remove template haskell file touching
too annoying
2012-08-07 13:25:06 -04:00
Joey Hess
c08ce66427 make dir 2012-08-07 13:12:16 -04:00
Joey Hess
467669f00e update 2012-08-07 13:12:08 -04:00
Joey Hess
415f0dd5d8 don't clobber env variable if set 2012-08-07 12:24:12 -04:00
Joey Hess
8925d975a9 build in GIT_ANNEX_TMP_BUILD_DIR
This allows setting GIT_ANNEX_TMP_BUILD_DIR to be on a ramdisk,
and all the .o files as well as the git-annex binary are written there.
A useful optimisation for me to avoid SSD write thrashing during
development.
2012-08-07 12:05:24 -04:00
Joey Hess
96d0a36f85 move comment 2012-08-07 11:10:41 -04:00
hannes
a0516946ea Added a comment: also, fsck works 2012-08-07 14:12:20 +00:00
hannes
46f75bf092 Added a comment: they do 2012-08-07 14:06:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
60e6575252 Added a comment 2012-08-07 13:11:48 +00:00
hannes
9c43aa337f 2012-08-07 12:27:37 +00:00
hannes
921c9e7bc9 2012-08-07 12:13:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnnIQkoUQo4RYzjUNyiB3v6yJ5aR41WG8k
bde42b60dc Added a comment: Updated install instructions with homebrew 2012-08-07 06:46:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlCGROoy62svBUy6P24x1KoGoDWrBq2ErA
0a857248f4 Added a comment 2012-08-07 04:15:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlJ2utMQgMEYAOs3Dfc6eZRyUzt4acNXUU
4037c7f828 Added a comment 2012-08-06 23:48:28 +00:00
Joey Hess
e872299926 Merge branch 'master' of ssh://git-annex.branchable.com 2012-08-06 18:52:16 -04:00
Joey Hess
28d9ba18d6 blog for the day 2012-08-06 18:50:10 -04:00
Joey Hess
77cd327170 fix display of icon in block alert heading 2012-08-06 17:15:27 -04:00
Joey Hess
8f1a9ef8b5 added an alert after a file transfer 2012-08-06 17:09:23 -04:00
Joey Hess
05ed196ce5 better alert message generation 2012-08-06 15:41:42 -04:00
Joey Hess
94e92a1b58 make alerts change tense when they finish 2012-08-06 15:00:46 -04:00
Joey Hess
40e9402fa5 add 2012-08-06 14:48:38 -04:00
http://dieter-be.myopenid.com/
34522c1fd8 Added a comment 2012-08-06 08:30:47 +00:00
Joey Hess
aab3a01a71 merge two repository screens into one 2012-08-05 19:55:06 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e3f4abba40 Added a comment 2012-08-05 23:50:57 +00:00
Joey Hess
46feae36b6 remove links from unimplemented options 2012-08-05 19:21:28 -04:00
Joey Hess
d04e023ded blog for the weekend 2012-08-05 17:06:35 -04:00
Joey Hess
5ae1f75a39 handle case of adding populated drive to just created repo
The just created repo has no master branch commits yet. This is now
handled, merging in the master branch from the populated drive.
2012-08-05 16:35:30 -04:00
Joey Hess
a3f76fe696 wording
De-emphasize "clone", because it's not that simple. The removable drive may
already have an annex with content; if so it'll get synced in.
2012-08-05 15:57:30 -04:00
Joey Hess
34fc0d358e fix crashes when run in a git repo that has been initted but has no master branch yet 2012-08-05 15:53:47 -04:00
Joey Hess
7478872a09 fix crash when just one remote needs to be scanned
The TMVar is supposed to be left empty once the map is empty, but the code
neglected to do that, so the next time takeMVar got an empty map, which
is not handled since that was supposed to never happen..

Also, avoid any possibility of this crash. If an empty map somehow creeps
in, just retry.
2012-08-05 15:18:56 -04:00
Joey Hess
ac71ab7bd7 avoid head 2012-08-05 15:10:26 -04:00
Joey Hess
0833eb43a6 Merge remote-tracking branch 'origin/master' into assistant
Conflicts:
	Init.hs
2012-08-05 15:06:44 -04:00
Joey Hess
b885c0c6c8 unused, status: Avoid crashing when ran in bare repo. 2012-08-05 15:01:26 -04:00
Joey Hess
fd61354431 add 2012-08-05 14:50:00 -04:00
Joey Hess
cb0f435d94 adding removable drive repos now basically works 2012-08-05 14:49:47 -04:00
Joey Hess
ccedd06023 make button primary 2012-08-05 14:49:38 -04:00
http://joeyh.name/
39c2f1ed04 Added a comment: should work.. 2012-08-05 17:18:48 +00:00
http://joeyh.name/
367c1fd3b8 removed 2012-08-05 17:17:26 +00:00
http://joeyh.name/
b5a9fec31e Added a comment 2012-08-05 17:17:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnIsjgK_cdfZcIAumVRwTvNXS4cD0zNnaI
7635d0a424 Code 2012-08-05 16:34:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnIsjgK_cdfZcIAumVRwTvNXS4cD0zNnaI
2f5ba72009 indentation 2012-08-05 16:33:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnIsjgK_cdfZcIAumVRwTvNXS4cD0zNnaI
3733a4194b 2012-08-05 16:33:35 +00:00
Joey Hess
3add2cd3ba wire up scan and transfer to newly added removable drive
remote setup still todo
2012-08-04 21:18:57 -04:00
Joey Hess
e125ce74b8 work toward adding new repos on removable drives
This actually does add a new repo, but it doesn't yet set up
remotes, or sync to it.
2012-08-04 18:17:16 -04:00
Joey Hess
0ca85a9428 Revert "init: If no description is provided for a new repository, one will automatically be generated, like "joey@gnu:~/foo""
This reverts commit abde98cda2.

Temporarily dropping from master, since this actually uses stuff
that's only currently availble in the assistant branch. Will come back when
I merge that, and can wait..
2012-08-03 23:51:49 -04:00