Commit Graph

5806 Commits

Author SHA1 Message Date
Christian Couder
e8bc591fe5 t0170: remove useless 'echo' and add '&&'
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-05-07 09:38:44 +02:00
Christian Couder
01bf209c31 t0170: put startup_cluster() call outside test_expect_success
startup_cluster() already contains some test_expect_success, so
it should not be inside one.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-05-07 09:37:04 +02:00
Jeromy Johnson
f4a5bf504b Merge pull request #2637 from ipfs/feature/2636-marshal-log-ls
Marshal log ls better
2016-05-06 19:42:37 -07:00
Richard Littauer
23108aaa5d Marshal log ls better
This uses a stringList to output each log command as an item in an array in an object called Strings, instead of using the MessageOutput func.

This closes #2636.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-05-06 19:31:57 -04:00
Jeromy Johnson
d30966a374 Merge pull request #2633 from ipfs-filestore/blocks-interface
Make blocks.Block an interface.
2016-05-05 15:42:34 -07:00
Kevin Atkinson
b84cbec2b6 Make blocks.Block an interface.
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
2016-05-05 18:02:11 -04:00
Jeromy Johnson
fbf745fbcd Merge pull request #2632 from hsanjuan/issue_2434
"ipfs log ls" command
2016-05-05 12:17:37 -07:00
Jeromy Johnson
2862e58a6e Merge pull request #2581 from RealImage/default-config
Implements repository initialization with default config
2016-05-05 10:10:59 -07:00
Siva Chandran
6989686b8b Implements repository initialization with default config
Modified init command to receive default configuration from stdin. The changes enable us to use existing key-pair, datastore configuration while initializing new ipfs node.

License: MIT
Signed-off-by: Sivachandran <sivachandran.p@gmail.com>
2016-05-05 14:44:15 +05:30
Hector Sanjuan
a40e6d5509 Make sure uuid is vendored
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2016-05-05 01:23:54 +02:00
Hector Sanjuan
8e460d3fed Restore go-log.Uuid() calls as loggables.Uuid() calls
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2016-05-05 00:55:04 +02:00
Hector Sanjuan
fba1448556 Add "ipfs log ls" command
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2016-05-04 23:33:43 +02:00
Hector Sanjuan
57b494a70c Update go-log to 1.1.0 and fix calls to go-log.Uuid
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2016-05-04 23:17:21 +02:00
Jeromy Johnson
a01d96aa1b Merge pull request #2631 from ipfs/update-gx-version
Makefile: update gx and gx-go versions
2016-05-04 12:22:22 -07:00
Christian Couder
f24aa85c8e Makefile: add variables for min versions of go, gx and gx-go
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-05-04 20:25:17 +02:00
Christian Couder
c777ac05da Makefile: update gx and gx-go versions
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-05-04 07:04:40 +02:00
Jeromy Johnson
f1df72b1de Merge pull request #2545 from chriscool/use-gx-for-iptb
Use gx for iptb
2016-05-03 15:15:31 -07:00
Jeromy Johnson
d597f4b89d Merge pull request #2627 from erde74/master
add NetBSD support
2016-05-02 13:08:56 -07:00
Jeromy
1770badbb3 newer iptb package with correct deps
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-05-02 12:40:10 -07:00
SH
f3b0860c79 Merge remote-tracking branch 'upstream/master' 2016-04-30 21:30:44 +02:00
Christian Couder
5b17654211 test/Makefile: use gx deps find for gx dependencies
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 08:52:19 +02:00
Christian Couder
728e74ceef package.json: import go-multihash
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 08:39:38 +02:00
Christian Couder
13354f31dc test/Makefile: add global-deps target
We need to make sure that go, gx, gx-go are properly installed.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:25:10 +02:00
Christian Couder
d4e7287980 sharness/Makefile: check global dependencies
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:17:36 +02:00
Christian Couder
857fce168a Replace existing iptb dependencies with the gx one
Now that iptb has been added as a gx dependency, we can replace
existing dependencies with the one from gx.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:17:36 +02:00
Christian Couder
9b2147815c package: use gx to import iptb
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:13:45 +02:00
Jeromy Johnson
de6c65ba07 Merge pull request #2628 from ipfs/feature/note
Capitalized `NOTE`, first letter of following word
2016-04-29 15:31:26 -07:00
Richard Littauer
f60ae0a1b9 Capitalized NOTE, first letter of following word
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-29 16:57:19 -04:00
SH
2af48e6804 add NetBSD support
License: MIT
Signed-off-by: Stefan Hertenberger <github@hertenberger.bayern>
2016-04-29 22:49:54 +02:00
Jeromy Johnson
15c1eba264 Merge pull request #2625 from ipfs/docs/add-debug-guidelines
Added a debug-guidelines doc
2016-04-29 13:48:10 -07:00
Jeromy Johnson
90ec6a34d9 Merge pull request #2624 from ipfs/docs/dht-put
Capitalized `a`, lowercased `not`
2016-04-29 13:47:36 -07:00
Jeromy Johnson
b1d1f0a44b Merge pull request #2437 from ipfs/fix/bitswap-ctx-wire
wire contexts into bitswap requests more deeply
2016-04-29 13:04:01 -07:00
Richard Littauer
0e9224f671 Added a debug-guidelines doc
Stolen from this comment https://github.com/ipfs/go-ipfs/issues/2594#issuecomment-212506980

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-29 14:05:07 -04:00
Richard Littauer
e375c8cbf7 Capitalized a, lowercased not
A should be capitalised, as it is a new clause; `not` should not be capitalized, as there is no value judgement (it is a statement), and the emphasis is offputting without adding any technical backing. I just do not think it is necessaary.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-29 13:34:17 -04:00
Jeromy
01d1b69da2 fix doubleGet issue caused by hasblock not announcing
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-28 16:57:41 -07:00
Jeromy Johnson
fed6212d51 Merge pull request #2622 from ipfs/feature/add-period
Added a period to repo fsck
2016-04-28 14:09:56 -07:00
Stephen Whitmore
0a45ada4ed CLI: discoverability and consistency (#2542)
* reduces help indent from 4 to 2 spaces

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* reduces horz/vert space taken by "ipfs" cmd

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* show subcommands on shorthelp

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Drops colons at the end of cmd headings.

This makes command headings consistent with the output of 'ipfs', which
does not include colons.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* more consistent output between short-/long-help

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Puts DESCRIPTION before SUBCOMMANDS.

Users likely want to understand what a command does before worrying
about its subcommands.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Keeps ipfs cmd from outputting its subcmds twice.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "file"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes extra whitespace from longhelp

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Consistent spacing whether SUBCMDS or not.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant SUBCMD output from ipfs object.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "name"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Newline after Description only if it exists.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "bootstrap"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "swarm"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes trailing newline in ping help.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Prints shorthelp on parse error.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* tiny comment fixes

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* updates README usage

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Don't include extra whitespace if no .MoreHelp

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* description improvements

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Hides the obscure 'file' subcommand.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Splits 'ipfs daemon' into Short and Long help.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "config"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Wraps lines to keep from going over 80.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* specify repo separately

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* s/structure/hierarchy

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* missing .

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes trailing colon from 'usage' test.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Updates sharness test error messages.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes trailing colon from 'usage' test.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Updates add-symlink to use /bin/sh.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes "hierarchy".

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Updates "ipfs ping" synopsis.

* Updates t0040 with latest wording.

* Removes unnecessary daemon setup.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-28 14:08:32 -07:00
Richard Littauer
ae235caaec Added a period to repo fsck
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-28 17:07:46 -04:00
Jeromy Johnson
1b50a9d2a5 Merge pull request #2479 from ipfs/feat/no-init-f
remove init -f option, its bad
2016-04-28 13:51:16 -07:00
Jeromy Johnson
e124ee23a3 Merge pull request #2614 from djdv/windotdir
Fix dot path parsing on Windows
2016-04-28 13:22:19 -07:00
Dominic Della Valle
af6e7ad9ea Fix dot path parsing on Windows
License: MIT
Signed-off-by: Dominic Della Valle <ddvpublic@gmail.com>
2016-04-28 15:03:41 -04:00
Jeromy Johnson
c067fb9e83 Merge pull request #2618 from ipfs/dockerfile-logging
docker: allow IPFS_LOGGING to be passed
2016-04-28 11:58:55 -07:00
Lars Gierth
e933a57976 docker: allow IPFS_LOGGING to be passed
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-28 20:57:02 +02:00
Jeromy
c2ed8ad48f remove init -f option, its bad
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-28 10:55:12 -07:00
Jeromy Johnson
60f1ba1f81 Merge pull request #2593 from kevina/refactor-makefile
Refactor Makefile.
2016-04-28 10:33:01 -07:00
Kevin Atkinson
31421aeace Refactor Makefile.
Move the go commands that should run under cmd/ipfs in the Makefile in
cmd/ipfs rather than doing a "cd cmd/ipfs && go ..." in the root
Makefile.

The "cd cmd/ipfs && go ..." lines causes problems with GNU Emacs's
compilation mode.  With the current setup Emacs is unable to jump to
the location of the error outputted by go compiler as it can not find
the source file.  The problem is that the embedded "cd" command causes
Emacs's compilation mode to lose track of the current directory and
thus attempts to look for the source file in the wrong directory.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
2016-04-28 01:28:42 -04:00
Jeromy
a5782efb11 add test for double getting a block
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-27 15:16:37 -07:00
Jeromy Johnson
021da128ce Merge pull request #2612 from ipfs/deps/libp2p/utp
update libp2p with utp dep
2016-04-27 15:09:27 -07:00
Jeromy
cffec77cea update libp2p with utp dep
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-27 14:10:54 -07:00
Jeromy Johnson
49ea0f835e Merge pull request #2608 from ipfs/fix-docker-build
Dockerfile: use go version 1.5.4-r0
2016-04-27 14:08:44 -07:00