Commit graph

1651 commits

Author SHA1 Message Date
jean.jordaan@4bb3bd508a9eb0a4bab5d1b587dadd2b6c4a7edc
764e816156 2016-05-06 06:00:21 +00:00
Joey Hess
1a805c1f7c
comment 2016-05-03 15:12:55 -04:00
Joey Hess
d0036b9100
todo 2016-04-27 17:15:02 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4cece5a33e Added a comment 2016-04-25 18:28:14 +00:00
Joey Hess
7dc0b77783
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-25 13:47:46 -04:00
Joey Hess
cbb4433449
comment 2016-04-25 13:47:27 -04:00
Joey Hess
4c573815f9
close todos covered by rclone 2016-04-25 13:43:24 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4e0316b22c initial whining 2016-04-25 17:27:25 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
26d64d7355 made link a link 2016-04-23 19:14:59 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
6cdd633936 mentioned git-annex-remote-rclone 2016-04-23 19:13:49 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
07ca2bb416 2016-04-22 19:05:45 +00:00
Joey Hess
7945dd3c3e
refactor 2016-04-22 14:35:48 -04:00
Joey Hess
46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
2016-04-22 14:26:44 -04:00
Joey Hess
8ab27235ea
reinject: Added new mode which can reinject known files into the annex.
For example: git-annex reinject --known /mnt/backup/*
2016-04-22 13:49:32 -04:00
Joey Hess
b4cb1093bb
todo 2016-04-21 14:24:06 -04:00
CandyAngel
53c7c246a6 Added a comment 2016-04-21 11:41:09 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
caba449869 Added a comment 2016-04-20 19:21:33 +00:00
Joey Hess
da4ff16805
comment 2016-04-20 14:36:46 -04:00
Joey Hess
1bfea9b3e5
calckey: New plumbing command, calculates the key that would be used to refer to a file 2016-04-20 13:50:26 -04:00
Joey Hess
9d952fe9d1
reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Joey Hess
b949e85045
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were last edited or commented before Q3 2015.

Command line used:

for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
2016-04-19 13:55:29 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
8140aa58ea removed 2016-04-16 11:53:24 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
6403964cb6 Added a comment: Assistant support 2016-04-16 11:52:34 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
ab2ba2f37f Added a comment: Assistant support 2016-04-16 11:52:14 +00:00
Joey Hess
b19511822a
update 2016-04-13 13:39:16 -04:00
Joey Hess
bbe994295f
Fix build with ghc v7.11. Thanks, Gabor Greif. 2016-04-12 15:27:51 -04:00
Joey Hess
7815f227d2
update 2016-04-12 14:31:37 -04:00
Joey Hess
630fe90bf3
update 2016-04-12 14:24:48 -04:00
Joey Hess
7d0a078e5c
todo 2016-04-11 11:40:19 -04:00
Antoine Beaupré
c043bd9faf another thing i forgot 2016-04-10 19:20:37 -04:00
Antoine Beaupré
751abdd51f fix for manpage generation without hacks 2016-04-10 19:13:01 -04:00
Joey Hess
f0ddc0a75c
comment 2016-04-09 13:22:27 -04:00
Joey Hess
b3b1d72d57
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-09 12:31:27 -04:00
Antoine Beaupré
a5158baa89 possible fix for markdown generation with pandoc 2016-04-09 11:04:42 -04:00
Antoine Beaupré
c363bea652 attack the manpage problem 2016-04-09 10:40:53 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
d89161e13f Added a comment: freenet special remote 2016-04-09 10:37:23 +00:00
Antoine Beaupré
d1dd9b5a4b respond 2016-04-09 00:41:41 -04:00
Joey Hess
c2ce3dfed3
windows does not like filenames starting with a dot, rename 2016-04-08 17:08:07 -04:00
Joey Hess
c4be17d159
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-08 15:35:55 -04:00
Joey Hess
973d66bb67
update 2016-04-08 15:31:53 -04:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3 pull request for Bup.hs 2016-04-08 16:17:53 +00:00
Joey Hess
68ef108cb7
another reason 2016-04-05 14:29:33 -04:00
ExGen
6b2425d7bf Added a comment: Harlinks 2016-04-03 11:21:02 +00:00
ExGen
730e1aee68 Added a comment: Harlinks 2016-04-02 23:32:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6509834f3d Added a comment: cache? 2016-04-01 19:56:44 +00:00
Joey Hess
11d76f0c8e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-31 19:07:03 -04:00
Joey Hess
ed3e8e1886
Merge branch 'adjustedbranch' 2016-03-31 19:05:47 -04:00
anarcat
02cdd59bb6 another batch? 2016-03-31 14:08:03 +00:00
Joey Hess
93f5ccc808
update 2016-03-30 16:01:59 -04:00
Joey Hess
d72b85d437
update 2016-03-30 15:55:18 -04:00
Joey Hess
fb656b9048
log --raw-date: Use to display seconds from unix epoch. 2016-03-29 14:39:16 -04:00
Joey Hess
8a69298bf2
init: Automatically enter the adjusted unlocked branch when in a v6 repo on a filesystem not supporting symlinks. 2016-03-29 13:54:42 -04:00
http://svario.it/gioele
891fdf7eaa 2016-03-28 09:58:25 +00:00
Joey Hess
31480a54e2
close 2016-03-14 16:47:32 -04:00
karl
48b2357963 2016-03-13 16:01:03 +00: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
d201e6c359
add todo from comment 2016-03-09 13:21:55 -04:00
Joey Hess
0cdd4f9f58
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-09 13:13:28 -04:00
Joey Hess
c6f81e8ef5
done 2016-03-09 12:54:22 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
1f2e7fea6a Added a comment 2016-03-01 07:10:56 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
e815b5c23c Added a comment 2016-02-26 03:56:42 +00:00
Joey Hess
53ad65612e
todo 2016-02-23 16:54:31 -04:00
Joey Hess
67dc0d238f
disable new build flags for android build 2016-02-23 10:59:59 -04:00
CandyAngel
749ec95061 Added a comment 2016-02-23 12:24:48 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
3d1895ef95 2016-02-21 16:55:40 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
1c3d93eec4 Added a comment 2016-02-21 05:15:57 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
c65502e7cc 2016-02-21 03:49:40 +00:00
Joey Hess
3f47b8ae36
close 2016-02-19 16:59:57 -04:00
Joey Hess
7752f1bd24
comment 2016-02-19 16:50:33 -04:00
Joey Hess
e038c36e3e
tag bugs that will be fixed when direct mode is removed 2016-02-19 16:46:03 -04:00
Joey Hess
a56b17daaa
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-19 16:19:36 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e0314a9dcb Added a comment 2016-02-19 20:06:20 +00:00
Joey Hess
f1cebd1bf9
comment 2016-02-19 15:56:48 -04:00
Joey Hess
ed01410354
close 2016-02-19 15:54:55 -04:00
Joey Hess
9b021c1e90
comment 2016-02-19 15:28:55 -04:00
Joey Hess
c7fd2ac32c
comment 2016-02-19 14:50:54 -04:00
Joey Hess
09234eb42d
comment 2016-02-19 14:47:08 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ef557d7cac Added a comment 2016-02-15 17:05:08 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2301c7c134 Added a comment 2016-02-15 17:02:59 +00:00
Joey Hess
dfbb5db3a8
add spacer to menu 2016-02-15 13:02:14 -04:00
Joey Hess
4eeb25d9c9
comment 2016-02-15 12:52:56 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ad15d778e3 added [[!meta author=yoh]] 2016-02-15 15:29:22 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
eb879367a7 Added a comment 2016-02-15 15:28:41 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
8ed1e1bc66 2016-02-15 15:26:36 +00:00
jonan
60d9cb69ea 2016-02-15 09:37:52 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1e772a62b4 2016-02-12 22:39:04 +00:00
Joey Hess
cc4d3e3d45
checkpresentkey: Allow to be run without an explicit remote and add --batch
* checkpresentkey: Allow to be run without an explicit remote.
* checkpresentkey: Added --batch.
2016-02-12 16:43:51 -04:00
Joey Hess
84d657312e
comment 2016-02-12 14:36:00 -04:00
Joey Hess
9df13e73ae
if keys database cannot be opened due to permissions, ignore
This lets readonly repos be used. If a repo is readonly, we can ignore the
keys database, because nothing that we can do will change the state of the
repo anyway.
2016-02-12 14:16:35 -04:00
Joey Hess
1ec91f0c44
close 2016-02-12 13:41:50 -04:00
Joey Hess
4c2fb5569b
close 2016-02-10 12:42:48 -04:00
konubinix
2790840848 Added a comment: fuser and unison? 2016-02-10 09:12:52 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e46843054b 2016-02-10 00:01:10 +00:00
magibney@908c3d4677b9e87e203538d4d5e8c296255749a0
56889d07cd Added a comment 2016-02-09 21:51:17 +00:00
Joey Hess
73cca6e8c1
update 2016-02-09 16:26:55 -04:00
Joey Hess
5d05aad74c
S3: Allow configuring with requeststyle=path to use path-style bucket access instead of the default DNS-style access.
untested
2016-02-09 15:36:36 -04:00
magibney@908c3d4677b9e87e203538d4d5e8c296255749a0
dcea2f8d9f rename todo/allow_path-style_syntax_for_S3_bucket_specification.mdwn to todo/support_path-style_syntax_for_S3_bucket_specification.mdwn 2016-02-09 19:21:15 +00:00
magibney@908c3d4677b9e87e203538d4d5e8c296255749a0
1d432c677e rename todo/allow_path-style_semantics_for_S3_bucket_specification.mdwn to todo/allow_path-style_syntax_for_S3_bucket_specification.mdwn 2016-02-09 19:19:58 +00:00
magibney@908c3d4677b9e87e203538d4d5e8c296255749a0
a246ea41fe 2016-02-09 18:58:38 +00:00
Joey Hess
aeb6b4d2c0
comment 2016-02-09 12:39:57 -04:00
Joey Hess
4b1afda6c5
pointer 2016-02-09 12:36:22 -04:00
Joey Hess
edc5829785
added adjusted_branches design doc, meets at least 2 different needs 2016-02-09 12:30:29 -04:00
Joey Hess
09b369ba7e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-03 16:59:04 -04:00
Joey Hess
5127cb59cc
annex.largefiles: Add support for mimetype=text/* etc, when git-annex is linked with libmagic. 2016-02-03 16:29:34 -04:00
Joey Hess
86444fe507
comment 2016-02-03 15:45:54 -04:00
atrent
a5d89a8b4d Added a comment: adding a simple counter? 2016-02-03 07:48:10 +00:00
anarcat
4135c6d5d9 2016-02-01 19:54:39 +00:00
anarcat
8b2ada9f1a another idea 2016-02-01 19:53:04 +00:00
anarcat
81b9d7564c 2016-02-01 19:51:44 +00:00
Joey Hess
8db477b2ac
done 2016-01-29 13:27:06 -04:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
b1d3137ac2 pull request 2016-01-28 08:51:38 +00:00
tomekwi
23361077a1 Added a comment: Linux-Windows repo 2016-01-26 20:46:59 +00:00
Joey Hess
d1879df0ba
response 2016-01-22 15:39:27 -04:00
db
26b76a6b06 Added a comment 2016-01-22 19:00:58 +00:00
Joey Hess
fc9a02d600
comment 2016-01-20 15:00:13 -04:00
Joey Hess
6d79f9e755
find --batch 2016-01-20 13:04:07 -04:00
Joey Hess
9b9b5a30e1
whereis --batch 2016-01-20 12:46:00 -04:00
Joey Hess
7d0ece86f6
add --batch 2016-01-19 17:48:42 -04:00
Joey Hess
c06999df42
already done this earlier 2016-01-19 15:57:37 -04:00
fiatjaf
4dffddb343 small formatting fix. 2016-01-19 19:40:39 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6a2a4aaba1 2016-01-19 19:26:32 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
77fc00a68f Added a comment 2016-01-19 19:24:11 +00:00
Joey Hess
432151f966
comment 2016-01-19 13:15:35 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e35fa26c55 Added a comment 2016-01-19 16:39:49 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
9054f58e17 initial request 2016-01-19 16:31:03 +00:00
Joey Hess
aae77b1856
comment 2016-01-19 11:35:14 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
aa2e815954 marked as mine 2016-01-18 22:08:35 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ee94708bd7 2016-01-18 22:01:41 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ee58e4601e 2016-01-18 21:59:04 +00:00
tribut
37ef508def Added a comment 2016-01-18 16:22:54 +00:00
CandyAngel
165e5da2df Added a comment 2016-01-18 13:17:00 +00:00
tribut
ca19a2dbb6 Reformat irc log to add linebreaks (is there a better way to do this in markdown?) 2016-01-18 13:11:08 +00:00
tribut
d677bfea98 2016-01-18 13:07:23 +00:00
db
94af2cd44d 2016-01-17 17:14:30 +00:00
Joey Hess
aa35f5cdf7
info: Support --batch mode. 2016-01-15 15:56:47 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
78721c9afd Added a comment: "done" but only for non --fast/--relaxed 2016-01-13 23:49:30 +00:00
Joey Hess
af457d73a4
followup 2016-01-13 15:12:48 -04:00
Joey Hess
ecd0684bfc
avoid hard linking object from other repository when annex.thin is set
This is simpler and less expensive than checking if the src file has a
link count >= 2, and also is unlocked.
2016-01-13 14:19:31 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
50fad302a1 Added a comment: another side-effect of largefiles not being supported for my usecase 2016-01-12 17:20:08 +00:00
Joey Hess
f9c5aa84e0
add database benchmark
The benchmark shows that the database access is quite fast indeed!
And, it scales linearly to the number of keys, with one exception,
getAssociatedKey.

Based on this benchmark, I don't think I need worry about optimising
for cases where all files are locked and the database is mostly empty.
In those cases, database access will be misses, and according to this
benchmark, should add only 50 milliseconds to runtime.

(NB: There may be some overhead to getting the database opened and locking
the handle that this benchmark doesn't see.)

joey@darkstar:~/src/git-annex>./git-annex benchmark
setting up database with 1000
setting up database with 10000
benchmarking keys database/getAssociatedFiles from 1000 (hit)
time                 62.77 μs   (62.70 μs .. 62.85 μs)
                     1.000 R²   (1.000 R² .. 1.000 R²)
mean                 62.81 μs   (62.76 μs .. 62.88 μs)
std dev              201.6 ns   (157.5 ns .. 259.5 ns)

benchmarking keys database/getAssociatedFiles from 1000 (miss)
time                 50.02 μs   (49.97 μs .. 50.07 μs)
                     1.000 R²   (1.000 R² .. 1.000 R²)
mean                 50.09 μs   (50.04 μs .. 50.17 μs)
std dev              206.7 ns   (133.8 ns .. 295.3 ns)

benchmarking keys database/getAssociatedKey from 1000 (hit)
time                 211.2 μs   (210.5 μs .. 212.3 μs)
                     1.000 R²   (0.999 R² .. 1.000 R²)
mean                 211.0 μs   (210.7 μs .. 212.0 μs)
std dev              1.685 μs   (334.4 ns .. 3.517 μs)

benchmarking keys database/getAssociatedKey from 1000 (miss)
time                 173.5 μs   (172.7 μs .. 174.2 μs)
                     1.000 R²   (0.999 R² .. 1.000 R²)
mean                 173.7 μs   (173.0 μs .. 175.5 μs)
std dev              3.833 μs   (1.858 μs .. 6.617 μs)
variance introduced by outliers: 16% (moderately inflated)

benchmarking keys database/getAssociatedFiles from 10000 (hit)
time                 64.01 μs   (63.84 μs .. 64.18 μs)
                     1.000 R²   (1.000 R² .. 1.000 R²)
mean                 64.85 μs   (64.34 μs .. 66.02 μs)
std dev              2.433 μs   (547.6 ns .. 4.652 μs)
variance introduced by outliers: 40% (moderately inflated)

benchmarking keys database/getAssociatedFiles from 10000 (miss)
time                 50.33 μs   (50.28 μs .. 50.39 μs)
                     1.000 R²   (1.000 R² .. 1.000 R²)
mean                 50.32 μs   (50.26 μs .. 50.38 μs)
std dev              202.7 ns   (167.6 ns .. 252.0 ns)

benchmarking keys database/getAssociatedKey from 10000 (hit)
time                 1.142 ms   (1.139 ms .. 1.146 ms)
                     1.000 R²   (1.000 R² .. 1.000 R²)
mean                 1.142 ms   (1.140 ms .. 1.144 ms)
std dev              7.142 μs   (4.994 μs .. 10.98 μs)

benchmarking keys database/getAssociatedKey from 10000 (miss)
time                 1.094 ms   (1.092 ms .. 1.096 ms)
                     1.000 R²   (1.000 R² .. 1.000 R²)
mean                 1.095 ms   (1.095 ms .. 1.097 ms)
std dev              4.277 μs   (2.591 μs .. 7.228 μs)
2016-01-12 13:07:03 -04:00
Joey Hess
55ad30d1d9
update 2016-01-08 16:30:31 -04:00
Joey Hess
c96fb11a96
devblog 2016-01-07 18:03:06 -04:00
Joey Hess
722f56a99d
update 2016-01-07 15:47:19 -04:00
Joey Hess
d667a68b7e
test: Added --keep-failures option. 2016-01-06 13:44:12 -04:00
Joey Hess
50d25c186d
update 2016-01-05 17:41:46 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1d6d7a6e16 2016-01-05 02:20:14 +00:00
Joey Hess
b1373f0d15
update 2016-01-01 16:02:11 -04:00
Joey Hess
f36f24197a
scan for unlocked files on init/upgrade of v6 repo 2016-01-01 15:09:42 -04:00
Joey Hess
b03a24dc10
update 2016-01-01 14:26:09 -04:00
Joey Hess
4be2b57606
add test: conflict resolution (mixed locked and unlocked file) 2015-12-30 16:36:39 -04:00