Joey Hess
36b9c9ca5f
fromkey, registerurl: Improve handling of urls that happen to also be parsable as strange keys.
2015-05-30 02:08:49 -04:00
Joey Hess
77c43a388e
fromkey, registerurl: Allow urls to be specified instead of keys, and generate URL keys.
...
This is especially useful because the caller doesn't need to generate valid
url keys, which involves some escaping of characters, and may involve
taking a md5sum of the url if it's too long.
2015-05-22 22:41:36 -04:00
Joey Hess
823bb8031b
add annex.used-refspec
2015-05-14 15:44:08 -04:00
Joey Hess
86699ff861
unused: Add --used option, which can specify a set of refs to consider used, rather than the default of considering all refs used.
2015-05-14 15:31:38 -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
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
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
26ac0753c1
more FlexibleContexts
2015-05-10 15:54:58 -04:00
Joey Hess
6c2d5b5e41
more time-1.5 fixes
2015-05-10 15:36:58 -04:00
Joey Hess
6cf62a9bde
support time-1.5.0
...
This no longer uses old-locale's defaultTimeLocale, but provides one
of its own.
Factored out a Logs.TimeStamp.
2015-05-10 15:21:35 -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
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
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
9f3e51dd51
move nubbing into function whose algo needs a nubbed list
2015-04-30 14:11:59 -04:00
Joey Hess
607eed0de2
improve messages
2015-04-30 14:10:28 -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
38c458b407
refactor
2015-04-30 14:02:56 -04:00
Joey Hess
9e10b5ca9c
nub list after adding ocal uuid to it
...
This potentially fixes a numcopies counting bug when dropping --from a
remote, and the local repository is trusted. The local repo would end up in
the list twice, so it would verify one less copy than it was supposed to.
2015-04-30 13:13:28 -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
cfbeb1e7b7
Fix bogus failure of fsck --fast.
2015-04-27 17:40:21 -04:00
Joey Hess
ca2cf63e34
clean up imports
2015-04-19 10:47:07 -04:00
Joey Hess
addc82dab7
removed all uses of undefined from code base
...
It's a code smell, can lead to hard to diagnose error messages.
2015-04-19 00:38:29 -04:00
Joey Hess
978906c616
forgot to add these
2015-04-18 16:09:09 -04:00
Joey Hess
ef2202fd94
required: New command, like wanted, but for required content.
...
Also refactored some code to reduce duplication.
2015-04-18 16:04:35 -04:00
Joey Hess
8d685768d3
fsck --from remote: Avoid downloading a key if it would go over the annex.diskreserve limit.
2015-04-18 14:23:42 -04:00
Joey Hess
8489057e8d
fsck --from remote: When bad content is found in the remote, and the local repo does not have a copy of the content, preserve the bad content in .git/annex/bad/ to avoid further data loss.
2015-04-18 14:13:07 -04:00
Joey Hess
a2902cdaaf
add filename to progress bar, and display ok/failed at end
...
This needed plumbing an AssociatedFile through retrieveKeyFileCheap.
2015-04-14 16:35:10 -04:00
Joey Hess
86a2f9dc4d
Merge branch 'master' into concurrentprogress
...
Conflicts:
debian/changelog
2015-04-14 15:35:15 -04:00
Joey Hess
2be4834822
info: Added --bytes option.
2015-04-12 14:08:40 -04:00
Joey Hess
b14ec45aa8
info dir: Added information about repositories that contain files in the specified directory.
...
This is a nearly free feature; it piggybacks on the location log lookups
done for the numcopies stats. So, the only extra overhead is updating
the map of repository sizes.
However, I had to switch to Data.Map.Strict, which needs containers 0.5.
If backporting to wheezy, will probably need to revert this commit.
2015-04-12 12:54:41 -04:00
Joey Hess
8077ccbd54
get, move, copy, mirror: Concurrent downloads and uploads are now supported!
...
This works, and seems fairly robust. Clean get of 20 files at -J3. At -J10,
there are some messages about ssh multiplexing, probably due to a race
spinning up the ssh connection cacher. But, it manages to get all the files
ok regardless.
The progress bars are a scrambled mess though, due to bugs in
ascii-progress, which I've already filed. Particularly this one:
https://github.com/yamadapc/haskell-ascii-progress/issues/8
2015-04-10 17:08:07 -04:00
Joey Hess
40aae2dd11
unused import
2015-04-10 13:16:04 -04:00
Joey Hess
ce0a82f493
contentlocationn: New plumbing command.
2015-04-09 15:34:47 -04:00
Joey Hess
3695094454
importfeed: Error out when passed a non-url.
2015-04-09 13:09:06 -04:00
Joey Hess
aa31af5594
importfeed: Fix feed download when curl is used.
...
This bug used to only afflict file:/// urls, but became more exposed
by b8f0b7309f
2015-04-09 13:02:57 -04:00
Joey Hess
84dc5629c6
info: Display repository mode: bare when in a bare (non-direct mode) repo.
2015-04-09 12:28:26 -04:00
Joey Hess
d5a25bd567
proxy: Made it work when run in a new repository before initial commit.
2015-04-09 12:24:42 -04:00
Joey Hess
3c2cb25698
wording
2015-04-08 16:16:42 -04:00
Joey Hess
4da371af1e
add: If annex.largefiles is set and does not match a file that's being added, the file will be checked into git rather than being added to the annex. Previously, git annex add skipped over such files; this new behavior is more useful in direct mode.
2015-04-08 16:14:23 -04:00
Joey Hess
279fa44cd0
fromkey, registerurl: When reading from stdin, allow the filename and url, respectively, to contain whitespace.
2015-04-07 00:58:51 -04:00
Joey Hess
62ed5409c6
expire --no-act
2015-04-05 15:02:55 -04:00
Joey Hess
e3ea9d21fc
info remove: show trust level
2015-04-05 13:51:01 -04:00
Joey Hess
9445556c97
rethought distributed fsck; instead add activity.log and expire command
...
This is much more space efficient!
2015-04-05 12:50:02 -04:00
Joey Hess
1c91024978
rename bothHandles -> ioHandles
2015-04-03 15:35:18 -04:00
Jean Jordaan
500cf3e37e
Steer towards deduplication
2015-04-03 14:27:34 +07:00
