mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2013-08-06 13:35:27 -04:00
commit a91dfef16c
13 changed files with 249 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
doc/bugs/__96__git_annex_sync__96___ignores_remotes.mdwn Normal file
View file

@ -0,0 +1,104 @@
### Please describe the problem.
A mere `git annex sync` does not go through the reachable remotes.
### What steps will reproduce the problem?
I do not know what could have put my repository in this state.
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130802-g1452ac3
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
local repository version: 4
default repository version: 3
supported repository versions: 3 4
upgrade supported from repository versions: 0 1 2
Linux dawn 3.10.3-1-ARCH #1 SMP PREEMPT Fri Jul 26 11:26:59 CEST 2013 x86_64 GNU/Linux
### Please provide any additional information below.
[[!format sh """
% git annex status
supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
supported remote types: git S3 bup directory rsync web webdav glacier hook
repository mode: direct
trusted repositories: 1
f3cb4e8f-65f1-4ded-a6a1-abef64ddcff5 -- zoidberg (sam@git-annex:/media/git-annex/Music)
semitrusted repositories: 5
00000000-0000-0000-0000-000000000001 -- web
063a31dc-542d-407f-a9ed-124479fa6354 -- here (dawn)
22b72aa6-058b-4622-8132-27aa2d8950dc -- arrakis (sam@arrakis:~/Music)
5b3a1abf-5e0b-41bc-a141-774d6236ec76 -- backup on old USB disk
6affec3c-fd26-11e2-9ddd-53f02e5ca176 -- music on eeePC
untrusted repositories: 0
transfers in progress: none
available local disk space: 9.83 gigabytes (+1 megabyte reserved)
local annex keys: 3947
local annex size: 23.51 gigabytes
known annex keys: 3965
known annex size: 23.56 gigabytes
bloom filter size: 16 mebibytes (0.8% full)
backend usage:
SHA256E: 7912
% git remote -v
arrakis arrakis:Music (fetch)
arrakis arrakis:Music (push)
zoidberg ssh://git-annex@zoidberg.rfc1149.net:2222/~/Music (fetch)
zoidberg ssh://git-annex@zoidberg.rfc1149.net:2222/~/Music (push)
# Note how here it does not seem to sync with any remote
% git annex sync
(Recording state in git...)
commit
ok
% git annex sync zoidberg
(Recording state in git...)
commit
ok
pull zoidberg
ok
push zoidberg
Everything up-to-date
ok
% git annex sync arrakis
(Recording state in git...)
commit
ok
pull arrakis
From arrakis:Music
c1a24bd..ba060b7 git-annex -> arrakis/git-annex
98b9a8e..be9c146 master -> arrakis/master
e0df2be..be9c146 synced/master -> arrakis/synced/master
ok
# A nameless sync with debug turned on
% git annex sync --debug
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","symbolic-ref","HEAD"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","refs/heads/master"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","git-annex"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","--hash","refs/heads/git-annex"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..ba060b7777413ab687d64771b5d6c2b36a072335","--oneline","-n1"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..f401f2b7b67567862df7c5b8d304f52c3af43f4b","--oneline","-n1"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..feaba7c5ea5f4ca73c123e6ea44ffd6333bf383e","--oneline","-n1"]
[2013-08-06 10:59:57 CEST] chat: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","cat-file","--batch"]
[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","ls-files","--stage","-z","--others","--exclude-standard","--","/home/sam/Music"]
[2013-08-06 10:59:57 CEST] chat: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","cat-file","--batch"]
(Recording state in git...)
[2013-08-06 11:00:16 CEST] feed: xargs ["-0","git","--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","add","-f"]
commit
[2013-08-06 11:00:16 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","commit","-m","git-annex automatic sync"]
ok
[2013-08-06 11:00:17 CEST] call: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","--verify","-q","refs/heads/synced/master"]
[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/master..refs/heads/synced/master","--oneline","-n1"]
[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","git-annex"]
[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","--hash","refs/heads/git-annex"]
[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..ba060b7777413ab687d64771b5d6c2b36a072335","--oneline","-n1"]
[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..f401f2b7b67567862df7c5b8d304f52c3af43f4b","--oneline","-n1"]
[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..feaba7c5ea5f4ca73c123e6ea44ffd6333bf383e","--oneline","-n1"]
[2013-08-06 11:00:17 CEST] call: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","branch","-f","synced/master"]
"""]]

15
doc/bugs/importfeed_uses___34____95__foo__34___as_extension.mdwn Normal file
View file

@ -0,0 +1,15 @@
### Please describe the problem.
When running importfeed on gitminutes <http://feeds.gitminutes.com/gitminutes-podcast> git-annex interprets the extension as "_mp3" rather than ".mp3" which means that renaming is needed for various audio players to accept the files.
### What steps will reproduce the problem?
git annex importfeed http://feeds.gitminutes.com/gitminutes-podcast --fast
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130802
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
local repository version: 3
default repository version: 3
supported repository versions: 3 4
upgrade supported from repository versions: 0 1 2
on Debian Sid

11
doc/design/assistant/deltas/comment_2_71889d15ba20ebb0fe13080c68162a5b._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm72W-CH7bzZ8uHvaw1KJGrToPSQDNBnIA"
nickname="Beni"
subject="bup splitting"
date="2013-08-05T17:13:14Z"
content="""
bup splits files into chunks based on rolling sums.
https://github.com/apenwarr/bup/blob/master/DESIGN
For small changes to big files, this would improve not only transfer speed but also repository size.
And git-annex already supports bup remotes. What's missing?
"""]]

2
doc/forum/git_annex_assistant__44___share_with_other_devices.mdwn
View file

@ -1 +1,3 @@
I am trying to share files between my PC at home at that at work using the walkthrough here: http://git-annex.branchable.com/assistant/remote_sharing_walkthrough/. However, I don't have the option on my machine to "Share with other devices". Any ideas why this would be missing? I am using Ubuntu 13.04 if that helps.
Update: it now works after a software update, I guess I just had an older version of git-annex. Now, I have version 4.20130723.

11
doc/forum/taskwarrior.mdwn Normal file
View file

@ -0,0 +1,11 @@
I try to sync my taskWarrior files .task/*.data with git-annex ... but there is two problem :
- i need to chmod 755 my files because taskWarrior doesn't recognize them, or say "problem with permission"
- taskwarrior seems crazy with symbolic link used by git-annex, undo not work, task appear multiple times , etc.
Is there any solution ?
Any user experienced the same problem?
Thanks
Sr.

10
doc/forum/taskwarrior/comment_1_1c3a29e7d292cb602d9d349f8009b51e._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 1"
date="2013-08-06T12:44:11Z"
content="""
* You could try metastore (not merge friendly), git-cache-meta (pretty minimal) or metamonger (not done yet) to sync your file permissions
* Look into direct mode to avoid symlinks
* Alternatively, check your taskwarrior files into git, not git-annex, to avoid symlinks
"""]]

8
doc/forum/unknown_response_from_git_cat-file.mdwn Normal file
View file

@ -0,0 +1,8 @@
Hi,
when running git annex add in my direct mode repository, since a few days ago I only get:
$ git annex add
git-annex: unknown response from git cat-file (":./Archiv/Someone missing",:./Archiv/Someone Like You Cover-fCvjvEGkTu4.flv)
The :./Archiv/Someone missing part strikes me odd because it so much looks like broken shell meta-character escaping in git-annex, but I doubt that because it stopped working just suddenly.

8
doc/tips/downloading_podcasts/comment_10_4d4f6c22070b58918ee8d34c5e7290ad._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 10"
date="2013-08-05T16:47:30Z"
content="""
`cabal install feed` should get the necessary library installed so that git-annex will build with feeds support.
"""]]

24
doc/tips/downloading_podcasts/comment_11_d8d77048c7e2524968c188e1ad517873._comment Normal file
View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="http://a-or-b.myopenid.com/"
ip="220.244.41.108"
subject="comment 11"
date="2013-08-06T04:20:16Z"
content="""
$ cabal install feed
Resolving dependencies...
All the requested packages are already installed:
feed-0.3.9.1
Use --reinstall if you want to reinstall anyway.
Then I reinstalled `git-annex` but it still doesn't find the feeds flag.
$ git annex version
git-annex version: 4.20130802
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS
Do I need to do something like:
cabal install git-annex --bindir=$HOME/bin -f\"-assistant -webapp -webdav -pairing -xmpp -dns -feed\"
...but what are the default flags to include in addition to `-feed`
"""]]

10
doc/tips/downloading_podcasts/comment_12_0859317471b43c88744dd3df95c879f7._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 12"
date="2013-08-06T04:24:10Z"
content="""
-f-Feed will disable the feature. -fFeed will try to force it on.
You can probably work out what's going wrong using cabal install -v3
"""]]

18
doc/tips/downloading_podcasts/comment_13_e8c3c97282d17e2a1d47fb9d5e2b2f7b._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="http://a-or-b.myopenid.com/"
ip="220.244.41.108"
subject="comment 13"
date="2013-08-06T05:42:45Z"
content="""
So I ran `cabal install -v3` and looked at the output,
Flags chosen: feed=True, tdfa=True, testsuite=True, android=False,
production=True, dns=True, xmpp=True, pairing=True, webapp=True,
assistant=True, dbus=True, inotify=True, webdav=True, s3=True
This looks like feed should be on.
There doesn't appear to be any errors in the compile either.
Is it as simple as a bug where this flag just doesn't show in the `git annex version` command?
"""]]

8
doc/todo/Build_for_Synology_DSM/comment_13_314255fd503d125b5aeae2f62acfd592._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnrP-0DGtHDJbWSXeiyk0swNkK1aejoN3c"
nickname="sebastien"
subject="comment 13"
date="2013-08-06T12:18:35Z"
content="""
I post an issue to github synocommunity for that, i hope somenone have some time to package this great features.
"""]]

20
doc/todo/__96__git_annex_import_--lazy__96___--_Delete_everything_that__39__s_in_the_source_directory_and_also_in_the_target_annex/comment_1_0cc16eb17151309113cec6d1cccf203d._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 1"
date="2013-08-06T14:22:03Z"
content="""
To expand a bit on the use case:
I have several migration directories which I simply moved to new systems or disks with the help of `cp -ax` or `rsync`.
As I don't _need_ the data per se and merely want to hold on to it in case I ever happen to need it again and as disk space is laughably cheap, I have a lot of duplicates.
While I can at least detect bit flips with the help of checksum lists, cleaning those duplicates of duplicated duplicates is quite some effort.
To make things worse, photos, music, videos, letter and whatnot are thrown into the same container directories.
All in all, getting data out of those data dumps and into a clean structure is quite an effort.
`git annex import --lazy` would help with this effort as I could start with the first directory, sort stuff by hand, and annex it.
As soon as data lives in any of my annexes, I could simply run `git annex import --lazy` to get rid of all duplicates while retaining the unannexed files.
Iterating through this process a few times, I will be left with clean annexes on the one hand and stuff I can simply delete on the other hand.
I could script all this by hand on my own machine, but I am _certain_ that others would find easy, integrated, and unit tested support for whittling down data dumps over time useful.
"""]]