Commit Graph

5790 Commits

Author SHA1 Message Date
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
Jeromy
1f4d3300b0 wire contexts into bitswap requests more deeply
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-27 14:01:54 -07:00
michael
46bcdce15d commands: repo fsck (#2597)
* Adds repo fsck subcommand

Fixes #2457

License: MIT
Signed-off-by: Mike Pfister <pfista@gmail.com>

* Checks for error on file deletion

License: MIT
Signed-off-by: Mike Pfister <pfista@gmail.com>

* Checks if node is online

License: MIT
Signed-off-by: Mike Pfister <pfista@gmail.com>

* Update error checking

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Prevents command from running while daemon is running

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Add newline to command output message

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* removing superfluous error

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Adds sharness test for repo fsck command

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Ignore warning if file doesn't exist

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Updating message output

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* adding debug statements

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* update and add fsck sharness tests

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* updating comments

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Use printf in test

Using printf prevents a newline from being printed to the api test file. When
the newline was present, multiaddr threw errors  trying to parse the api address
to an integer since the newline character was present.

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* updating tests

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* removing commented code

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>
2016-04-27 13:28:53 -07:00
Jeromy
01fd30069f bump test/Dockerfile go version to 1.5.4
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-27 13:11:39 -07:00
Jeromy Johnson
973266ae11 re-add dep needed for windows builds (#2611)
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-27 11:49:15 -07:00
Stephen Whitmore
5d25fc1f16 unix-friendly output for 'ipfs dht' commands (#2560)
* Cleans up 'ipfs dht findpeer' output

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

* Adds more docs for 'ipfs dht put'.

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

* Write pretty peer ids for ipfs dht put.

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

* Writes pretty peer ids for ipfs dht query.

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

* Suppresses unrecognized event type for FinalPeer.

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

* Improves helptext on dht commands.

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

* Adds 'ipfs dht findpeer' sharness test.

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

* Adds sharness tests for remaining DHT commands.

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

* Uses bash tests rather than 'test' command.

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

* Removes commented code.

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

* Removes unneeded init_ipfs.

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

* Tweaks iptb setup.

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

* Tweaks wording on dht 'put' and 'get'.

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

* Removes extraneous ).

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

* Removes apostrophe.

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

* Tests the expected peer addresses.

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

* Gets peer id using iptb.

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

* Checks explicitly for common put/findprovs peers.

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

* Sorts expected/actual findpeer results.

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

* Fix disconnect argument description

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

* Fixes sort order in t0170-dht.sh.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-27 09:31:06 -07:00
Christian Couder
6083f61d05 Dockerfile: use go version 1.5.4-r0
This error recently appeared when building the Dockerfile:

ERROR: unsatisfiable constraints:
  go-1.5.4-r0:
    breaks: world[go=1.5.3-r0]

It looks that now upstream requires go 1.5.4-r0 not 1.5.3-r0.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-27 07:52:05 +02:00
Jeromy Johnson
f4a18aa5e6 Merge pull request #2604 from ipfs/lgierth-patch-1
changelog: mention Swarm.AddrFilters fix in v0.4.1
2016-04-26 17:21:40 -07:00
Jeromy Johnson
8350a94544 Merge pull request #2519 from thomas-gardner/commands
commands/cli: fix parsing of incorrect permutations
2016-04-26 17:20:56 -07:00
Jeromy Johnson
7fe81dbef0 Merge pull request #2606 from ipfs/feature/diag-cmds-grammar
Fixed up comments for `diag cmds`
2016-04-26 17:20:49 -07:00
Jeromy Johnson
1676d0ca52 Merge pull request #2582 from ipfs/feature/refs-defaults
Added default values to refs
2016-04-26 17:11:11 -07:00
Richard Littauer
53c05ffd74 Added default values to refs
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-26 19:34:36 -04:00
Richard Littauer
4b4c81a37d Fixed up comments for diag cmds
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-26 19:31:42 -04:00
Lars Gierth
dad85ff387 changelog: mention Swarm.AddrFilters fix in v0.4.1
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-25 18:25:57 -04:00
Jeromy
9e3b5c3dfe
ipfs version 0.4.1
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-25 12:08:20 -07:00
Jeromy
a2f52946de add changelog for v0.4.1
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-25 11:26:18 -07:00
Jeromy Johnson
cb419254a5 Merge pull request #2595 from ipfs/feature/disconnect-argument
Fix disconnect argument description
2016-04-20 13:39:30 -07:00