Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 'dag' forall namespace import prefixes of merkledag #1983

Closed
wants to merge 84 commits into from

Conversation

rht
Copy link
Contributor

@rht rht commented Nov 20, 2015

Oldest code uses 'merkledag'. Slightly older code uses 'mdag'. Most recent code uses 'dag'.

@rht
Copy link
Contributor Author

rht commented Nov 20, 2015

Also a small issue (yet naming is one out of two hard problems in cs?), 'n','nd','node' are used interchangeably for core.IpfsNode and dag.Node (not to mention that both use of "node"). Would it be more grep-able if the former's shorthand is changed to 'in'/'inode'?

@whyrusleeping
Copy link
Member

i don't like the connotation of calling the core.IpfsNode an inode, i agree we should be consistent though. maybe dag.Node -> dn, and core.IpfsNode -> node?

@whyrusleeping
Copy link
Member

this PR LGTM, mind rebasing on top of latest 0.4.0?

@rht
Copy link
Contributor Author

rht commented Nov 20, 2015

Rebased.

Both 'in' and 'inode' already have connotation that may confuse things, it definitely should be something else, it's just that I haven't come up a shorthand yet.

@whyrusleeping
Copy link
Member

@rht i'm 99% certain the circle sharness test failures have nothing to do with this PR. but do you have any idea what might be causing them?

@ghost
Copy link

ghost commented Nov 21, 2015

Travis looks similar, doesn't it? Some of these look hairy. I'm also seeing the same errors in #1987.

@ghost
Copy link

ghost commented Nov 21, 2015

ctrl+f "not ok"

@rht
Copy link
Contributor Author

rht commented Nov 21, 2015

The stalled os x build (errs not being output-ed?) might have an explanation in the circle-ci errs.

@jbenet
Copy link
Member

jbenet commented Nov 21, 2015

could it be something in master?

@jbenet
Copy link
Member

jbenet commented Nov 21, 2015

@rht was it the watermark repo gc? i recall some pr recently being the first. i dont think it's travis-ci here.

@jbenet
Copy link
Member

jbenet commented Nov 21, 2015

certainly in this run it was: https://travis-ci.org/ipfs/go-ipfs/jobs/92377814#L5059-L5060

@rht
Copy link
Contributor Author

rht commented Nov 22, 2015

could it be something in master?

Yes but there is less merge conflict in 0.4.0.

Also, here is another naming clash that might cause confusion commands.Context and context.Context.

@rht rht added the RFCR label Nov 25, 2015
@jbenet
Copy link
Member

jbenet commented Dec 1, 2015

In general, this PR LGTM.

i think we should still solve the random failures on master + rebase dev0.4.0 on top of that, and this on top of dev0.4.0.

at some point we let through something that randomly breaks and now we're paying the price. :( maybe someone could try bisecting it?

@rht
Copy link
Contributor Author

rht commented Dec 16, 2015

Rebased. In this case, test fails are orthogonal to the possible errs caused by import errs.

@ghost ghost added the topic/merkledag Topic merkledag label Dec 22, 2015
License: MIT
Signed-off-by: Lars Gierth <[email protected]>
atomgardner and others added 22 commits January 23, 2016 17:17
License: MIT
Signed-off-by: Thomas Gardner <[email protected]>
Because this requirement is not listed anywhere, but was mentioned in ipfs#2202 (comment).

License: MIT
Signed-off-by: Richard Littauer <[email protected]>
Added squash note to contribute.md
trivial: fix `ipfs update` error message
Gateway: add support for HTTP OPTIONS request type
License: MIT
Signed-off-by: Richard Littauer <[email protected]>
See ipfs#2180 (comment)

License: MIT
Signed-off-by: Richard Littauer <[email protected]>
This allows a path (/ipfs/foo/bar) to be separated between its head
(/ipfs/foo) and its tail (bar).

License: MIT
Signed-off-by: Stephen Whitmore <[email protected]>
This is done by skipping the step of resolving the final segment in the
path to a DAG node; instead preferring to look at the second-to-last
segmenet's links.

License: MIT
Signed-off-by: Stephen Whitmore <[email protected]>
This fixes ipfs#1083, ipfs#2000.

N.B. The JSON package developers see no trailing newline as a feature;
it allows marshalled JSON to be embedded inside more JSON.[0]

--
[0] https://golang.org/pkg/encoding/json/

License: MIT
Signed-off-by: Thomas Gardner <[email protected]>
Resolve paths in 'pin rm' /wo network lookup
fix ipfs#1083: Append a newline to `ipfs id` output.
License: MIT
Signed-off-by: Jeromy <[email protected]>
License: MIT
Signed-off-by: Thomas Gardner <[email protected]>
Makefile: add PHONY targets and a help message
Capitalized beginning of line messages, added periods
License: MIT
Signed-off-by: rht <[email protected]>
License: MIT
Signed-off-by: Richard Littauer <[email protected]>
License: MIT
Signed-off-by: Jeromy <[email protected]>
s/retreiving/retrieving/g
@whyrusleeping
Copy link
Member

@rht mind redoing this on latest master? would be good to have a bit of consistency there

@rht
Copy link
Contributor Author

rht commented Jan 30, 2016

This could have been merged before dev0.4.0 was merged into master.

@GitCop
Copy link

GitCop commented Jan 30, 2016

There were the following issues with your Pull Request

  • Commit: c242660
    • Invalid signoff. Commit message must end with
      License: MIT
      Signed-off-by: .* <.*>
  • Commit: 38a600b
    • Invalid signoff. Commit message must end with
      License: MIT
      Signed-off-by: .* <.*>

We ask for a few features in the commit message for Open Source licensing hygiene and commit message clarity.
git commit --amend can often help you quickly improve the commit message.
Guidelines and a script are available to help in the long run.
Your feedback on GitCop is welcome on this issue.


This message was auto-generated by https://gitcop.com

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/in-progress In progress topic/merkledag Topic merkledag
Projects
None yet
Development

Successfully merging this pull request may close these issues.