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

1217 commits

Author SHA1 Message Date
Joey Hess
8725fde5c6 new plan 2011-06-29 20:22:19 -04:00
Joey Hess
af45d42224 Merge branch 'master' into v3 
Conflicts:
	debian/changelog
 2011-06-29 11:42:35 -04:00
Joey Hess
b3aaf980e4 --force will cause add, etc, to operate on ignored files. 2011-06-29 11:42:00 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
fb7663ceb8 2011-06-29 14:46:41 +00:00
Joey Hess
5034d8c298 Modify location log parser to allow future expansion. 
Since the logs have just been moved into the git-annex branch, don't need
to worry about backwards compatability with old versions of git-annex that
would fail to parse location logs with extra fields tacked on.
 2011-06-28 16:15:50 -04:00
Joey Hess
45bce3a3a8 freebsd port now available 2011-06-26 19:00:46 -04:00
Joey Hess
14e2765ba8 add news item for git-annex 3.20110624 2011-06-24 14:58:20 -04:00
Joey Hess
ad38c0dfad better setup of git-annex branch pushing on upgrade 2011-06-24 11:59:34 -04:00
Joey Hess
a61154baf5 add 2011-06-23 20:52:56 -04:00
Joey Hess
e3384eb476 tweak fsck wording so file is at the end of the line 2011-06-23 19:56:24 -04:00
Joey Hess
068703c405 improve post-upgrade push instructions 2011-06-23 14:51:04 -04:00
Joey Hess
89fd7b34ce unused command updates for branches 
Now that branches are more likely, unused needs to more explicitly warn
that it does not look in them.
 2011-06-23 12:23:25 -04:00
Joey Hess
d05fd11392 updates 2011-06-23 12:11:03 -04:00
Joey Hess
224a8098b5 v3 upgrade is fast! 
The journal sped this up approximatly 100-fold; it runs in just a few
minutes for a large repository with 30 thousand log files.
 2011-06-23 11:46:55 -04:00
Joey Hess
5f494154a3 add journaling to speed up changes to the git-annex branch 
git is slow when the index file is large and has to be rewritten each time
a file is changed. To speed this up, added a journal where changes are
recorded before being fed into the index file and committed to the
git-annex branch. The entire journal can be fed into git with just 2
commands, and only one write of the index file.
 2011-06-23 11:37:26 -04:00
Joey Hess
23e765b67c update re git-annex branch direct modification 2011-06-23 09:56:04 -04:00
Joey Hess
9672496a93 update 2011-06-23 08:49:54 -04:00
Joey Hess
9e37898e21 remove stateDir 2011-06-23 08:48:13 -04:00
Joey Hess
af10b2854a v3 upgrade code works 
but write the index file a lot, so slow
 2011-06-23 02:30:20 -04:00
Joey Hess
ad3770e0b2 add merge subcommand 2011-06-22 18:46:56 -04:00
Joey Hess
80302d0b46 improve bare repo handing 
Many more commands can work in bare repos now, thanks to the git-annex
branch.
 2011-06-22 18:32:41 -04:00
Joey Hess
c7a1690f02 update 2011-06-22 17:56:07 -04:00
Joey Hess
c3d96ee38a adjust walkthrough for git-annex branch 
don't just pull master.. pull everything
 2011-06-22 17:47:55 -04:00
Joey Hess
b1acf41036 update documentation that mentioned .git-annex/ 2011-06-22 17:26:34 -04:00
Joey Hess
9a1f0fcee2 start v3 2011-06-21 14:34:08 -04:00
Joey Hess
9f9e17aa0f unlock: Made atomic. 2011-06-20 22:38:18 -04:00
Joey Hess
53706ad9bf move bug report 2011-06-20 22:29:46 -04:00
Joey Hess
8b749d4bfd reorder git-union-merge params 2011-06-20 21:42:17 -04:00
Joey Hess
01e8a0a9e5 allow git-union-merge to write to any ref 
Not just refs/heads/* branches.
 2011-06-20 21:38:52 -04:00
Joey Hess
c835166a7c add git-union-merge 
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.
 2011-06-20 21:37:18 -04:00
Joey Hess
91e50782ce thought 2011-06-20 21:37:18 -04:00
Joey Hess
2fcb8e3b11 update 2011-06-20 21:37:18 -04:00
Joey Hess
e593a81041 update 2011-06-20 21:37:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
dd4de9deb4 2011-06-20 21:03:00 +00:00
http://joey.kitenet.net/
601b07196e Comment moderation 2011-06-20 17:43:05 +00:00
Joey Hess
64d6520704 git is slow 2011-06-14 19:05:45 -04:00
http://christian.amsuess.com/chrysn
f4609a5d28 minor bug report 2011-06-14 17:01:13 +00:00
Joey Hess
f547277b75 Allow --trust etc to specify a repository by name, for temporarily trusting repositories that are not configured remotes. 2011-06-13 22:19:44 -04:00
Joey Hess
c1acad8248 Merge branch 'master' of ssh://git-annex.branchable.com 2011-06-13 20:35:15 -04:00
Joey Hess
30d7cce7ec rsync is now used when copying files from repos on other filesystems 
cp is still used when copying file from repos on the same filesystem, since
--reflink=auto can make it significantly faster on filesystems such as
btrfs.

Directory special remotes still use cp, not rsync. It's not clear what
tmp file should be used when rsyncing to such a remote.
 2011-06-13 20:33:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
056a784f3d 2011-06-13 18:09:58 +00:00
Joey Hess
eb5fbc4cb9 response 2011-06-13 13:03:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
eb8ecd857d Added a comment 2011-06-13 16:58:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
a85e9b1276 2011-06-13 16:57:19 +00:00
https://lithitux.org/openidserver/users/pavel
57ff2e297a 2011-06-13 10:13:47 +00:00
http://joey.kitenet.net/
76df8d5f86 Added a comment: short answer: no 2011-06-10 19:55:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmByD9tmR48HuYgS4qWEGDDaoVTTC3m4kc
88bdf17e1a Added a comment: Any chance to get git-annex going on windows? 2011-06-10 18:08:37 +00:00
http://joey.kitenet.net/
8da84d8860 Added a comment 2011-06-10 16:46:03 +00:00
http://joey.kitenet.net/
68ed12eab4 Added a comment 2011-06-10 16:41:43 +00:00
http://joey.kitenet.net/
ef6209db43 Comment moderation 2011-06-10 16:39:45 +00:00
Joey Hess
0b85ffd6e7 S3 stub bug got fixed 2011-06-10 12:11:55 -04:00
Joey Hess
a473560515 add news item for git-annex 0.20110610 2011-06-10 11:58:36 -04:00
Joey Hess
90dd245522 get --from is the same as copy --from 
get not honoring --from has surprised me a few times, so least surprise
suggests it should just behave like copy --from. This leaves the difference
between get and copy being that copy always requires the remote to copy
from, while get will decide whether to get a file from a key/value store or
a remote.
 2011-06-09 18:54:49 -04:00
http://joey.kitenet.net/
c9d8b830c6 Added a comment 2011-06-08 00:40:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnEpj9IoEzNagnLDTTc9ormo5orwHW5aaI
cd60c36457 2011-06-08 00:22:56 +00:00
ssqq
0ee760fced 2011-06-04 06:18:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
75a9665349 Added a comment: git annex unused 2011-06-02 19:51:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
24f2acd272 Added a comment: git annex unused 2011-06-02 11:55:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
269e3627a1 Added a comment: git annex unlock --readonly 2011-06-02 11:34:44 +00:00
Joey Hess
76be8c34ac update 2011-06-02 01:02:57 -04:00
Joey Hess
28cb279765 fix 2011-06-02 01:01:59 -04:00
Joey Hess
ac6510b337 reformat 2011-06-02 01:01:14 -04:00
Joey Hess
c3c127a667 update 2011-06-02 00:56:22 -04:00
Joey Hess
3d7d61e679 update 2011-06-02 00:54:25 -04:00
Joey Hess
f94a0aed83 adjust to use primary git repo 2011-06-02 00:52:25 -04:00
Joey Hess
eb4278834b add fedora install instructions 2011-06-02 00:51:56 -04:00
http://joey.kitenet.net/
80efafe496 2011-06-01 22:15:58 +00:00
Joey Hess
a8fb97d2ce Add --trust, --untrust, and --semitrust options. 2011-06-01 17:57:31 -04:00
Joey Hess
7a3d9d8c2e mention --numcopies 2011-06-01 17:57:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e280c0a4fc 2011-06-01 21:26:39 +00:00
Joey Hess
3d567aa64f Add --numcopies option. 2011-06-01 16:49:17 -04:00
http://joey.kitenet.net/
12e0e95916 Added a comment 2011-06-01 20:24:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
82e83528f4 Added a comment 2011-06-01 17:36:51 +00:00
http://joey.kitenet.net/
af7a069263 2011-06-01 17:08:52 +00:00
http://joey.kitenet.net/
5aec8b8f16 2011-06-01 17:08:15 +00:00
Joey Hess
e47de0f6cd add news item for git-annex 0.20110601 2011-06-01 12:02:20 -04:00
http://joey.kitenet.net/
b3f6621a53 Added a comment 2011-05-31 21:54:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
7760ba9d97 Added a comment 2011-05-31 21:43:23 +00:00
http://joey.kitenet.net/
181920fab9 Added a comment: fixed 2011-05-31 18:51:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
6e6e77f9c0 2011-05-31 17:47:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
c4f848d29f 2011-05-31 17:47:13 +00:00
Joey Hess
25b13673f0 improve unused command's output 
Display the name of the remote being checked, with "." for the current
remote, echoing the way describe takes that to change its description.
 2011-05-28 22:20:22 -04:00
Joey Hess
ed2b1eda90 bleagh 2011-05-28 12:37:12 -04:00
Joey Hess
e8ab4f7292 remove newline 2011-05-28 12:34:52 -04:00
Joey Hess
f336878765 lose redir page 
meta does not support nested inlines inside redir urls
 2011-05-28 12:33:08 -04:00
Joey Hess
d2b199219d debugging my inline 2011-05-28 12:30:08 -04:00
Joey Hess
8581ba5923 typo 2011-05-28 12:27:02 -04:00
Joey Hess
1c85e878ac add a redirect to the current version's tarball 2011-05-28 12:24:59 -04:00
Joey Hess
0359b9b638 add link to stable tarball download from new gitweb version 2011-05-28 12:07:59 -04:00
http://joey.kitenet.net/
d147b822bd Added a comment 2011-05-28 16:04:51 +00:00
Joey Hess
c38f826435 Data.Tuple.swap not available with ghc 6.12.3 2011-05-28 11:56:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7db690bdc2 2011-05-28 12:26:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
f13863281c 2011-05-28 12:22:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
27847585cb 2011-05-28 12:18:07 +00:00
Joey Hess
de817bafa0 add news item for git-annex 0.20110522 2011-05-27 20:30:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOvt3TwSSDOLnoVzDNbOP1qO9OmNH5s0s
224977900d Added a comment 2011-05-27 01:27:38 +00:00
Joey Hess
781ffdad47 Merge branch 'master' of ssh://git-annex.branchable.com 2011-05-23 00:39:41 -04:00
Joey Hess
7a22f9d516 update 2011-05-23 00:38:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOvt3TwSSDOLnoVzDNbOP1qO9OmNH5s0s
1ab9743b5c Added a comment 2011-05-22 23:02:40 +00:00
Joey Hess
5b941980aa Closer emulation of git's behavior when told to use "foo/.git" as a git repository instead of just "foo". Closes: #627563 2011-05-22 14:12:16 -04:00