git-annex.git
9 years agoquestion
Joey Hess [Mon, 20 Feb 2017 20:14:43 +0000 (16:14 -0400)]
question

9 years agomake curl show http errors to stderr
Joey Hess [Mon, 20 Feb 2017 19:59:55 +0000 (15:59 -0400)]
make curl show http errors to stderr

* Run curl with -S, so HTTP errors are displayed, even when
  it's otherwise silent.
* When downloading in --json or --quiet mode, use curl in preference
  to wget, since curl is able to display only errors to stderr, unlike
  wget.

This does mean that downloadQuiet is only silent on stdout, not necessarily
on stderr, which affects a couple other calls of it. For example,
downloading the .git/config of a http remote may show an error message now,
perhaps with slightly suboptimal formatting due to other output.

9 years agoupdate
Joey Hess [Mon, 20 Feb 2017 19:44:43 +0000 (15:44 -0400)]
update

9 years agoimprove layout
Joey Hess [Mon, 20 Feb 2017 19:44:14 +0000 (15:44 -0400)]
improve layout

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 20 Feb 2017 19:25:57 +0000 (15:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoRun wget with -nv instead of -q, so it will display HTTP errors.
Joey Hess [Mon, 20 Feb 2017 19:14:56 +0000 (15:14 -0400)]
Run wget with -nv instead of -q, so it will display HTTP errors.

This adds one extra line of output when a download is successful,
after the progress bar. I don't much like that, but wget does not provide a
way to show HTTP errors without it.

9 years agoremoved
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3 [Mon, 20 Feb 2017 19:07:55 +0000 (19:07 +0000)]
removed

9 years agoAdded a comment
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3 [Mon, 20 Feb 2017 19:07:22 +0000 (19:07 +0000)]
Added a comment

9 years agoAdded a comment
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3 [Mon, 20 Feb 2017 19:06:58 +0000 (19:06 +0000)]
Added a comment

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 18:49:03 +0000 (14:49 -0400)]
comment

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 18:37:59 +0000 (14:37 -0400)]
comment

9 years agoAdded a comment: the problem files
andrew [Mon, 20 Feb 2017 18:11:03 +0000 (18:11 +0000)]
Added a comment: the problem files

9 years agoadjust: Fix behavior when used in a repository that contains submodules.
Joey Hess [Mon, 20 Feb 2017 17:44:55 +0000 (13:44 -0400)]
adjust: Fix behavior when used in a repository that contains submodules.

Also fixed the LsFiles parser to not assume its output has a fixed width
type field.

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 20 Feb 2017 17:11:19 +0000 (13:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 17:10:48 +0000 (13:10 -0400)]
comment

9 years agomention GIT_SSH_COMMAND
Joey Hess [Mon, 20 Feb 2017 16:58:08 +0000 (12:58 -0400)]
mention GIT_SSH_COMMAND

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 16:55:58 +0000 (12:55 -0400)]
comment

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 16:49:16 +0000 (12:49 -0400)]
comment

9 years agoremove
Joey Hess [Mon, 20 Feb 2017 16:24:15 +0000 (12:24 -0400)]
remove

I've seen this thing, whatever it is, mentioned in spam links before,
so even if it's valid for some OS (probably not the one being asked
about), it's verboten here.

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 16:23:22 +0000 (12:23 -0400)]
comment

9 years agogit-annex.cabal: Make crypto-api a dependency even when built w/o webapp and test...
Joey Hess [Mon, 20 Feb 2017 16:21:35 +0000 (12:21 -0400)]
git-annex.cabal: Make crypto-api a dependency even when built w/o webapp and test suite.

The p2p code made it always be needed.

This commit was sponsored by Anthony DeRobertis on Patreon.

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 16:17:09 +0000 (12:17 -0400)]
comment

9 years agocomment
Joey Hess [Mon, 20 Feb 2017 16:07:20 +0000 (12:07 -0400)]
comment

9 years ago(no commit message)
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3 [Mon, 20 Feb 2017 08:12:10 +0000 (08:12 +0000)]

9 years ago(no commit message)
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3 [Mon, 20 Feb 2017 07:58:33 +0000 (07:58 +0000)]

9 years agoAdded a comment
openmedi [Sun, 19 Feb 2017 22:03:26 +0000 (22:03 +0000)]
Added a comment

9 years ago(no commit message)
m@2be305d83b52202ec4364229a836f463a6701336 [Sun, 19 Feb 2017 19:03:24 +0000 (19:03 +0000)]

9 years ago(no commit message)
mhauru [Sun, 19 Feb 2017 18:48:59 +0000 (18:48 +0000)]

9 years agoAdded a comment
openmedi [Sun, 19 Feb 2017 15:27:08 +0000 (15:27 +0000)]
Added a comment

9 years ago(no commit message)
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3 [Sat, 18 Feb 2017 16:28:45 +0000 (16:28 +0000)]

9 years ago(no commit message)
openmedi [Sat, 18 Feb 2017 13:42:45 +0000 (13:42 +0000)]

9 years ago(no commit message)
openmedi [Sat, 18 Feb 2017 13:41:57 +0000 (13:41 +0000)]

9 years agolinkify
Joey Hess [Fri, 17 Feb 2017 19:58:32 +0000 (15:58 -0400)]
linkify

9 years agodevblog
Joey Hess [Fri, 17 Feb 2017 19:56:38 +0000 (15:56 -0400)]
devblog

9 years agodocumentation updates for new receive.denyCurrentBranch=updateInstead support
Joey Hess [Fri, 17 Feb 2017 19:43:16 +0000 (15:43 -0400)]
documentation updates for new receive.denyCurrentBranch=updateInstead support

This commit was sponsored by andrea rota.

9 years agosync hack to make updateInstead work on eg FAT
Joey Hess [Fri, 17 Feb 2017 19:21:39 +0000 (15:21 -0400)]
sync hack to make updateInstead work on eg FAT

sync: When syncing with a local repository located on a crippled
filesystem, run the post-receive hook there, since it wouldn't get run
otherwise. This makes pushing to repos on FAT-formatted removable drives
update them when receive.denyCurrentBranch=updateInstead.

Made Remote.Git export onLocal, which was cleaned up to not have so many
caveats about its use.

This commit was sponsored by Jeff Goeke-Smith on Patreon.

9 years agohave onLocal stop any coprocesses, not only cat-file
Joey Hess [Fri, 17 Feb 2017 18:30:18 +0000 (14:30 -0400)]
have onLocal stop any coprocesses, not only cat-file

I have not seen any other coprocesses being started, but let's avoid
problems if any do for whatever reason.

9 years agopost-recive hook to make updateInstead work in direct mode and adjusted branches
Joey Hess [Fri, 17 Feb 2017 18:04:43 +0000 (14:04 -0400)]
post-recive hook to make updateInstead work in direct mode and adjusted branches

* Added post-recieve hook, which makes updateInstead work with direct
  mode and adjusted branches.
* init: Set up the post-receive hook.

This commit was sponsored by Fernando Jimenez on Patreon.

9 years agomake git-annex:git-annex push quiet again
Joey Hess [Fri, 17 Feb 2017 18:00:01 +0000 (14:00 -0400)]
make git-annex:git-annex push quiet again

Recent changes had a side effect of displaying errors in the fairly
common case when this push fails. Since the synced/git-annex push
is always forced, those errors are noise, so hide again.

This means 3 separate pushes are done now, where before it only made 2.
A bit more expensive, but ssh connection caching eliminates most of
the costs.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.

9 years agothoughts
Joey Hess [Fri, 17 Feb 2017 16:57:55 +0000 (12:57 -0400)]
thoughts

9 years agocomment
Joey Hess [Fri, 17 Feb 2017 16:36:23 +0000 (12:36 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 17 Feb 2017 16:31:47 +0000 (12:31 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoinitial whining
yarikoptic [Fri, 17 Feb 2017 15:30:32 +0000 (15:30 +0000)]
initial whining

9 years agoAdded a comment
lasitus [Fri, 17 Feb 2017 03:23:46 +0000 (03:23 +0000)]
Added a comment

9 years ago(no commit message)
yarikoptic [Fri, 17 Feb 2017 01:57:11 +0000 (01:57 +0000)]

9 years ago(no commit message)
binx [Fri, 17 Feb 2017 00:01:12 +0000 (00:01 +0000)]

9 years agocleanup
Joey Hess [Thu, 16 Feb 2017 20:00:18 +0000 (16:00 -0400)]
cleanup

9 years agoremoved
JohnKozak [Thu, 16 Feb 2017 18:45:41 +0000 (18:45 +0000)]
removed

9 years agoAdded a comment
JohnKozak [Thu, 16 Feb 2017 18:44:36 +0000 (18:44 +0000)]
Added a comment

9 years agoremove crud from transcript
JohnKozak [Thu, 16 Feb 2017 17:59:54 +0000 (17:59 +0000)]
remove crud from transcript

9 years agomake query commands not output extraneous messages
Joey Hess [Thu, 16 Feb 2017 17:24:16 +0000 (13:24 -0400)]
make query commands not output extraneous messages

config group groupwanted numcopies schedule wanted required:  Avoid
displaying extraneous messages about repository auto-init, git-annex branch
merging, etc, when being used to get information.

9 years agoAdded a comment
yarikoptic [Thu, 16 Feb 2017 15:54:18 +0000 (15:54 +0000)]
Added a comment

9 years agoAdded a comment
CandyAngel [Thu, 16 Feb 2017 14:10:56 +0000 (14:10 +0000)]
Added a comment

9 years ago(no commit message)
JohnKozak [Thu, 16 Feb 2017 13:56:30 +0000 (13:56 +0000)]

9 years agoAdded a comment
andy [Thu, 16 Feb 2017 06:34:50 +0000 (06:34 +0000)]
Added a comment

9 years ago(no commit message)
yarikoptic [Thu, 16 Feb 2017 03:49:46 +0000 (03:49 +0000)]

9 years agodevblog
Joey Hess [Wed, 15 Feb 2017 20:44:10 +0000 (16:44 -0400)]
devblog

9 years agosync: Improve integration with receive.denyCurrentBranch=updateInstead
Joey Hess [Wed, 15 Feb 2017 20:13:30 +0000 (16:13 -0400)]
sync: Improve integration with receive.denyCurrentBranch=updateInstead

By displaying error messages from the remote then it fails to update
its checked out branch.

Error messages in the default receive.denyCurrentBranch are still
suppressed, which matches user expectations.

This commit was sponsored by Nick Daly on Patreon.

9 years agosimpler more generic processTranscript'
Joey Hess [Wed, 15 Feb 2017 20:00:59 +0000 (16:00 -0400)]
simpler more generic processTranscript'

This allows using functions that generate CreateProcess and passing the
result to processTranscript', which is more flexible, and also simpler
than the old interface.

This commit was sponsored by Riku Voipio.

9 years agoRun ssh with -n whenever input is not being piped into it
Joey Hess [Wed, 15 Feb 2017 19:08:46 +0000 (15:08 -0400)]
Run ssh with -n whenever input is not being piped into it

... to avoid it consuming stdin that it shouldn't.

This fixes git-annex-checkpresentkey --batch remote, which didn't output
results for all keys passed into it.

Other git-annex commands that communicate with a remote over ssh may also
have been consuming stdin that they shouldn't have, which could have
impacted using them in eg, shell scripts. For example, a shell script
reading files from stdin and passing them to git annex drop would be
impacted by this bug, whenever git annex drop ran git-annex-shell
checkpresent, it would consume part/all of the stdin that the shell script
was supposed to consume.

Fixed by adding a ConsumeStdin parameter to Annex.Ssh.sshOptions, which
is used throughout git-annex to run ssh (in order for ssh connection
caching to work). Every call site was checked to see if it used
CreatePipe for stdin, and if not was marked NoConsumeStdin.

9 years agoadd the new armel-ancient build
Joey Hess [Wed, 15 Feb 2017 18:43:19 +0000 (14:43 -0400)]
add the new armel-ancient build

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 15 Feb 2017 17:56:01 +0000 (13:56 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoforgot to compile last commit; fix mistakes
Joey Hess [Wed, 15 Feb 2017 17:55:06 +0000 (13:55 -0400)]
forgot to compile last commit; fix mistakes

9 years agoAdded a comment
lasitus [Wed, 15 Feb 2017 16:01:39 +0000 (16:01 +0000)]
Added a comment

9 years ago(no commit message)
CandyAngel [Wed, 15 Feb 2017 11:13:25 +0000 (11:13 +0000)]

9 years agoAdded a comment
lasitus [Wed, 15 Feb 2017 02:17:25 +0000 (02:17 +0000)]
Added a comment

9 years agoremoved
lasitus [Wed, 15 Feb 2017 02:14:05 +0000 (02:14 +0000)]
removed

9 years agoAdded a comment
lasitus [Wed, 15 Feb 2017 02:13:25 +0000 (02:13 +0000)]
Added a comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 14 Feb 2017 21:42:25 +0000 (17:42 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agothoughts
Joey Hess [Tue, 14 Feb 2017 21:39:37 +0000 (17:39 -0400)]
thoughts

9 years agoAdded a comment
db48x [Tue, 14 Feb 2017 21:10:13 +0000 (21:10 +0000)]
Added a comment

9 years agoAdded a comment
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e [Tue, 14 Feb 2017 20:21:41 +0000 (20:21 +0000)]
Added a comment

9 years agosync, merge: Fail when the current branch has no commits yet, instead of not merging...
Joey Hess [Tue, 14 Feb 2017 19:58:05 +0000 (15:58 -0400)]
sync, merge: Fail when the current branch has no commits yet, instead of not merging in anything from remotes and appearing to succeed.

At first I wanted to make it go ahead and merge into the newborn branch,
so made it use Git.Branch.currentUnsafe to get the current branch. But that
failed:

fatal: ambiguous argument 'refs/heads/master..refs/heads/synced/master':
unknown revision or path not in the working tree.

A whole nother code path to handle merging into newborn branches seemed
excessive, so went with displaying a warning and propigating failure
status.

This commit was sponsored by Brock Spratlen on Patreon.

9 years agoAdded a comment
lasitus [Tue, 14 Feb 2017 19:08:38 +0000 (19:08 +0000)]
Added a comment

9 years agoadd news item for git-annex 6.20170214
Joey Hess [Tue, 14 Feb 2017 18:56:57 +0000 (14:56 -0400)]
add news item for git-annex 6.20170214

9 years agoreleasing package git-annex version 6.20170214
Joey Hess [Tue, 14 Feb 2017 18:56:11 +0000 (14:56 -0400)]
releasing package git-annex version 6.20170214

9 years agocomment
Joey Hess [Tue, 14 Feb 2017 18:54:53 +0000 (14:54 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 14 Feb 2017 18:49:23 +0000 (14:49 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoAdded a comment
lasitus [Tue, 14 Feb 2017 18:46:22 +0000 (18:46 +0000)]
Added a comment

9 years agoresponse
Joey Hess [Tue, 14 Feb 2017 18:21:58 +0000 (14:21 -0400)]
response

9 years ago(no commit message)
http://xgm.de/oid/ [Tue, 14 Feb 2017 18:14:24 +0000 (18:14 +0000)]

9 years agoAdded a comment
http://xgm.de/oid/ [Tue, 14 Feb 2017 18:03:27 +0000 (18:03 +0000)]
Added a comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 14 Feb 2017 15:45:38 +0000 (11:45 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoavoid OSX build failure when there are no rpaths to remove
Joey Hess [Tue, 14 Feb 2017 15:44:52 +0000 (11:44 -0400)]
avoid OSX build failure when there are no rpaths to remove

9 years agoremoved
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e [Tue, 14 Feb 2017 00:05:09 +0000 (00:05 +0000)]
removed

9 years agoAdded a comment: Retrieving initremote parameters for new user
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e [Tue, 14 Feb 2017 00:04:50 +0000 (00:04 +0000)]
Added a comment: Retrieving initremote parameters for new user

9 years agoAdded a comment: Retrieving initremote parameters for new user
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e [Tue, 14 Feb 2017 00:03:35 +0000 (00:03 +0000)]
Added a comment: Retrieving initremote parameters for new user

9 years agodevblog
Joey Hess [Mon, 13 Feb 2017 21:42:03 +0000 (17:42 -0400)]
devblog

9 years agoWork around sqlite's incorrect handling of umask when creating databases.
Joey Hess [Mon, 13 Feb 2017 21:30:28 +0000 (17:30 -0400)]
Work around sqlite's incorrect handling of umask when creating databases.

Refactored some common code into initDb.

This only deals with the problem when creating new databases. If a repo
got bad permissions into it, it's up to the user to deal with it.

This commit was sponsored by Ole-Morten Duesund on Patreon.

9 years agoresponse
Joey Hess [Mon, 13 Feb 2017 20:19:39 +0000 (16:19 -0400)]
response

9 years agocomment
Joey Hess [Mon, 13 Feb 2017 20:11:58 +0000 (16:11 -0400)]
comment

9 years agoremove recent addition of receive.denyNonFastForwards to walkthrough
Joey Hess [Mon, 13 Feb 2017 20:02:53 +0000 (16:02 -0400)]
remove recent addition of receive.denyNonFastForwards to walkthrough

That is a dangerous setting, and not needed.

I tried the walkthrough as it was without it, and syncing in the USB
remote worked ok. There was a problem merging from origin/master, since
that branch didn't exist yet, but that didn't prevent sync from working
at all.

To avoid even that problem, reordered the walkthrough, so files get
committed to the repo before the remote gets set up.

This commit was sponsored by Ole-Morten Duesund on Patreon.

9 years agofix commit id
Joey Hess [Mon, 13 Feb 2017 19:55:32 +0000 (15:55 -0400)]
fix commit id

9 years agoinclude problem PairData in error message
Joey Hess [Mon, 13 Feb 2017 19:51:13 +0000 (15:51 -0400)]
include problem PairData in error message

Users occasionally report this error firing, and I can't see why,
so include the rejected PairData in the error message.

This is safe even if it contains evil escape characters, because showing
it displays them in escaped form.

This commit was sponsored by Bruno BEAUFILS on Patreon.

9 years agocomment
Joey Hess [Mon, 13 Feb 2017 19:39:46 +0000 (15:39 -0400)]
comment

9 years agoS3: Fix check of uuid file stored in bucket, which was not working.
Joey Hess [Mon, 13 Feb 2017 19:35:24 +0000 (15:35 -0400)]
S3: Fix check of uuid file stored in bucket, which was not working.

The check was broken in two ways.. First, nowhere did it error out when
checkUUIDFile found a different UUID already in the file. Instead,
it overwrote the uuid file.

And, checkUUIDFile's implementation was for some reason always failing with
a ConnectionClosed exception. Apparently something to do with using two
different runResourceT's and a response getting GCed inbetween. I'm pretty
sure that used to work, but changed to a more obviously correct
implementation.

This commit was sponsored by Peter Hogg on Patreon.

9 years agocomment
Joey Hess [Mon, 13 Feb 2017 18:53:55 +0000 (14:53 -0400)]
comment

9 years agocomment
Joey Hess [Mon, 13 Feb 2017 18:43:31 +0000 (14:43 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 13 Feb 2017 16:46:15 +0000 (12:46 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agofix OSX build
Joey Hess [Mon, 13 Feb 2017 16:41:28 +0000 (12:41 -0400)]
fix OSX build