Skip to content
Permalink
Browse files

Rename import paths from camlistore.org to perkeep.org.

Part of the project renaming, issue #981.

After this, users will need to mv their $GOPATH/src/camlistore.org to
$GOPATH/src/perkeep.org. Sorry.

This doesn't yet rename the tools like camlistored, camput, camget,
camtool, etc.

Also, this only moves the lru package to internal. More will move to
internal later.

Also, this doesn't yet remove the "/pkg/" directory. That'll likely
happen later.

This updates some docs, but not all.

devcam test now passes again, even with Go 1.10 (which requires vet
checks are clean too). So a bunch of vet tests are fixed in this CL
too, and a bunch of other broken tests are now fixed (introduced from
the past week of merging the CL backlog).

Change-Id: If580db1691b5b99f8ed6195070789b1f44877dd4
  • Loading branch information
bradfitz committed Jan 1, 2018
1 parent 04f6396 commit d6a0b05df0f1b1bd7ff0a3fc16a21561d84854d2
Showing 645 changed files with 1,985 additions and 1,970 deletions.
@@ -1,5 +1,5 @@
/*
Copyright 2015 The Camlistore Authors
Copyright 2018 The Perkeep Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,31 +1,31 @@
Camlistore contributors regularly use Linux and OS X, and both are
Perkeep contributors regularly use Linux and OS X, and both are
100% supported.

Developing on Windows is sometimes broken, but should work. Let us
know if we broke something, or we accidentally depend on some
Unix-specific build tool somewhere.

See https://camlistore.org/doc/contributing for information on how to
See https://perkeep.org/doc/contributing for information on how to
contribute to the project and submit patches. Notably, we use Gerrit
for code review. Our Gerrit instance is at https://camlistore.org/r/
for code review. Our Gerrit instance is at https://perkeep.org/r/

See architecture docs: https://camlistore.org/doc/
See architecture docs: https://perkeep.org/doc/

You can view docs for Camlistore packages with local godoc, or
You can view docs for Perkeep packages with local godoc, or
godoc.org.

It's recommended you use git to fetch the source code, rather than
hack from a Camlistore release's zip file:
hack from a Perkeep release's zip file:

$ git clone https://camlistore.googlesource.com/camlistore
$ git clone https://camlistore.googlesource.com/camlistore perkeep

(We use github for distribution but its code review system is so poor,
we don't use its Pull Request mechanism. The Gerrit git server & code
review system is the main repo. See
https://camlistore.org/doc/contributing for how to use them. We might
(We use github for distribution but its code review system is not as
nice as Gerrit, so we don't use its Pull Request mechanism. The Gerrit
git server & code review system is the main repo. See
https://perkeep.org/doc/contributing for how to use them. We might
support github for pull requests in the future, once it's properly
integrated with external code review tools. We had a meeting with Github
to discuss the ways in which their code review tools are poor.)
integrated with external code review tools. We had a meeting with
Github to discuss the ways in which their code review tools are poor.)

On Debian/Ubuntu, some deps to get started:

@@ -43,8 +43,8 @@ To build devcam:
And devcam will be in <camroot>/bin/devcam. You'll probably want to
symlink it into your $PATH.

Alternatively, if your Camlistore root is checked out at
$GOPATH/src/camlistore.org (optional, but natural for Go users), you
Alternatively, if your Perkeep root is checked out at
$GOPATH/src/perkeep.org (optional, but natural for Go users), you
can just:

$ go install ./dev/devcam
@@ -61,7 +61,7 @@ Once the dev server is running,

- Upload a file:

devcam put file ~/camlistore/COPYING
devcam put file ~/perkeep/COPYING

- Create a permanode:

@@ -78,7 +78,7 @@ change to be reviewed you should merge your commits into one before submitting
to gerrit for review.

You should also try to write a meaningful commit message, which at least states
in the first sentence what part or package of camlistore this commit is affecting.
in the first sentence what part or package of perkeep this commit is affecting.
The following text should state what problem the change is addressing, and how.
Finally, you should refer to the github issue(s) the commit is addressing, if any,
and with the appropriate keyword if the commit is fixing the issue. (See
@@ -99,7 +99,7 @@ in your commit message the version (e.g. git commit hash) of said third party.

We follow the Go convention for commits (messages) about new Contributors.
See https://golang.org/doc/contribute.html#copyright , and examples such as
https://camlistore.org/gw/85bf99a7, and https://camlistore.org/gw/8f9af410.
https://perkeep.org/gw/85bf99a7, and https://perkeep.org/gw/8f9af410.

You can optionally use our pre-commit hook so that your code gets gofmt'ed
before being submitted (which should be done anyway).
@@ -1,5 +1,5 @@
# Copyright 2014 The Camlistore Authors.
# Generic purpose Camlistore image, that builds the server (camlistored)
# Copyright 2014 The Perkeep Authors.
# Generic purpose Perkeep image, that builds the server (camlistored)
# and the command-line clients (camput, camget, camtool, and cammount).

# See misc/docker/go to generate camlistore/go
@@ -17,25 +17,25 @@ RUN mkdir -p /gopath/pkg
RUN chown camli.camli /gopath/pkg

RUN mkdir -p /gopath/src
ADD internal /gopath/src/camlistore.org/internal
ADD app /gopath/src/camlistore.org/app
ADD dev /gopath/src/camlistore.org/dev
ADD cmd /gopath/src/camlistore.org/cmd
ADD vendor /gopath/src/camlistore.org/vendor
ADD server /gopath/src/camlistore.org/server
ADD pkg /gopath/src/camlistore.org/pkg
ADD make.go /gopath/src/camlistore.org/make.go
RUN echo 'dev' > /gopath/src/camlistore.org/VERSION
ADD internal /gopath/src/perkeep.org/internal
ADD app /gopath/src/perkeep.org/app
ADD dev /gopath/src/perkeep.org/dev
ADD cmd /gopath/src/perkeep.org/cmd
ADD vendor /gopath/src/perkeep.org/vendor
ADD server /gopath/src/perkeep.org/server
ADD pkg /gopath/src/perkeep.org/pkg
ADD make.go /gopath/src/perkeep.org/make.go
RUN echo 'dev' > /gopath/src/perkeep.org/VERSION

ENV GOROOT /usr/local/go
ENV PATH $GOROOT/bin:/gopath/bin:$PATH
ENV GOPATH /gopath
ENV CGO_ENABLED 0
ENV CAMLI_GOPHERJS_GOROOT /usr/local/go

WORKDIR /gopath/src/camlistore.org
WORKDIR /gopath/src/perkeep.org
RUN go run make.go
RUN cp -a /gopath/src/camlistore.org/bin/* /gopath/bin/
RUN cp -a /gopath/src/perkeep.org/bin/* /gopath/bin/

ENV USER camli
ENV HOME /home/camli
@@ -1,4 +1,4 @@
# The normal way to build Camlistore is just "go run make.go", which
# The normal way to build Perkeep is just "go run make.go", which
# works everywhere, even on systems without Make. The rest of this
# Makefile is mostly historical and should hopefully disappear over
# time.
@@ -7,7 +7,7 @@ all:

# On OS X with "brew install sqlite3", you need PKG_CONFIG_PATH=/usr/local/Cellar/sqlite/3.7.17/lib/pkgconfig/
full:
go install --ldflags="-X camlistore.org/pkg/buildinfo.GitInfo "`./misc/gitversion` `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./dev/...
go install --ldflags="-X perkeep.org/pkg/buildinfo.GitInfo "`./misc/gitversion` `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./dev/...


# Workaround Go bug where the $GOPATH/pkg cache doesn't know about tag changes.
@@ -33,4 +33,4 @@ clean:
rm -f $(NEWUIDIR)/all.js $(NEWUIDIR)/all.js.map

fmt:
go fmt camlistore.org/cmd... camlistore.org/dev... camlistore.org/misc... camlistore.org/pkg... camlistore.org/server...
go fmt perkeep.org/cmd... perkeep.org/dev... perkeep.org/misc... perkeep.org/pkg... perkeep.org/server...
16 README
@@ -1,12 +1,12 @@
Camlistore is your personal storage system for life.
Perkeep is your personal storage system.

It's a way to store, sync, share, model and back up content.
It's a way to store, sync, share, import, model, and back up content.
Keep your stuff for life.

It stands for "Content-Addressable Multi-Layer Indexed Storage", for
lack of a better name. For more, see:
For more, see:

https://camlistore.org/
https://camlistore.org/doc/
https://perkeep.org/
https://perkeep.org/doc/

Other useful files:

@@ -15,9 +15,9 @@ Other useful files:

Mailing lists:

http://camlistore.org/lists
http://perkeep.org/lists

Bugs and contributing:

https://github.com/camlistore/camlistore/issues
https://camlistore.org/doc/contributing
https://perkeep.org/doc/contributing
2 TODO
@@ -6,7 +6,7 @@ Offline list:

-- fix the presubmit's gofmt to be happy about emacs:

go fmt camlistore.org/cmd... camlistore.org/dev... camlistore.org/misc... camlistore.org/pkg... camlistore.org/server...
go fmt perkeep.org/cmd... perkeep.org/dev... perkeep.org/misc... perkeep.org/pkg... perkeep.org/server...
stat pkg/blobserver/.#multistream_test.go: no such file or directory
exit status 2
make: *** [fmt] Error 1
@@ -1,5 +1,5 @@
/*
Copyright 2014 The Camlistore Authors.
Copyright 2014 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ limitations under the License.

// The hello application serves as an example on how to make stand-alone
// server applications, interacting with a Camlistore server.
package main // import "camlistore.org/app/hello"
package main // import "perkeep.org/app/hello"

import (
"flag"
@@ -26,9 +26,9 @@ import (
"os"
"runtime"

"camlistore.org/pkg/app"
"camlistore.org/pkg/buildinfo"
"camlistore.org/pkg/webserver"
"perkeep.org/pkg/app"
"perkeep.org/pkg/buildinfo"
"perkeep.org/pkg/webserver"
)

var (
@@ -1,5 +1,5 @@
/*
Copyright 2014 The Camlistore Authors
Copyright 2014 The Perkeep Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ of a camliRoot node (a permanode with a camliRoot attribute set).
#fileembed pattern .+\.(js|css|html|png|svg|js.map)$
*/
package main // import "camlistore.org/app/publisher"
package main // import "perkeep.org/app/publisher"

import (
"camlistore.org/pkg/fileembed"
"perkeep.org/pkg/fileembed"
)

// TODO(mpl): appengine case
@@ -1,5 +1,5 @@
/*
Copyright 2016 The Camlistore Authors.
Copyright 2016 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import (
"strings"
"sync"

"camlistore.org/pkg/blob"
"perkeep.org/pkg/blob"

"github.com/gopherjs/gopherjs/js"
"github.com/gopherjs/jquery"
@@ -1,7 +1,7 @@
// +build ignore

/*
Copyright 2016 The Camlistore Authors.
Copyright 2016 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ func main() {
fmt.Fprintln(out, `// generated by gensearchtypes.go; DO NOT EDIT
/*
Copyright 2016 The Camlistore Authors.
Copyright 2016 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -71,8 +71,8 @@ import (
"net/url"
"time"
"camlistore.org/pkg/blob"
"camlistore.org/pkg/types/camtypes"
"perkeep.org/pkg/blob"
"perkeep.org/pkg/types/camtypes"
)
// Duplicating the search pkg types in here - since we only use them for json
@@ -96,7 +96,7 @@ import (
m[n] = nil
}

fileSet, pkg, err := loadPkg("camlistore.org/pkg/search")
fileSet, pkg, err := loadPkg("perkeep.org/pkg/search")
if err != nil {
log.Fatal(err)
}
@@ -1,7 +1,7 @@
//go:generate go run gensearchtypes.go -out zsearch.go

/*
Copyright 2016 The Camlistore Authors.
Copyright 2016 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import (
"fmt"
"strings"

"camlistore.org/pkg/blob"
"perkeep.org/pkg/blob"

"github.com/gopherjs/gopherjs/js"
"github.com/gopherjs/jquery"
@@ -1,5 +1,5 @@
/*
Copyright 2016 The Camlistore Authors.
Copyright 2016 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import (
"strings"
"sync"

"camlistore.org/pkg/blob"
"perkeep.org/pkg/blob"

"github.com/gopherjs/gopherjs/js"
"github.com/gopherjs/jquery"
@@ -1,5 +1,5 @@
/*
Copyright 2014 The Camlistore Authors
Copyright 2014 The Perkeep Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -41,25 +41,25 @@ import (
"sync"
"time"

"camlistore.org/pkg/app"
"camlistore.org/pkg/blob"
"camlistore.org/pkg/blobserver"
"camlistore.org/pkg/blobserver/localdisk"
"camlistore.org/pkg/buildinfo"
"camlistore.org/pkg/cacher"
"camlistore.org/pkg/constants"
"camlistore.org/pkg/fileembed"
"camlistore.org/pkg/httputil"
"camlistore.org/pkg/magic"
"camlistore.org/pkg/netutil"
"camlistore.org/pkg/osutil"
"camlistore.org/pkg/publish"
"camlistore.org/pkg/search"
"camlistore.org/pkg/server"
"camlistore.org/pkg/sorted"
_ "camlistore.org/pkg/sorted/kvfile"
"camlistore.org/pkg/types/camtypes"
"camlistore.org/pkg/webserver"
"perkeep.org/pkg/app"
"perkeep.org/pkg/blob"
"perkeep.org/pkg/blobserver"
"perkeep.org/pkg/blobserver/localdisk"
"perkeep.org/pkg/buildinfo"
"perkeep.org/pkg/cacher"
"perkeep.org/pkg/constants"
"perkeep.org/pkg/fileembed"
"perkeep.org/pkg/httputil"
"perkeep.org/pkg/magic"
"perkeep.org/pkg/netutil"
"perkeep.org/pkg/osutil"
"perkeep.org/pkg/publish"
"perkeep.org/pkg/search"
"perkeep.org/pkg/server"
"perkeep.org/pkg/sorted"
_ "perkeep.org/pkg/sorted/kvfile"
"perkeep.org/pkg/types/camtypes"
"perkeep.org/pkg/webserver"

"go4.org/syncutil"
"golang.org/x/crypto/acme/autocert"
@@ -535,7 +535,7 @@ func (ph *publishHandler) lookupPathTarget(root blob.Ref, suffix string) (blob.R
if suffix == "" {
return root, nil
}
// TODO: verify it's optimized: http://camlistore.org/issue/405
// TODO: verify it's optimized: http://perkeep.org/issue/405
result, err := ph.cl.Query(&search.SearchQuery{
Limit: 1,
Constraint: &search.Constraint{

0 comments on commit d6a0b05

Please sign in to comment.
You can’t perform that action at this time.