Commit graph

27307 commits

Author SHA1 Message Date
Horus
7b84c2fef4 Added a comment 2016-03-15 08:53:15 +00:00
https://christian.amsuess.com/chrysn
91de23966a new issue with sharedRepository introdcued in 5.20151208 2016-03-15 07:58:08 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
786643dbf4 Added a comment 2016-03-14 21:10:56 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
199b0d1dd8 Added a comment 2016-03-14 21:05:06 +00:00
Joey Hess
834b0ac2d9
devblog 2016-03-14 16:53:14 -04:00
Joey Hess
31480a54e2
close 2016-03-14 16:47:32 -04:00
Joey Hess
13f4af5d33
typo 2016-03-14 16:46:00 -04:00
Joey Hess
231a914018
comment 2016-03-14 16:42:29 -04:00
Joey Hess
3a86cdf3e6
comment 2016-03-14 16:39:39 -04:00
Joey Hess
bd4ad3d2e8
comment 2016-03-14 16:37:55 -04:00
Joey Hess
a2b668a8f6
reuse annex's HashObjectHandle 2016-03-14 16:29:59 -04:00
Joey Hess
2d234de781
Sped up git-annex merge by using git hash-object --batch.
This does mean that it has to write out temp files containing updated
objects for the merge. So may use more disk space, and disk IO, but that
should generally win out over needing to launch N separate
git hash-object processes.
2016-03-14 16:23:22 -04:00
Joey Hess
a27faf6999
fix build of this 2016-03-14 16:19:27 -04:00
Joey Hess
00d9da3534
use hash-object --batch
Handle was plumbed through, but not used.
2016-03-14 16:12:55 -04:00
Joey Hess
88a4a6f396
Sped up git-annex add in direct mode and v6 by using git hash-object --batch.
Speeds up hashSymlink and hashPointerFile.
2016-03-14 15:58:46 -04:00
Joey Hess
f2772f469a
followup 2016-03-14 15:54:46 -04:00
Joey Hess
11d31f53bf
comment 2016-03-14 13:55:57 -04:00
Joey Hess
5633e8ed50
comment 2016-03-14 13:50:47 -04:00
Joey Hess
dc2da86939
comment 2016-03-14 13:38:41 -04:00
Joey Hess
6bc44d5d16
comment 2016-03-14 13:30:25 -04:00
Joey Hess
7398fc36f2
response 2016-03-14 13:26:26 -04:00
Joey Hess
1df49506c4
Correct git-annex info to include unlocked files in v6 repository.
An unlocked present file does not have a pointer file in the worktree, so
info skipped counting it.

It may be that unused was also affected by the problem, but it seemed not
to be in my tests. I think because of the use of the associatedFilesFilter.

This fix slows down both info and unused a little bit, since they have to
query the contents of files from git, but only when handling unlocked files.
2016-03-14 13:14:01 -04:00
Horus
8f362565a8 Added a comment 2016-03-14 08:18:50 +00:00
torpidus
1d81caedfe 2016-03-13 19:19:13 +00:00
torpidus
82f7582f8f removed 2016-03-13 19:18:39 +00:00
karl
48b2357963 2016-03-13 16:01:03 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
0d9f3bdae0 2016-03-13 11:32:35 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
bef922be21 2016-03-13 11:28:17 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
b28f32e47f 2016-03-13 11:20:49 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
a1765ecf8c 2016-03-13 11:19:39 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
e191f127eb 2016-03-13 11:16:09 +00:00
Joey Hess
92877bb5d0
windows git seems to fail to checkout foo.../bar ; rename 2016-03-12 13:57:07 -04:00
Joey Hess
8b653bf9ef
remove danging comment with * in its filename 2016-03-12 13:51:25 -04:00
Joey Hess
348105debc
fix links 2016-03-12 13:47:31 -04:00
Joey Hess
2eae70353d
remove note about cygwin git 2016-03-12 13:45:31 -04:00
Richard Hartmann
c483e11cb3
Bump standards version
(cherry picked from commit 6efa2492bb)
2016-03-12 13:02:37 -04:00
Joey Hess
4205e93c1e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-12 12:58:02 -04:00
Joey Hess
7125a1fb27
rename files containing :
This is mostly to let the repo check out on windows w/o using cygwin's git.

But, bash completion is also crap with : , so ..
2016-03-12 12:57:18 -04:00
Joey Hess
b02f813ed8
bump process version in stack.yaml
Newer version than current lts has is needed on windows
2016-03-12 12:37:11 -04:00
Richard Hartmann
b1b80e6dec Typo 2016-03-12 15:13:46 +01:00
Joey Hess
7a01f60eed
update 2016-03-11 20:16:02 -04:00
Joey Hess
cc44813550
simplify 2016-03-11 20:12:31 -04:00
Joey Hess
26405c107a
devblog 2016-03-11 19:55:27 -04:00
Joey Hess
41b7c5f6aa
implement another adjustment -- easy to do now! 2016-03-11 19:54:10 -04:00
Joey Hess
a85196bd4e
simplify adjustment reversal 2016-03-11 19:41:11 -04:00
Joey Hess
6c023e14ef
grafting new items into existing tree 2016-03-11 19:29:43 -04:00
Joey Hess
ad04550055
refactor 2016-03-11 16:45:40 -04:00
Joey Hess
f3b9c48a09
fixme 2016-03-11 16:37:31 -04:00
Joey Hess
ba1ef156a2
fix deletion of files in adjustTree 2016-03-11 16:30:06 -04:00
Joey Hess
b9184f69a7
improve propigation of commits from adjusted branches
Only reverse adjust the changes in the commit, which means that adjustments
do not need to be generally cleanly reversable.

For example, an adjustment can unlock all locked files, but does not need
to worry about files that were originally unlocked when reversing, because
it will only ever be run on files that have been changed. So, it's ok
if it locks all files when reversed, or even leaves all files as-is when
reversed.
2016-03-11 16:05:06 -04:00