Commit Graph

426 Commits

Author SHA1 Message Date
Rafael Weinstein a21d121d71 Dont bind directly to loopback addr; TBR=aa 2015-08-27 10:27:44 -07:00
Aaron Boodman 2eb0ad33aa Merge pull request #225 from aboodman/width
flickr: import width and height too
2015-08-26 23:02:19 -07:00
Dan Willhite 30f255463e Merge pull request #226 from willhite/godeps
Pin dependencies using godep tool. Rewrite dep urls.
2015-08-26 16:23:24 -07:00
Dan Willhite ab34143ba5 Pin dependencies using godep tool. Rewrite dep urls. 2015-08-26 14:05:40 -07:00
cmasone-attic 26b6018443 Merge pull request #199 from cmasone-attic/issue160
Add Unmarshal and Marshal

Towards issue #160
2015-08-26 13:32:58 -07:00
Aaron Boodman ac068d5f04 flickr: import width and height too 2015-08-26 12:47:25 -07:00
Aaron Boodman c0789e8adb Merge pull request #224 from aboodman/comments
Response to comments on PR #223
2015-08-26 12:47:04 -07:00
Aaron Boodman 33a5860216 Response to comments on PR #223 2015-08-26 12:46:12 -07:00
Chris Masone 24e0e436e4 Revert change in blob.go 2015-08-26 09:28:04 -07:00
Chris Masone ccd70d7c65 Changed error handling in Marshal and Unmarshal
Instead of returning errors, these now use d.Exp to raise catchable
errors.

Also, added commit hash at which code was pulled from encoding/json

Marshal io.Reader into a Blob, unmarshal Blob into io.Writer
2015-08-26 09:28:04 -07:00
Chris Masone 5de698b8f1 Add Unmarshal and Marshal
Unmarshal and Marshal are tools for moving data from Noms into native Go and
back. The rules are described in the documentation of the two functions, but
the behavior is broadly similar to encoding/json.

Towards issue #160
2015-08-26 09:27:58 -07:00
Chris Masone 27909c905d Move and rename encoding/json files to prep for mods
This patch renames files to the names that will be used by our marshal
package, so that the change history will be accurate.
2015-08-26 09:15:34 -07:00
Chris Masone 9875fccd40 Initial import of encoding/json files
The plan is to modify the encoding/json code heavily for use in
marshaling between native Go and Noms values. This pulls in the files
unmodified so we have a record of our changes.
2015-08-26 09:15:34 -07:00
Aaron Boodman 14b0e52d00 Merge pull request #223 from aboodman/and
tagshow: more refinements
2015-08-25 21:56:23 -07:00
Aaron Boodman 1703f98c80 tagshow: Use AND rather than OR to decide which photos to show 2015-08-25 21:55:14 -07:00
Aaron Boodman 66ab401922 tagshow: Display each photo's tags 2015-08-25 21:54:51 -07:00
Aaron Boodman ea6a448be0 Merge pull request #222 from aboodman/or
tagshow: correctly union matching photos
2015-08-25 15:18:46 -07:00
Aaron Boodman 10f4fd4fdd tagshow: correctly union matching photos 2015-08-25 15:10:21 -07:00
Aaron Boodman cd11714444 Merge pull request #221 from aboodman/tagshow-urls
Tagshow urls
2015-08-25 14:58:02 -07:00
Aaron Boodman 88a6455d9e tagshow: Use URLs for state to ease development. 2015-08-25 14:57:33 -07:00
Rafael Weinstein 5514d72e74 Allow server to exit gracefully 2015-08-25 14:44:08 -07:00
Aaron Boodman d7686cb4d3 tagshow: make the layout slightly cleaner 2015-08-25 14:00:24 -07:00
Erik Arvidsson 4bb0ec9cda JS: Fix decode of compound blobs
This regressed in 1d152410db

Issue #170
2015-08-25 16:58:15 -04:00
Erik Arvidsson e9efeb6115 Fix pitchmap ui demo
This broke when we changed from heads to a single head
2015-08-25 14:42:30 -04:00
Erik Arvidsson 1d152410db Tighten up compound blob encoding
Before:

```json
{"cb":[{"ref":"sha1-x"},lengthX,{"ref":"sha1-y"},lengthY]}
```

After:

```json
{"cb":["sha1-x",lengthX,"sha1-y",lengthY]}
```

Fixes #170
2015-08-25 12:16:43 -04:00
Erik Arvidsson 15abec7a1c Fix broken pull_test.go
This broke due to changes in the API regarding heads and commits
2015-08-25 10:56:20 -04:00
cmasone-attic 44baf7365f Merge pull request #216 from cmasone-attic/issue210
Rename noms-pull -> shove, and fix shove

Fixes Issue #210
2015-08-24 17:02:05 -07:00
Chris Masone 9a9d5a98e6 Rename noms-pull -> shove, and fix shove
I busted noms-pull in the patch where I added MaybeHeads. So,
fix it and rename to 'shove' per issue #210
2015-08-24 16:56:45 -07:00
cmasone-attic 53f2b6a08e Merge pull request #214 from cmasone-attic/dataset-rewrite
Dataset rewrite

Towards issue #147
2015-08-24 16:35:25 -07:00
Chris Masone 45a42976fc Fix test, function name 2015-08-24 16:33:22 -07:00
Chris Masone 5f34469f22 Allow for Dataset and DataStore to be headless
Get rid of the notion of a special 'Empty' Commit value, which means
that a freshly created Dataset or DataStore will have no Head at
all. To allow callers to tolerate this, we provide the MaybeHead()
method for them to use when they're unsure about whether a given
Data{set,Store} has ever been committed to.

To ease the API impacts of this change, we've also modified Commit()
to take a types.Value and handle creating a Commit struct holding that
Value and descending directly from the current Head.
Callers who wish to provide alternate parents can use CommitWithParents()
2015-08-24 15:55:17 -07:00
Aaron Boodman 68183a8e09 Merge pull request #205 from aboodman/too-many-files
pull: fix "too many files open" error
2015-08-24 15:54:42 -07:00
Aaron Boodman 2d5983ecd2 pull: fix "too many files open" error 2015-08-24 15:53:36 -07:00
Aaron Boodman b3bf30daa6 Rewrite DataSet to compose DataStore rather than embed it 2015-08-24 12:03:25 -07:00
cmasone-attic d7894a6501 Merge pull request #204 from cmasone-attic/brach
Remove implicit branching

Towards issue #147
2015-08-24 11:49:08 -07:00
Chris Masone 7d8f599003 Remove implicit branching
This patch changes the "Head" of a DataStore to be a single Commit,
as opposed to a SetOfCommit. This has several consequences:

1) Commit() will only accept Commits that are descendants of the
   current Head.
2) Calls to Commit() can now fail, so the method now has an additional
   'ok' return value that callers must check. Whether ok is true or
   false, the DataStore struct returned is the right one to use for
   subsequent calls to Commit() -- retries or otherwise.
3) This rolls up the stack, so Dataset.Commit() can now fail as well,
   and similar logic applies.
4) sync.SetNewHeads() also behaves similarly, since it can also now fail.
5) Examples now die on Commit() failures.

Also, removes the /dataset endpoint from server. It's deprecated, and this
patch would have required updating it, so instead just delete it.

Towards issue #147
2015-08-24 11:48:03 -07:00
Rafael Weinstein 21d0c92842 Merge pull request #209 from rafael-atticlabs/cleanup
Clean following HttpStore implementation
2015-08-24 10:59:08 -07:00
Rafael Weinstein abc7102ad6 Clean following HttpStore implementation 2015-08-24 10:57:50 -07:00
Rafael Weinstein 0b57427496 Remove default hostname for httpstore 2015-08-21 14:34:23 -07:00
Rafael Weinstein f6490cbbe5 Add HttpStore implementation 2015-08-21 14:22:45 -07:00
Rafael Weinstein b6ebb67e91 Fix AWS update breakage 2015-08-21 14:21:04 -07:00
Rafael Weinstein 06c5bc6c1b Abstract ChunkStoreWriter 2015-08-20 10:58:41 -07:00
Rafael Weinstein 94e7c3b73a Abstract a bunch of (haphazzardly) duplicated tests into chunk_store_test 2015-08-19 18:23:09 -07:00
Rafael Weinstein 8570f9c704 Merge pull request #200 from rafael-atticlabs/moar-errors
Remove errors from read/write/encode/decode
2015-08-19 11:31:52 -07:00
Rafael Weinstein 0555d7a3c1 Remove errors from read/write/encode/decode 2015-08-18 16:37:04 -07:00
Rafael Weinstein 0e7d61efc6 Remove errors from ChunkStore and Ref 2015-08-18 16:24:26 -07:00
Aaron Boodman 821bccc946 Merge pull request #197 from aboodman/sort
tagshow: sort photos deterministically
2015-08-18 15:52:36 -07:00
Aaron Boodman fe40fe7996 tagshow: sort photos deterministically 2015-08-18 13:33:03 -07:00
Aaron Boodman c942f11b6a Merge pull request #196 from aboodman/actually-decode-blobs
Actually decode blobs
2015-08-18 12:52:01 -07:00
Rafael Weinstein 0222b95ff2 LevelDBStore 2015-08-18 11:20:17 -07:00