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

1761 commits

Author SHA1 Message Date
Joey Hess
a218ce41cf exclusive locks, ugh 2011-11-09 22:15:33 -04:00
Joey Hess
d3e1a3619f safer inannex checking 
git-annex-shell inannex now returns always 0, 1, or 100 (the last when
it's unclear if content is currently in the index due to it currently being
moved or dropped).

(Actual locking code still not yet written.)
 2011-11-09 18:33:15 -04:00
Joey Hess
8ce7e73f74 reorg to allow taking content lock 
The lock will only persist during the perform stage, so the content must
be removed from the annex then, rather than in the cleanup stage.

(No lock is actually taken yet.)
 2011-11-09 16:54:18 -04:00
Joey Hess
58563c5b1a warning about version of git-annex shipped in recent Ubuntu release 2011-11-09 14:37:14 -04:00
Joey Hess
a243d6e6e9 directly lock content? 2011-11-09 14:32:31 -04:00
Joey Hess
393b6b1bde problem that came to me at 2 am 2011-11-09 13:34:17 -04:00
Joey Hess
2ff8915365 fix 2011-11-08 12:24:56 -04:00
Joey Hess
67c9f84a1f fix broken links 2011-11-08 12:23:03 -04:00
Joey Hess
d35cd6ff26 wiki updates 2011-11-08 12:16:02 -04:00
Joey Hess
05b7608113 update 2011-11-08 01:27:06 -04:00
Joey Hess
faa4935047 Handle a case where an annexed file is moved into a gitignored directory, by having fix --force add its change. 2011-11-07 18:10:31 -04:00
gernot
26d3c3b497 2011-11-07 20:55:54 +00:00
Joey Hess
97ba3a118d update 2011-11-07 13:29:00 -04:00
Joey Hess
95b9d726f8 update 2011-11-07 13:26:37 -04:00
Joey Hess
146995c4e1 update 2011-11-07 13:18:16 -04:00
Joey Hess
b7cd088433 add 2011-11-07 13:08:47 -04:00
Joey Hess
80787703c3 add news item for git-annex 3.20111107 2011-11-07 13:07:43 -04:00
Joey Hess
c99fb58909 merge: Use fast-forward merges when possible. 
Thanks Valentin Haenel for a test case showing how non-fast-forward merges
could result in an ongoing pull/merge/push cycle.

While the git-annex branch is fast-forwarded, git-annex's index file is still
updated using the union merge strategy as before. There's no other way to
update the index that would be any faster.

It is possible that a union merge and a fast-forward result in different file
contents: Files should have the same lines, but a union merge may change
their order. If this happens, the next commit made to the git-annex branch
will have some unnecessary changes to line orders, but the consistency
of data should be preserved.

Note that when the journal contains changes, a fast-forward is never attempted,
which is fine, because committing those changes would be vanishingly unlikely
to leave the git-annex branch at a commit that already exists in one of
the remotes.

The real difficulty is handling the case where multiple remotes have all
changed. git-annex does find the best (ie, newest) one and fast forwards
to it. If the remotes are diverged, no fast-forward is done at all. It would
be possible to pick one, fast forward to it, and make a merge commit to
the rest, I see no benefit to adding that complexity.

Determining the best of N changed remotes requires N*2+1 calls to git-log, but
these are fast git-log calls, and N is typically small. Also, typically
some or all of the remote refs will be the same, and git-log is not called to
compare those. In the real world I expect this will almost always add only
1 git-log call to the merge process. (Which already makes N anyway.)
 2011-11-06 15:22:40 -04:00
Joey Hess
bf07e2c921 typo 2011-11-06 13:53:11 -04:00
Joey Hess
cd267dea15 add news item for git-annex 3.20111105 2011-11-05 15:55:30 -04:00
Valentin_Haenel
526c20d068 add bug report 2011-11-05 16:31:18 +00:00
Valentin_Haenel
502f86604f a recipe for setting up a bare remote 2011-11-04 23:19:13 +00:00
http://joey.kitenet.net/
dabb6a9f26 Added a comment: depends ... 2011-11-04 19:59:24 +00:00
Joey Hess
ef3457196a use SHA256 by default 
To get old behavior, add a .gitattributes containing: * annex.backend=WORM

I feel that SHA256 is a better default for most people, as long as their
systems are fast enough that checksumming their files isn't a problem.
git-annex should default to preserving the integrity of data as well as git
does. Checksum backends also work better with editing files via
unlock/lock.

I considered just using SHA1, but since that hash is believed to be somewhat
near to being broken, and git-annex deals with large files which would be a
perfect exploit medium, I decided to go to a SHA-2 hash.

SHA512 is annoyingly long when displayed, and git-annex displays it in a
few places (and notably it is shown in ls -l), so I picked the shorter
hash. Considered SHA224 as it's even shorter, but feel it's a bit weird.

I expect git-annex will use SHA-3 at some point in the future, but
probably not soon!

Note that systems without a sha256sum (or sha256) program will fall back to
defaulting to SHA1.
 2011-11-04 15:51:01 -04:00
Joey Hess
532ff19aa5 fix link 2011-11-04 15:51:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
7df8052a4b 2011-11-03 23:53:51 +00:00
Joey Hess
8e249ea0bd add tip for mode of operation somewhat like mercurial bigfiles extension 2011-11-02 13:32:19 -04:00
Joey Hess
e9286e7be7 point to new extension now in mercurial 2011-11-02 12:02:04 -04:00
Joey Hess
3d3e1c4c25 better command name 2011-10-31 15:18:41 -04:00
Joey Hess
380839299e The fromkey command now takes the key as its first parameter. The --key option is no longer used. 2011-10-31 12:56:07 -04:00
Joey Hess
cc1ea8f844 Removed the setkey command, and added a setcontent command with a more useful interface. 2011-10-31 12:33:41 -04:00
Joey Hess
1530eac312 closures 2011-10-30 16:57:20 -04:00
Joey Hess
3cf811ead0 update; status is no longer slow 2011-10-30 16:49:49 -04:00
Joey Hess
56080a0feb closures 2011-10-30 16:44:09 -04:00
Joey Hess
ee71564754 add command name to some output 2011-10-30 16:38:48 -04:00
Joey Hess
ef5330120c bare cleanup 2011-10-29 19:30:48 -04:00
Joey Hess
22e9f445ab unused, dropunused: Now work in bare repositories. 
Turned out I had already done all the work needed to support this when
unused started checking all branches.
 2011-10-29 19:16:45 -04:00
Joey Hess
c102e63595 status: clean up for bare repositories 
The backend usage graph shows present keys as well as keys found in the
repository tree, so it will also be populated for bare repositories.

Changed wording to "visible annex keys", which explains why it's 0 in
a bare repository (no keys visible as no tree), and also why it varies
depending on which branch is checked out. This seemed better than doing
something expensive to look up keys from the git-annex branch.
 2011-10-29 19:06:49 -04:00
Joey Hess
506282399c Merge branch 'master' of ssh://git-annex.branchable.com 2011-10-29 18:11:25 -04:00
Joey Hess
2566eb85fe fsck: Now works in bare repositories. 
Checks location log information, and file contents.

Does not check that numcopies is satisfied, as .gitattributes information
about numcopies is not available in a bare repository. In practice, that
should not be a problem, since fsck is also run in a checkout and will
check numcopies there.
 2011-10-29 18:03:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
a183487cd5 2011-10-29 21:36:06 +00:00
Joey Hess
36f63ab19e getting tired of repeating myself 2011-10-29 16:21:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
3f32216178 2011-10-29 20:02:21 +00:00
Joey Hess
a93aa2e51e responsen 2011-10-29 15:46:16 -04:00
Joey Hess
05d9d7a030 Merge branch 'master' of ssh://git-annex.branchable.com 2011-10-29 15:41:51 -04:00
Joey Hess
6c3b87f0de add a tip 2011-10-29 15:40:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
b7d2fd8186 2011-10-29 19:09:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d46b8c053e Added a comment 2011-10-29 18:28:14 +00:00
Joey Hess
0d92aca1aa responsen 2011-10-29 14:17:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
75e99b16f9 2011-10-29 17:45:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e9d142e9e8 2011-10-29 17:27:48 +00:00
Joey Hess
0dfe750c0b close 2011-10-29 13:21:28 -04:00
Joey Hess
ad3b462214 sheesh. seriously? 2011-10-29 13:17:37 -04:00
Joey Hess
158fd0d908 Merge branch 'master' of ssh://git-annex.branchable.com 2011-10-29 13:16:56 -04:00
Joey Hess
978ab987d5 pebak 2011-10-29 13:16:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
3868a65663 2011-10-29 17:07:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
36355e815e Added a comment 2011-10-29 17:03:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
39c304be43 2011-10-29 16:57:10 +00:00
Joey Hess
4d7802bff7 responsen 2011-10-29 12:45:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
0dcbe51ed2 2011-10-29 15:36:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
ce4029c973 Added a comment 2011-10-29 15:30:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
7588b042da 2011-10-29 15:27:06 +00:00
Joey Hess
f65100b408 Revert "as far as I know, --bwlimit does not accept unit, it always takes kilobytes" 
This reverts commit aeb4e285eb.

bup's --bwlimit does take a unit, unlike rsync's.
 2011-10-28 21:24:24 -04:00
http://nicolas-schodet.myopenid.com/
aeb4e285eb as far as I know, --bwlimit does not accept unit, it always takes kilobytes 2011-10-29 01:01:38 +00:00
Joey Hess
6c31e3a8c3 drop --from is now supported to remove file content from a remote. 2011-10-28 17:26:38 -04:00
Joey Hess
f66f97c90e document the little-known get --from 2011-10-27 19:04:12 -04:00
Joey Hess
2888562724 update 2011-10-27 18:59:25 -04:00
Joey Hess
66194684ac uninit: Add guard against being run with the git-annex branch checked out. 2011-10-27 15:47:11 -04:00
Joey Hess
f84d66fa15 reap in onLocal 
Each onLocal call involves a new Annex state, so needs to clean up after it.
 2011-10-27 14:55:07 -04:00
Joey Hess
2eefc58070 status too 2011-10-27 14:55:06 -04:00
http://joey.kitenet.net/
48d39dd354 Added a comment 2011-10-27 17:13:44 +00:00
http://joey.kitenet.net/
2aa1c779ef Added a comment 2011-10-27 17:09:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
5bc132b95c 2011-10-27 16:33:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
c3df1c82b9 2011-10-27 16:31:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c5c682c131 Added a comment 2011-10-26 18:22:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c65293977e Added a comment 2011-10-26 17:16:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c37a70fbbc 2011-10-26 15:49:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c8fdffa9f8 2011-10-26 15:46:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
12a0a45fb1 2011-10-25 21:40:30 +00:00
Joey Hess
570aae9bbc add news item for git-annex 3.20111025 2011-10-25 13:46:22 -07:00
Joey Hess
e2853b3fec update 2011-10-25 11:39:15 -07:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
962fed915f Added a comment 2011-10-23 15:00:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
721f236e3a 2011-10-23 14:37:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
3c5a0e78c0 Added a comment 2011-10-22 05:25:48 +00:00
http://joey.kitenet.net/
aa7da919a7 Added a comment 2011-10-22 01:18:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
bacb2e1881 Added a comment 2011-10-18 04:59:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
89536e97fb Added a comment 2011-10-17 20:36:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
fcbc6f901d Added a comment 2011-10-17 19:50:07 +00:00
http://joey.kitenet.net/
126bf2b5c1 Added a comment 2011-10-17 19:02:50 +00:00
http://joey.kitenet.net/
4004b68606 Added a comment 2011-10-17 19:01:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
89e0e0e474 2011-10-17 18:51:40 +00:00
Joey Hess
fa3f68ee63 add link 2011-10-17 14:28:30 -04:00
Joey Hess
5df717de43 layout 2011-10-17 14:23:27 -04:00
Joey Hess
9c0930a2b2 layout 2011-10-17 14:22:25 -04:00
Joey Hess
1b76324034 layout 2011-10-17 14:21:44 -04:00
Joey Hess
9e3783f8fe layout 2011-10-17 14:20:36 -04:00
Joey Hess
a6633f857b layout 2011-10-17 14:19:58 -04:00
Joey Hess
81fe6f775c close 2011-10-17 14:17:18 -04:00
Joey Hess
9f30134300 new tip for gitolite and git-annex 2011-10-17 14:16:05 -04:00
Joey Hess
617bdc740f reorg 2011-10-17 13:56:36 -04:00
Joey Hess
52c8244219 git-annex-shell: GIT_ANNEX_SHELL_READONLY and GIT_ANNEX_SHELL_LIMITED environment variables can be set to limit what commands can be run. 
This could be used by eg, gitolite.
 2011-10-15 19:06:35 -04:00
Joey Hess
279150ccd5 update 2011-10-15 13:30:04 -04:00
Joey Hess
bae3008d17 add a copy of my mailing list post 2011-10-15 13:17:00 -04:00
Joey Hess
c867ae842a add 2011-10-15 13:13:57 -04:00
Joey Hess
ae2b1308a6 reorg 2011-10-14 18:23:17 -04:00
Joey Hess
9fa9214106 A remote can have a annexUrl configured, that is used by git-annex instead of its usual url. (Similar to pushUrl.) 2011-10-14 18:18:28 -04:00
http://joey.kitenet.net/
3e07780bf8 Added a comment: fixed that 2011-10-13 15:36:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
88e9bba97e 2011-10-13 14:52:43 +00:00
Joey Hess
2b26b95226 add news item for git-annex 3.20111011 2011-10-11 23:49:25 -04:00
Joey Hess
f011033869 add timestamps to remote.log 2011-10-06 16:07:58 -04:00
Joey Hess
f929d0229c Add timestamps to trust.log. 2011-10-06 15:55:50 -04:00
Joey Hess
3e0d2a0803 add timestamp to uuid.log 
* New or changed repository descriptions in uuid.log now have a timestamp,
  which is used to ensure the newest description is used when the uuid.log
  has been merged.
* Note that older versions of git-annex will display the timestamp as part
  of the repository description, which is ugly but otherwise harmless.
 2011-10-06 15:31:25 -04:00
Joey Hess
e139a99aa0 investigated file formats; appending timestamp should preserve back-compat 2011-10-05 16:35:01 -04:00
Joey Hess
c199a01dd1 bug 2011-10-05 15:59:49 -04:00
Joey Hess
d357556141 Add locking to avoid races when changing the git-annex branch. 2011-10-03 16:32:36 -04:00
Joey Hess
6dfb94b2d7 update 2011-10-03 14:48:04 -04:00
Joey Hess
29032cb70e When displaying a list of repositories, show git remote names in addition to their descriptions. 2011-09-30 15:02:29 -04:00
http://joey.kitenet.net/
d48ae1b8fd Added a comment 2011-09-30 16:47:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
84801918f6 Added a comment 2011-09-30 11:55:36 +00:00
http://joey.kitenet.net/
c68fc49184 Added a comment 2011-09-30 06:55:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
c86a2f686a 2011-09-30 04:32:24 +00:00
Joey Hess
244ffef43f add 2011-09-29 16:43:00 -04:00
Joey Hess
24a8b7f141 add news item for git-annex 3.20110928 2011-09-28 19:17:46 -04:00
Joey Hess
ed00bdb995 foo 2011-09-28 18:11:53 -04:00
Joey Hess
7d0adfc5e8 typo 2011-09-28 17:48:45 -04:00
Joey Hess
4afdd34e89 Merge branch 'master' into unusedfull 2011-09-28 14:08:36 -04:00
Joey Hess
b57a4566d3 mention that add --force adds ignored files 2011-09-25 14:34:07 -04:00
Joey Hess
b203a68cb7 include --bindir in all cabal install examples 2011-09-25 14:26:05 -04:00
Joey Hess
d75da353b9 documentation/warning message update for future feature 2011-09-23 18:04:38 -04:00
Joey Hess
9f5c7a246b status: Massively sped up; remove --fast mode. 
Using Sets is the right thing; they have constant size lookup like my
SizeList, and logn insertation, which beats nub to death.

Runs faster than --fast mode did before, and gives accurate counts.

13 seconds total runtime with a warm cache in a repository with 40 thousand
keys.
 2011-09-20 18:57:05 -04:00
Joey Hess
cabbefd9d2 status: In --fast mode, all status info is displayed now; but some of it is only approximate, and is marked as such. 2011-09-20 18:13:08 -04:00
http://joey.kitenet.net/
a1578e33dc Added a comment 2011-09-19 18:57:52 +00:00
Joey Hess
b08b2b42a9 Merge branch 'master' of ssh://git-annex.branchable.com 2011-09-19 14:55:21 -04:00
http://joey.kitenet.net/
10db73426a Added a comment 2011-09-19 18:54:46 +00:00
Joey Hess
1ddc207b58 some of these are now done 2011-09-19 14:50:16 -04:00
http://joey.kitenet.net/
5c20ebcbf3 Added a comment 2011-09-19 18:46:35 +00:00
Joey Hess
73f3a00c1c typo 2011-09-19 12:21:53 -04:00
Joey Hess
8ea48c3e39 update docs 2011-09-18 20:56:37 -04:00
Joey Hess
33cd1ffbfe make find show files meeting limits, even when not present 
find: Rather than only showing files whose contents are present, when used
with --exclude --copies or --in, displays all files that match the
specified conditions.

Note that this is a behavior change for find --exclude! Old behavior
can be gotten with find --in . --exclude=...
 2011-09-18 20:42:15 -04:00
Joey Hess
9da23dff78 --copies=N can be used to make git-annex only operate on files with the specified number of copies. 
(And --not --copies=N for the inverse.)
 2011-09-18 20:23:08 -04:00
Joey Hess
d78b9f7d54 update man page for file matching options 
(--in is not yet implemented)
 2011-09-18 18:24:10 -04:00
Joey Hess
756338fb2e idea 2011-09-17 18:37:38 -04:00
Joey Hess
b73d8225d5 add news item for git-annex 3.20110915 2011-09-17 09:21:21 -04:00
Joey Hess
73769190b6 grouped commands into related sections 2011-09-15 22:22:43 -04:00
Joey Hess
cbd9ade075 remove now unnecessary git commits 2011-09-15 22:10:17 -04:00
Joey Hess
aedf84f7d6 wording 2011-09-15 15:39:48 -04:00
Joey Hess
a0d3a343b5 copy --auto 
Only does copy when numcopies is not yet satisfied.
 2011-09-15 15:28:58 -04:00
Joey Hess
7b90cb72fc document --auto all in one place 2011-09-15 15:15:47 -04:00
Joey Hess
984c9fc052 remove optimize subcommand; use --auto instead 
get, drop: Added --auto option, which decides whether to get/drop content
as needed to work toward the configured numcopies.

The problem with bundling it up in optimize was that I then found I wanted
to run an optmize that did not drop files, only got them. Considered adding
a --only-get switch to it, but that seemed wrong. Instead, let's make
existing subcommands optionally smarter.

Note that the only actual difference between drop and drop --auto is that
the latter does not even try to drop a file if it knows of not enough
copies, and does not print any error messages about files it was unable to
drop.

It might be nice to make get avoid asking git for attributes when not in
auto mode. For now it always asks for attributes.
 2011-09-15 13:30:04 -04:00
Joey Hess
949b3f69d0 optimize: A new subcommand that either gets or drops file content as needed to work toward meeting the configured numcopies setting. 
This is currently rather simplistic, though still useful.
In the future, it could become smarter about what content is stored where,
etc.
 2011-09-14 13:47:22 -04:00
Joey Hess
03d6209e1c addurl: Always use whole url as destination filename, rather than only its file component. 
First, this ensures that git annex addurl, when run repeatedly with the
same url, doesn't create duplicate files, which it did before when it
fell back to the longer filename.

Secondly, the file part of an url is frequently not very descriptive on its
own.

The uri scheme, auth, and port is intentionally left out, as clutter.
 2011-09-07 19:04:51 -04:00
Joey Hess
b7bcd942c5 add news item for git-annex 3.20110906 2011-09-06 15:54:43 -04:00
Joey Hess
3778e8897d switch to using cabal-install git-annex 2011-09-06 14:48:15 -04:00
Joey Hess
ca4eb842a4 add json to build scripts 2011-09-06 14:36:21 -04:00
Joey Hess
92f490383a Merge branch 'master' of ssh://git-annex.branchable.com 2011-09-06 14:35:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl0-EtQjVUNysjom6sTlQxRUwkwD6uPx88
fcfd2776cb 2011-09-06 18:27:08 +00:00
Joey Hess
07125dca53 Improve display of newlines around error and warning messages. 2011-09-06 13:46:08 -04:00
Joey Hess
14f75ced75 remove now unnecessary commit after get 2011-09-05 11:59:53 -04:00
Joey Hess
dbef6a045c remove now-unnecessary commit after drop 2011-09-05 11:59:52 -04:00
http://joey.kitenet.net/
f0777d9b5a Added a comment 2011-09-05 15:59:27 +00:00
DavidEdmondson
c5c525d930 Added a comment: Is it necessary to commit after the 'drop'? 2011-09-05 15:43:26 +00:00
Joey Hess
ea621d0c2d add news item for git-annex 3.20110902 2011-09-02 21:32:21 -04:00
Joey Hess
cb5dacfd40 rsync and wget use stderr for progress, so no problem 2011-09-01 16:15:57 -04:00
Joey Hess
e4a74c0dc5 close bug with some caveats 2011-09-01 16:11:21 -04:00
Joey Hess
2f4d4d1c45 basic json support 
This includes a generic JSONStream library built on top of Text.JSON
(somewhat hackishly).

It would be possible to stream out a single json document describing
all actions, but it's probably better for consumers if they can expect
one json document per line, so I did it that way instead.

Output from external programs used for transferring files is not
currently hidden when outputting json, which probably makes it not very
useful there. This may be dealt with if there is demand for json
output for --get or --move to be parsable.

The version, status, and find subcommands have hand-crafted output and
don't do json. The whereis subcommand needs to be modified to produce
useful json.
 2011-09-01 15:22:06 -04:00
Joey Hess
38eff1dc1f Merge branch 'master' of ssh://git-annex.branchable.com 2011-08-31 19:13:23 -04:00
Joey Hess
f600444ab6 unused --remote: Reduced memory use to 1/4th what was used before. 
Using a single strictness annotation, in just the right place.
Tried several others, none of which helped and some of which potentially
hurt. This is only the second time I've really had to deal with this in
a year of using haskell, which is, I suppose not that bad.
 2011-08-31 19:13:02 -04:00
http://jefferai.org/
baa43cb9c0 2011-08-30 20:56:44 +00:00
Joey Hess
abe3b5bf78 Merge branch 'master' of ssh://git-annex.branchable.com 2011-08-30 13:32:40 -04:00
Joey Hess
b96443364e smudge update: Not practical. 2011-08-30 13:29:07 -04:00
http://www.schleptet.net/~cfm/
9e135a6ee2 Added a comment 2011-08-30 14:31:38 +00:00
Joey Hess
5ef11350aa link to patch 2011-08-29 16:41:47 -04:00
Joey Hess
cd199e442f update; showstopper issue with current git 
developed a patch for git, we'll see if they like it..
 2011-08-29 16:31:47 -04:00
Joey Hess
d1154d0837 init: Make description an optional parameter. 2011-08-29 14:13:38 -04:00
Joey Hess
b2c5639dcc update 2011-08-29 13:29:39 -04:00
Joey Hess
676c467801 close 2011-08-29 12:49:38 -04:00
Joey Hess
025e66e3d3 update to not overstate the danger or WORM 2011-08-29 12:11:05 -04:00
http://joey.kitenet.net/
2a76ad4167 Added a comment 2011-08-29 16:10:38 +00:00
cwg
eb4607aafc 2011-08-29 12:37:23 +00:00
cwg
b6758746f6 2011-08-29 12:35:19 +00:00
Joey Hess
bbba6c19bd update documentation for new, neutered key-value backends 
Backends are now only used to generate keys (and check them); they
are not arbitrary key-value stores for data, because it turned out such
a store is better modeled as a special remote. Updated docs to not
imply backends do more than they do now.

Sometimes I'm tempted to rename "backend" to "keytype" or something,
which would really be more clear. But it would be an annoying transition
for users, with annex.backends etc.
 2011-08-28 16:28:38 -04:00
Joey Hess
b26ee162f3 guess not everyone configures their shell to show nonzero exit codes.. 2011-08-27 12:34:02 -04:00
Joey Hess
6e750764b7 The wget command will now be used in preference to curl, if available. 
Got tired of curl's various ugly progress bars.
 2011-08-27 12:31:50 -04:00
http://peter-simons.myopenid.com/
9170e1b87d 2011-08-26 10:55:43 +00:00
Joey Hess
7121526385 add news item for git-annex 3.20110819 2011-08-19 20:39:03 -04:00
Joey Hess
8a2197adfa Added annex-cost-command configuration, which can be used to vary the cost of a remote based on the output of a shell command. 
Also avoided crashing if the user specified cost value cannot be parsed.
 2011-08-18 12:20:47 -04:00
Joey Hess
228a724d1d improve docs for init 2011-08-17 14:44:31 -04:00
Joey Hess
3b5f722130 init no longer creates .gitattributes 2011-08-17 14:44:31 -04:00
http://joey.kitenet.net/
a131fabc0d Added a comment: Re: squeeze-backports update? 2011-08-17 15:34:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawla7u6eLKNYZ09Z7xwBffqLaXquMQC07fU
e950947cc9 Added a comment: squeeze-backports update? 2011-08-17 12:34:48 +00:00
Joey Hess
00cc34a4c3 add news item for git-annex 3.20110817 2011-08-17 01:34:43 -04:00
http://joey.kitenet.net/
cde8221051 Added a comment 2011-08-17 04:56:30 +00:00
http://joey.kitenet.net/
dffbf49d90 Added a comment 2011-08-17 01:33:08 +00:00
Joey Hess
790b0f3879 update 2011-08-16 21:16:23 -04:00
Joey Hess
e6752cc064 Added support for getting content from git remotes using http (and https). 2011-08-16 21:12:48 -04:00
Joey Hess
c04f1f4c30 response 2011-08-16 16:11:55 -04:00
Joey Hess
f1f6a9d887 Merge branch 'master' of ssh://git-annex.branchable.com 2011-08-16 11:51:41 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkHscTHMCNvjJ6nLI1VpsBrJFI5FTwhUT4
c3f74c6959 2011-08-15 18:19:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkHscTHMCNvjJ6nLI1VpsBrJFI5FTwhUT4
9f719e5674 2011-08-15 18:18:22 +00:00
Joey Hess
829ea31b72 typo 2011-08-15 13:30:59 -04:00
Joey Hess
9980ddff30 Merge branch 'master' of ssh://git-annex.branchable.com 2011-08-14 19:58:16 -04:00
http://christian.amsuess.com/chrysn
18012c7ec8 enhancement suggestion 2011-08-12 13:09:11 +00:00
http://christian.amsuess.com/chrysn
8b847517a8 (i don't have a remote origin, but it's more common and doesn't change the example) 2011-08-10 17:00:09 +00:00
http://christian.amsuess.com/chrysn
f8282b55ce problems with version 3 upgrade instructions 2011-08-10 16:56:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA
20a8f8c85b 2011-08-09 13:04:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA
1e934c29d6 2011-08-09 13:02:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA
065e1a507b 2011-08-09 13:00:21 +00:00
Joey Hess
c5666ec481 Merge branch 'master' of ssh://git-annex.branchable.com 2011-08-08 15:41:57 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmFgsNxmnGznb5bbmcoWhoQOoxZZ-io61s
614d8f9856 Added a comment 2011-08-08 09:04:21 +00:00
Joey Hess
dede05171b addurl: --fast can be used to avoid immediately downloading the url. 
The tricky part about this is that to generate a key, the file must be
present already. Worked around by adding (back) an URL key type, which
is used for addurl --fast.
 2011-08-06 14:57:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawliqfHEW134uawIUPwyKiyOdoF-oI5TxnQ
d2492f990f 2011-08-05 22:35:48 +00:00
Joey Hess
46ddb4e66a response 2011-08-05 10:29:21 -04:00
Joey Hess
3211c6e335 Merge branch 'master' of ssh://git-annex.branchable.com 2011-08-05 10:27:56 -04:00
Joey Hess
578e669964 response 2011-08-05 10:27:22 -04:00
http://christian.amsuess.com/chrysn
d3f6f4fe34 fixed internal link 2011-08-04 15:25:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmFgsNxmnGznb5bbmcoWhoQOoxZZ-io61s
a746623a33 2011-08-01 09:54:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmFgsNxmnGznb5bbmcoWhoQOoxZZ-io61s
b48fec3846 2011-08-01 09:52:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
344f2c3ec1 Added a comment: Solution 2011-07-31 15:24:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
ad4528cce8 2011-07-31 01:20:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
d9cdb5eb45 2011-07-30 18:04:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
16c55f61f2 2011-07-30 17:28:42 +00:00
Joey Hess
45bbf210a1 Fix shell escaping in rsync special remote. 2011-07-29 15:28:21 +02:00
https://www.google.com/accounts/o8/id?id=AItOawkvSZ1AFJdY_1FeutZr_KWeqtzjZta1PNE
50edbb03eb 2011-07-28 17:40:53 +00:00
Joey Hess
1d88b966e2 fix broken img 2011-07-24 15:15:43 +02:00
Joey Hess
d8f21b7955 add news item for git-annex 3.20110719 2011-07-19 23:54:36 -04:00
Joey Hess
13187b1ba7 close 2011-07-15 12:55:05 -04:00
Joey Hess
39ae33386d update 2011-07-15 12:53:58 -04:00
Joey Hess
7fa7601490 response 2011-07-15 12:51:06 -04:00
http://peter-simons.myopenid.com/
185f0b6870 2011-07-15 15:33:35 +00:00
Joey Hess
ded2591124 unannex: Clean up use of git commit -a. 
This was more complex than would be expected. unannex has to use git commit -a
since it's removing files from git; git commit filelist won't do.

Allow commands to be added to the Git queue that have no associated files,
and run such commands once.
 2011-07-14 17:15:37 -04:00
Joey Hess
0c46cbab09 Support the standard git -c name=value 
This allows eg, `git-annex -c annex.rsync-options=-6 get file`

The overridden git configs are not passed on to git plumbing commands
that are run. Perhaps someone will find a need to do that, but I don't yet
and it would require storing more state to know what config settings
have been overridden and need to be passed on.
 2011-07-14 16:51:20 -04:00
http://peter-simons.myopenid.com/
020787bb97 2011-07-14 12:15:42 +00:00
http://peter-simons.myopenid.com/
a4f2dd2fc6 Added a comment: Solved 2011-07-13 16:21:26 +00:00
http://peter-simons.myopenid.com/
709f75f187 2011-07-13 10:35:47 +00:00
http://peter-simons.myopenid.com/
0fee31a164 2011-07-13 10:35:18 +00:00
Joey Hess
c38dd9adc8 analysis 2011-07-10 15:37:29 -04:00
Joey Hess
7919de73af Bugfix: Make add ../ work. 
The complication of check-attr returning absolute paths that have to be
converted back to relative paths..
 2011-07-10 13:52:53 -04:00
Joey Hess
562fd41d6c Merge branch 'master' of ssh://git-annex.branchable.com 2011-07-10 13:05:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
085eeaa652 2011-07-09 01:49:09 +00:00
Joey Hess
7da059e557 update 2011-07-08 01:26:18 -04:00
http://joey.kitenet.net/
a8fe35f645 2011-07-08 03:39:22 +00:00
http://joey.kitenet.net/
151b1d85c7 Added a comment 2011-07-08 01:32:30 +00:00
Joey Hess
433b6b75e5 Merge branch 'master' of ssh://git-annex.branchable.com 2011-07-07 21:31:22 -04:00
Joey Hess
2a108982ad add monad-control to build depends 
Will use this to handle exceptions in the Annex monad, yay.
 2011-07-07 20:53:57 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
4857f4e861 Added a comment 2011-07-08 00:45:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
9633deab57 Added a comment: this happens also when the user has not the permission to set the file mode 2011-07-08 00:21:32 +00:00
Joey Hess
f7be0d5077 add news item for git-annex 3.20110707 2011-07-07 19:38:05 -04:00
Joey Hess
67dcc1f171 add: Avoid a failure mode that resulted in the file seemingly being deleted (content put in the annex but no symlink present). 2011-07-07 19:29:36 -04:00
Joey Hess
ff531b9677 Merge branch 'master' of ssh://git-annex.branchable.com 2011-07-07 17:05:53 -04:00
http://joey.kitenet.net/
dac158c7b2 Added a comment 2011-07-07 21:04:23 +00:00
http://joey.kitenet.net/
0c52362359 Added a comment 2011-07-07 20:27:33 +00:00
ssqq
33ebaf3f9f 2011-07-07 19:45:31 +00:00
ssqq
1ffe7f7770 2011-07-07 19:44:40 +00:00
ssqq
944cc2fde8 2011-07-07 18:49:49 +00:00
http://joey.kitenet.net/
f854d5ae7a Added a comment 2011-07-07 15:27:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
8da1dd0336 2011-07-07 11:08:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
c5296dee1f 2011-07-06 21:29:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
a6c2bea91f 2011-07-06 20:39:11 +00:00
https://lithitux.org/openidserver/users/pavel
10e72acb01 Added a comment 2011-07-06 08:14:26 +00:00
Joey Hess
674768abac add news item for git-annex 3.20110705 2011-07-05 15:22:12 -04:00
http://joey.kitenet.net/
fb433a5ba2 Added a comment 2011-07-05 19:06:48 +00:00
http://joey.kitenet.net/
502bac1c71 Added a comment 2011-07-05 18:37:21 +00:00
Joey Hess
82eb082ab9 my fix is confirmed to have worked 
Also audited for other uses of pipeBoth and hPipeBoth and they mostly seem
safe.
 2011-07-05 14:36:21 -04:00
http://joey.kitenet.net/
5070340ca7 Added a comment 2011-07-05 17:31:22 +00:00
https://lithitux.org/openidserver/users/pavel
bddbb66ea4 Added a comment: "Me too" 2011-07-05 15:54:21 +00:00
Joey Hess
0a2285f321 Merge branch 'master' of ssh://git-annex.branchable.com 2011-07-04 19:34:02 -04:00
Joey Hess
5c69ac14eb Drop the dependency on the haskell curl bindings, use regular haskell HTTP. 2011-07-04 19:33:11 -04:00
http://joey.kitenet.net/
0ef0f277c1 Added a comment 2011-07-04 22:58:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
9869ebb260 2011-07-04 22:54:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmJfIszzreLNvCqzqzvTayA9_9L6gb9RtY
02f2c744bd Added a comment 2011-07-04 20:25:39 +00:00
Joey Hess
71c783bf24 uninit: Use unannex in --fast mode, to support unannexing multiple files that link to the same content. 2011-07-04 16:20:50 -04:00
Joey Hess
22a4f5b348 unannex: In --fast mode, file content is left in the annex, and a hard link made to it. 2011-07-04 16:06:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
18d82459c6 Added a comment 2011-07-04 16:57:26 +00:00
http://joey.kitenet.net/
109814d8bb Comment moderation 2011-07-04 16:29:40 +00:00
Joey Hess
bd54dadb0b response 2011-07-04 12:27:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
de408626b7 Added a comment: git annex fetch 2011-07-03 17:57:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
e6ca68250e Added a comment: git annex fetch 2011-07-03 14:39:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
d97cc2fd52 Added a comment 2011-07-03 11:56:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
3904d2e4b9 2011-07-03 11:32:17 +00:00
Joey Hess
bd5884d8dd reorder 2011-07-02 17:29:20 -04:00
Joey Hess
e3ffa4330c update 2011-07-02 17:14:27 -04:00
Joey Hess
686d08718b link to hackage 2011-07-02 17:10:25 -04:00
Joey Hess
17a2b13e64 formatting 2011-07-02 15:11:20 -04:00
Joey Hess
791dfaac65 add news item for git-annex 3.20110702 2011-07-02 15:08:49 -04:00
Joey Hess
8045991830 better cabal command 
(which will work once I upload to hackage)
 2011-07-02 14:40:57 -04:00
Joey Hess
ace9de37e8 download urls via tmp file, and support resuming 2011-07-01 18:59:40 -04:00
Joey Hess
5d154b8436 document web special remote log files 2011-07-01 17:28:31 -04:00
Joey Hess
fb58d1a560 wording 2011-07-01 17:17:51 -04:00
Joey Hess
a140f7148f documentation for using the web 2011-07-01 16:05:06 -04:00
Joey Hess
6ba866ca73 updates for web remote and removing URL backend 2011-07-01 15:39:30 -04:00
Joey Hess
e27e20c6d6 add 2011-06-30 16:16:52 -04:00
Joey Hess
ee3a0551a7 Merge branch 'master' into v3 
Conflicts:
	debian/changelog
 2011-06-30 15:01:08 -04:00
Joey Hess
56aeeb4565 cabal can now be used to build git-annex. 
This is substantially slower than using make, does not build or install
documentation, does not run the test suite, and is not particularly
recommended, but could be useful to some.
 2011-06-30 14:55:03 -04:00
Joey Hess
e1c18ddec4 Sped back up fsck, copy --from etc 
All commands that often have to read a lot of information from
the git-annex branch should now be nearly as fast as before
the branch was introduced.

Before fsck was taking approximatly 3 hours, now it's running in 8 minutes.

The code is very nasty. It should be rewritten to read the header line
from git cat-file, and then read the specified number of bytes of content.
 2011-06-29 21:47:31 -04:00
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