summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-18 16:15:46 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-18 16:15:46 -0400
commit9adb236103d0b8f1db8110b40cc33b9fe5fda4ae (patch)
tree53dad5cd61d559bf71b5fa05c19bcef941274fbe
parent80fc9eda6bd091acca3fd0b819363998ea4562ef (diff)
parent3c2e8f22a4cb68429d338ea3b60c6e86ae8cb315 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment8
-rw-r--r--doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment8
-rw-r--r--doc/bugs/Unicode_file_names_ignored_on_Windows.mdwn37
-rw-r--r--doc/bugs/Unicode_file_names_ignored_on_Windows/comment_1_3dfa4559dceec50c08ba180f41b4c220._comment14
-rw-r--r--doc/bugs/Unicode_file_names_ignored_on_Windows/comment_2_4dafea4367d455c2e63b0f7b1cc39559._comment10
-rw-r--r--doc/bugs/Unicode_file_names_ignored_on_Windows/comment_3_bdde68a990a330ee0cf626be44b1c132._comment8
-rw-r--r--doc/bugs/Unicode_file_names_ignored_on_Windows/comment_4_9140fb8034b1449ee2f4762093bc1f89._comment10
-rw-r--r--doc/bugs/map_error_after_forget.mdwn37
-rw-r--r--doc/bugs/map_error_after_forget/comment_6_4ee6e824cd9ad931442f986cf240aabf._comment8
-rw-r--r--doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_5_8c2dad766e4115073d49b698919b5ed5._comment8
-rw-r--r--doc/forum/Auto_sync_with_music_player/comment_3_99f65a0efaf5d5f9b8ff530acc122860._comment8
-rw-r--r--doc/forum/handling_MP3_metadata_changes/comment_1_aa4955fd64ea5aa836f1a591e185c4a2._comment8
-rw-r--r--doc/todo/Wishlist:_additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment8
-rw-r--r--doc/todo/wishlist:_git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment8
-rw-r--r--doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment12
-rw-r--r--doc/todo/wishlist:_metadata_metadata_view.mdwn20
-rw-r--r--doc/todo/wishlist:_metadata_metadata_view/comment_1_79dbf48cf2e0d649f32bd077f0c9bc5a._comment8
-rw-r--r--doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment10
-rw-r--r--doc/todo/wishlist:_special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment8
-rw-r--r--doc/todo/wishlist:alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment8
20 files changed, 201 insertions, 45 deletions
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment b/doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment
new file mode 100644
index 000000000..994d969e6
--- /dev/null
+++ b/doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="severo"
+ ip="95.152.107.168"
+ subject="comment 8"
+ date="2014-03-18T10:06:50Z"
+ content="""
+Thansk @joeyh.name for your answer. Do you think this feature could be integrated into the git-annex assistant ?
+"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment b/doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment
new file mode 100644
index 000000000..1766fcf63
--- /dev/null
+++ b/doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="severo"
+ ip="95.152.107.168"
+ subject="comment 9"
+ date="2014-03-18T11:16:19Z"
+ content="""
+Some explanations in French on how to do: http://seenthis.net/messages/237648#message238202
+"""]]
diff --git a/doc/bugs/Unicode_file_names_ignored_on_Windows.mdwn b/doc/bugs/Unicode_file_names_ignored_on_Windows.mdwn
new file mode 100644
index 000000000..af3877dbe
--- /dev/null
+++ b/doc/bugs/Unicode_file_names_ignored_on_Windows.mdwn
@@ -0,0 +1,37 @@
+### Please describe the problem.
+
+The "add" command silently ignores all files and directories with non-ascii characters.
+
+### What steps will reproduce the problem?
+
+I created empty repository (git init, git annex init). I created some files with ascii and nonascii file names (hacky.txt, háčky.txt).
+
+git annex add . correctly adds only hacky.txt.
+
+git annex add "háčky.txt" does nothing.
+
+### What version of git-annex are you using? On what operating system?
+
+git 1.9.0,
+git-annex installer from 2014-03-06
+
+Windows XP and 7 with czech localization. CP1250 is used for czech characters on windows.
+
+### Please provide any additional information below.
+
+ $ ls
+ hacky.txt h????ky.txt
+ $ git annex add .
+ add hacky.txt ok
+ (Recording state in git...)
+ $ git annex status
+ D h├í─Źky.txt
+
+According to https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support ls prints junk, but only to console.
+
+ D:\anntest>git annex add "háčky.txt" --debug
+ [2014-03-18 14:28:03 Central Europe Standard Time] read: git ["--git-dir=D:\\anntest\\.git","--work-tree=D:\\anntest","-c","core.bare=false","ls-files","--others","--exclude-standard","-z","--","h\225\269ky.txt"]
+ [2014-03-18 14:28:03 Central Europe Standard Time] chat: git ["--git-dir=D:\\anntest\\.git","--work-tree=D:\\anntest","-c","core.bare=false","cat-file","--batch"]
+ [2014-03-18 14:28:03 Central Europe Standard Time] read: git ["--git-dir=D:\\anntest\\.git","--work-tree=D:\\anntest","-c","core.bare=false","ls-files","--modified","-z","--","h\225\269ky.txt"]
+
+I can provide additional information, just tell me what you need.
diff --git a/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_1_3dfa4559dceec50c08ba180f41b4c220._comment b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_1_3dfa4559dceec50c08ba180f41b4c220._comment
new file mode 100644
index 000000000..c1778db78
--- /dev/null
+++ b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_1_3dfa4559dceec50c08ba180f41b4c220._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="analysis"
+ date="2014-03-18T17:54:09Z"
+ content="""
+The `git ls-files --others -z output` is fine; the mojibake seems to occur in git-annex's reading of that output, which uses GHC's filesystem encoding. On Linux it reads \"h\225\269ky.txt\" but on Windows, \"h\195\161\196\56461ky.txt\".
+
+So, it's failing to compose the multibyte characters, and it seems to have escaped the last byte (which should be \"\141\" based on the other 3) out into the high code plane used for undecodable bytes.
+
+Note that on Linux with LANG=C, the add works, and it sees \"h\56515\56481\56516\56461ky.txt\" -- in this case, all 4 bytes are represented in the high code plane, and so round-trip through ok despite the locale not supporting the utf8 encoding.
+
+Interestingly, while both `[readFile \"h\225\269ky.txt\", readFile \"h\56515\56481\56516\56461ky.txt\"]` work on Linux, only the former does on Windows.
+"""]]
diff --git a/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_2_4dafea4367d455c2e63b0f7b1cc39559._comment b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_2_4dafea4367d455c2e63b0f7b1cc39559._comment
new file mode 100644
index 000000000..97d7012a1
--- /dev/null
+++ b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_2_4dafea4367d455c2e63b0f7b1cc39559._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 2"
+ date="2014-03-18T18:09:08Z"
+ content="""
+One approach might be to not use the GHC FileSystemEncoding on Windows, and assume that Windows filenames are always in a unicode encoding. After all, the FileSystemEncoding is only used by git-annex on Unix because Unix has no canonical encoding that will work for all filenames.
+
+Hmm, nope, I tried this and it just causes an \"invalid byte sequence\" crash when reading from git-ls-files.
+"""]]
diff --git a/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_3_bdde68a990a330ee0cf626be44b1c132._comment b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_3_bdde68a990a330ee0cf626be44b1c132._comment
new file mode 100644
index 000000000..1f35dc9dd
--- /dev/null
+++ b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_3_bdde68a990a330ee0cf626be44b1c132._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 3"
+ date="2014-03-18T18:14:57Z"
+ content="""
+ghc docs on FileSystemEncoding: \"On Windows, this encoding *should not* be used if possible because the use of code pages is deprecated: Strings should be retrieved via the wide W-family of UTF-16 APIs instead\"
+"""]]
diff --git a/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_4_9140fb8034b1449ee2f4762093bc1f89._comment b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_4_9140fb8034b1449ee2f4762093bc1f89._comment
new file mode 100644
index 000000000..e40a6ab33
--- /dev/null
+++ b/doc/bugs/Unicode_file_names_ignored_on_Windows/comment_4_9140fb8034b1449ee2f4762093bc1f89._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 4"
+ date="2014-03-18T18:42:57Z"
+ content="""
+As well as the default encoding, I've tried `utf8`, `utf16`, `utf16le`, and `utf16be` encodings, and none of them is able to successfully read the git ls-files output, all fail with encoding error. (I also tried `mkUTF16 RoundtripFailure` but it completely broke git-annex.)
+
+Unsure where to go from here..
+"""]]
diff --git a/doc/bugs/map_error_after_forget.mdwn b/doc/bugs/map_error_after_forget.mdwn
deleted file mode 100644
index b4531ad59..000000000
--- a/doc/bugs/map_error_after_forget.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-### Please describe the problem.
-I ran forget to clean up dead repos in my map, now map won't run.
-
-
-### What steps will reproduce the problem?
-
-$ git annex forget --drop-dead --force
-....
-$ git annex map
-
-### What version of git-annex are you using? On what operating system?
-
-(xubuntu)
-$ git annex version
-git-annex version: 5.20140306-g6e2e021
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA CryptoHash
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
-local repository version: 5
-supported repository version: 5
-upgrade supported from repository versions: 0 1 2 4
-
-### Please provide any additional information below.
-
-[[!format sh """
-$ git annex map --debug
-map /media/archive/annex ok
-[2014-03-15 09:17:33 CDT] read: git ["config","--null","--list"]
-[2014-03-15 09:17:33 CDT] read: git ["config","--null","--list"]
-[2014-03-15 09:17:33 CDT] read: git ["config","--null","--list"]
-
-git-annex: user error (git ["config","--null","--list"] exited 126)
-failed
-git-annex: map: 1 failed
-"""]]
-
-> [[fixed|done]] --[[Joey]]
diff --git a/doc/bugs/map_error_after_forget/comment_6_4ee6e824cd9ad931442f986cf240aabf._comment b/doc/bugs/map_error_after_forget/comment_6_4ee6e824cd9ad931442f986cf240aabf._comment
deleted file mode 100644
index dd51aef62..000000000
--- a/doc/bugs/map_error_after_forget/comment_6_4ee6e824cd9ad931442f986cf240aabf._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY"
- nickname="Eric"
- subject="comment 6"
- date="2014-03-17T20:12:31Z"
- content="""
-oh, so basically what i must have done was to delete the remote via git but it still existed in git annex?
-"""]]
diff --git a/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_5_8c2dad766e4115073d49b698919b5ed5._comment b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_5_8c2dad766e4115073d49b698919b5ed5._comment
new file mode 100644
index 000000000..360003fba
--- /dev/null
+++ b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_5_8c2dad766e4115073d49b698919b5ed5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 5"
+ date="2014-03-18T19:07:25Z"
+ content="""
+cron was not running them for some reason, but they are up-to-date now.
+"""]]
diff --git a/doc/forum/Auto_sync_with_music_player/comment_3_99f65a0efaf5d5f9b8ff530acc122860._comment b/doc/forum/Auto_sync_with_music_player/comment_3_99f65a0efaf5d5f9b8ff530acc122860._comment
new file mode 100644
index 000000000..b0275abdc
--- /dev/null
+++ b/doc/forum/Auto_sync_with_music_player/comment_3_99f65a0efaf5d5f9b8ff530acc122860._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 3"
+ date="2014-03-18T19:59:07Z"
+ content="""
+Turns out there is an open todo about this with details: [[todo/Use_MediaScannerConnection_on_Android]]
+"""]]
diff --git a/doc/forum/handling_MP3_metadata_changes/comment_1_aa4955fd64ea5aa836f1a591e185c4a2._comment b/doc/forum/handling_MP3_metadata_changes/comment_1_aa4955fd64ea5aa836f1a591e185c4a2._comment
new file mode 100644
index 000000000..483c1fb78
--- /dev/null
+++ b/doc/forum/handling_MP3_metadata_changes/comment_1_aa4955fd64ea5aa836f1a591e185c4a2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-18T19:29:53Z"
+ content="""
+Check out [[metadata]]
+"""]]
diff --git a/doc/todo/Wishlist:_additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment b/doc/todo/Wishlist:_additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment
new file mode 100644
index 000000000..4d0409d58
--- /dev/null
+++ b/doc/todo/Wishlist:_additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-18T19:36:08Z"
+ content="""
+Is this still relevant?
+"""]]
diff --git a/doc/todo/wishlist:_git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment b/doc/todo/wishlist:_git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment
new file mode 100644
index 000000000..86772e2fd
--- /dev/null
+++ b/doc/todo/wishlist:_git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-18T20:00:16Z"
+ content="""
+`git diff` is quite flexible; it can use external diff drivers to perform the diff. Someone could write a diff driver that knows about git-annex symlinks, and shows some kind of diff of the file contents (since the files are probably binary, this gets into how to display a diff of different file types..)
+"""]]
diff --git a/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment b/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment
new file mode 100644
index 000000000..c4c222431
--- /dev/null
+++ b/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 2"
+ date="2014-03-18T20:08:13Z"
+ content="""
+There's now an easy way to do this:
+
+ git annex find --include=* --format='.git/annex/tmp/${hashdirmixed}${key}/${key}\n'
+
+Pass it the file or files you're interested in to get their partially transferred contents.
+"""]]
diff --git a/doc/todo/wishlist:_metadata_metadata_view.mdwn b/doc/todo/wishlist:_metadata_metadata_view.mdwn
new file mode 100644
index 000000000..841a84ddc
--- /dev/null
+++ b/doc/todo/wishlist:_metadata_metadata_view.mdwn
@@ -0,0 +1,20 @@
+Currently looking at the metadata and views.
+
+One of the things I would like to do is have a view that shows files by metadata metadata.. for example, "when the file last had tags changed".
+
+Something along the lines of
+
+ $ git annex view metadata-tag-mtime=YYYYMMDD
+ view (searching...)
+
+ Switched to branch 'views/metadata/tag/mtime/YYYYMMDD'
+ ok
+
+ $ ls
+ 20130816
+ 20130921
+ 20131015
+
+This would allow me to review files that haven't had any tag changes applied for a while and thus, may need the tags updating.
+
+I've done this in every tagging system I've used by (ab)using mtime, but that requires an additional step (of touching the file).
diff --git a/doc/todo/wishlist:_metadata_metadata_view/comment_1_79dbf48cf2e0d649f32bd077f0c9bc5a._comment b/doc/todo/wishlist:_metadata_metadata_view/comment_1_79dbf48cf2e0d649f32bd077f0c9bc5a._comment
new file mode 100644
index 000000000..126a9148c
--- /dev/null
+++ b/doc/todo/wishlist:_metadata_metadata_view/comment_1_79dbf48cf2e0d649f32bd077f0c9bc5a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-18T17:09:55Z"
+ content="""
+I think this would be pretty easy to do actually. No need to trawl through git history to find when a field changed; the metadata log file format includes the timestamp when a line was changed, so it would only need to find the newest timestamp for the field in the current version of the file.
+"""]]
diff --git a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment b/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment
new file mode 100644
index 000000000..dac333174
--- /dev/null
+++ b/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 3"
+ date="2014-03-18T19:49:09Z"
+ content="""
+The new [[special_remotes/external]] special remote's protocol has GETSTATE and SETSTATE commands that can be used to store per-remote values in the git-annex branch.
+
+So, please go make these special remotes using it!
+"""]]
diff --git a/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment b/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment
new file mode 100644
index 000000000..4fb9bc95e
--- /dev/null
+++ b/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-18T20:02:14Z"
+ content="""
+I suggest that if someone wants to build this, they use the new external special remote protocol to do it.
+"""]]
diff --git a/doc/todo/wishlist:alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment b/doc/todo/wishlist:alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment
new file mode 100644
index 000000000..ea8f2bd30
--- /dev/null
+++ b/doc/todo/wishlist:alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-18T19:38:19Z"
+ content="""
+Why not just use git's alias system? It can't make `git annex $foo` aliases, but `git $foo` is shorter anyway..
+"""]]