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

2088 commits

Author SHA1 Message Date
Joey Hess
7ebf234616 Stale transfer lock and info files will be cleaned up automatically when get/unused/info commands are run. 
Deleting lock files is tricky, tricky stuff. I think I got it right!
 2015-05-12 20:11:23 -04:00
Joey Hess
8c2dd7d8ee Fix an unlikely race that could result in two transfers of the same key running at once. 
As discussed in bug report.
 2015-05-12 19:39:28 -04:00
Joey Hess
61ccf95004 Avoid accumulating transfer failure log files unless the assistant is being used. 
Only the assistant uses these, and only the assistant cleans them up, so
make only git annex transferkeys write them,

There is one behavior change from this. If glacier is being used, and a
manual git annex get --from glacier fails because the file isn't available
yet, the assistant will no longer later see that failed transfer file and
retry the get. Hope no-one depended on that old behavior.
 2015-05-12 15:53:38 -04:00
Joey Hess
a812d598ef Take space that will be used by running downloads into account when checking annex.diskreserve. 2015-05-12 15:20:22 -04:00
Joey Hess
505d540360 allow building without ascii-progress, since it is not ready yet 
No progress bars with -J unless built with ascii-progress.
 2015-05-12 13:54:16 -04:00
Joey Hess
e27b97d364 Merge branch 'master' into concurrentprogress 
Conflicts:
	Command/Fsck.hs
	Messages.hs
	Remote/Directory.hs
	Remote/Git.hs
	Remote/Helper/Special.hs
	Types/Remote.hs
	debian/changelog
	git-annex.cabal
 2015-05-12 13:23:22 -04:00
Joey Hess
96d24a8161 note about git annex drop behavior change in bare repo 2015-05-12 13:02:22 -04:00
Joey Hess
4b2e3210ea drop: Now supports --all, --unused, and --key. 2015-05-12 13:00:06 -04:00
Joey Hess
db5d831d07 import: Refuse to import files that are within the work tree, as that does not make sense and could cause data loss. 2015-05-11 12:57:47 -04:00
Joey Hess
6ebf615995 cutting a point release, will be a cabal-only update 2015-05-11 12:09:02 -04:00
Yaroslav Halchenko
cb23224ba3 ENH: make debianstandalone{,-dsc} rules 
Moved rules out of debian/rules and avoided need for patching it for
standalone builds
 2015-05-11 11:50:59 -04:00
Joey Hess
26ac0753c1 more FlexibleContexts 2015-05-10 15:54:58 -04:00
Yaroslav Halchenko
e861dd1dd5 ENH: leave only git for depends of standalone -- the rest is provided 
Otherwise, versioned depends forbid installation on elderly squeeze
 2015-05-10 14:36:50 -04:00
Joey Hess
6a1814abf5 seems that webapp ssh password ssh-agent hack is broken on windows after recent ssh changes 2015-05-08 15:07:23 -04:00
Joey Hess
f1a81cfce2 prep release 2015-05-08 13:42:45 -04:00
Joey Hess
f395ca7a41 Improve quvi 0.4 output parsing to handle cases wher there is no known filename extension. This is currently the case when using quvi with youtube. In this case, the extension ".m" will be used. 2015-05-08 13:39:00 -04:00
Joey Hess
54bee7dad4 Revert "Android: Updated bundled ssh from 6.1p1 to 6.4p1." 
This reverts commit 27836a2af9.

Build didn't actually seem to succeed, for both versions of android, so
I'll need to revisit this later.
 2015-05-08 13:05:33 -04:00
Joey Hess
0137656c39 typo 2015-05-07 19:41:05 -04:00
Joey Hess
ee94a79690 Debian's ghc now supports TH on arm! Adjust build dependencies to build the webapp on arm, and enable DAV support on arm. \o/ 
Also, adjust some other arch specific build dependencies that are now
available on more architectures in Devian unstable.
 2015-05-07 19:09:44 -04:00
Joey Hess
4ba4155067 remove workaround for now fixed bug #763078 2015-05-07 18:54:55 -04:00
Joey Hess
e09816b0e6 reorder 2015-05-07 18:12:08 -04:00
Joey Hess
4aba1c74bd remaining dataenc to sandi conversions 
I've tested all the dataenc to sandi conversions except Assistant.XMPP,
and all have unchanged behavior, including behavior on large unicode code
points.
 2015-05-07 18:07:13 -04:00
Joey Hess
18fc05ff04 Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin. 2015-05-07 15:56:40 -04:00
Joey Hess
ce285ea6fa Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH. 2015-05-07 15:53:03 -04:00
Joey Hess
469242ac4d fsck: Ignore error recording the fsck in the activity log, which can happen when running fsck in a read-only repository. Closes: #698559 (fsck can still need to write to the repository if it find problems, but a successful fsck can be done read-only) 2015-05-06 14:45:20 -04:00
Joey Hess
eeb0359a2e contentlocation, examinekey, lookupkey: Added --batch mode option. 2015-05-06 13:44:53 -04:00
Joey Hess
cf786f42a4 Support checking ftp urls for file presence. 2015-05-05 14:05:02 -04:00
Joey Hess
0b18228516 Work around wget bug #784348 which could cause it to clobber git-annex symlinks when downloading from ftp. 2015-05-05 13:53:06 -04:00
Joey Hess
0e6d3a9041 add missing env var setting for standalone build 2015-05-05 13:50:37 -04:00
Yaroslav Halchenko
d15f2a1273 BF: Adjusted debian/patches/standalone-build for recent stylistic changes 2015-05-03 12:02:30 -04:00
Joey Hess
27836a2af9 Android: Updated bundled ssh from 6.1p1 to 6.4p1. 
Tested it builds, but have not run it yet.
 2015-05-01 15:33:29 -04:00
Joey Hess
437d9db41d assistant: Added --autostop to complement --autostart. 2015-05-01 13:53:45 -04:00
Joey Hess
efb37e7c78 Improve behavior when a git-annex command is told to operate on a file that doesn't exist. It will now continue to other files specified after that on the command line, and only error out at the end. 2015-04-30 15:28:17 -04:00
Joey Hess
ac6b492711 import: Before removing a duplicate file in --deduplicate or --clean-duplicates mode, verify that enough copies of its content still exist. 2015-04-30 14:04:36 -04:00
Joey Hess
995643665a Improve integration with KDE's file manager to work with dolphin version 14.12.3 while still being compatable with 4.14.2. Thanks, silvio. 2015-04-29 15:53:16 -04:00
Joey Hess
d8ad1d5503 import: Don't stop entire import when one file fails due to being gitignored or conflicting with something in the work tree. 2015-04-29 13:56:41 -04:00
Joey Hess
2e54251c18 import: Check for gitignored files before moving them into the tree. (Needs git 1.8.4 or newer.) 2015-04-29 13:46:12 -04:00
Joey Hess
986e245ac1 changelog 2015-04-27 18:10:56 -04:00
Joey Hess
ee78958798 S3: Fix incompatability with bucket names used by hS3; the aws library cannot handle upper-case bucket names. git-annex now converts them to lower case automatically. 
For example, it failed to get files from a bucket named S3.

Also fixes `git annex initremote UPPERCASE type=S3`, which failed with the
new aws library, with a signing error message.
 2015-04-27 18:00:58 -04:00
Joey Hess
cfbeb1e7b7 Fix bogus failure of fsck --fast. 2015-04-27 17:40:21 -04:00
Joey Hess
22a4e92df7 S3: git annex enableremote will not create a bucket name, which failed since the bucket already exists. 2015-04-23 14:16:53 -04:00
Joey Hess
b3eccec68c S3: git annex info will show additional information about a S3 remote (endpoint, port, storage class) 2015-04-23 14:12:25 -04:00
Joey Hess
8f010bb55b also drop old dbus compat 2015-04-22 16:23:41 -04:00
Joey Hess
eb8ef44133 Dropped support for older versions of yesod and warp than the ones in Debian Jessie. 
466 lines of compat cruft deleted!
 2015-04-22 16:19:11 -04:00
Joey Hess
a15e1158c6 use BuildVersion in debian, which fixes windows build 2015-04-21 16:42:54 -04:00
Joey Hess
3b3aaf0d56 S3: Enable debug logging when annex.debug or --debug is set. 
To debug a bug report, but generally useful.
 2015-04-21 15:55:42 -04:00
Joey Hess
e651b29e90 reuse Build.Version to generate version 2015-04-20 15:56:28 -04:00
Joey Hess
b0ebb232ec style changes 2015-04-20 14:55:30 -04:00
Joey Hess
bf0e860617 changelog for https://github.com/joeyh/git-annex/pull/41 2015-04-20 14:53:14 -04:00
Joey Hess
92833a7e99 update to generate version in same format git-annex uses 2015-04-20 14:51:34 -04:00