Skip to content

Commit ac33382

Browse files
committed
Merge pull request git-lfs#1 from github/rename-again
rename hawser => git-lfs
2 parents 550e2a9 + e69c476 commit ac33382

File tree

127 files changed

+580
-584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+580
-584
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bin/
22
benchmark/
33
.vendor/pkg
44
servertest
5-
.vendor/src/github.com/hawser/git-hawser
5+
.vendor/src/github.com/github/git-lfs
66

77
# only allow man/*.\d.ronn files
88
man/*

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Contributing to Git Hawser
1+
## Contributing to Git Large File Storage
22

33
Hi there! We're thrilled that you'd like to contribute to this project. Your
44
help is essential for keeping it great.
@@ -27,7 +27,7 @@ them as separate pull requests.
2727

2828
0. Update `Godeps`.
2929
0. Run `script/vendor` to update the code in the `.vendor/src` directory.
30-
0. Commit the change. Hawser vendors the full source code in the repository.
30+
0. Commit the change. Git LFS vendors the full source code in the repository.
3131
0. Submit a pull request.
3232

3333
## Resources
@@ -36,6 +36,6 @@ them as separate pull requests.
3636
- [Using Pull Requests](https://help.github.com/articles/using-pull-requests/)
3737
- [GitHub Help](https://help.github.com)
3838

39-
[fork]: https://github.com/hawser/git-hawser/fork
40-
[pr]: https://github.com/hawser/git-hawser/compare
39+
[fork]: https://github.com/github/git-lfs/fork
40+
[pr]: https://github.com/github/git-lfs/compare
4141
[style]: https://github.com/golang/go/wiki/CodeReviewComments

README.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
Git Hawser
1+
Git Large File Storage
22
======
33

4-
Git command line extension for managing large files. Hawser replaces large
5-
files with text pointers inside Git, while storing the actual files in a remote
6-
Hawser server.
4+
Git LFS is a command line extension for managing large files. It replaces
5+
large files with text pointers inside Git, while storing the actual files in a
6+
remote Git LFS server.
77

8-
The Git Hawser client is written in Go, with pre-compiled binaries available for
8+
The Git LFS client is written in Go, with pre-compiled binaries available for
99
Mac, Windows, Linux, and FreeBSD.
1010

11-
See [CONTRIBUTING.md](CONTRIBUTING.md) for info on working on Hawser and sending
12-
patches.
11+
See [CONTRIBUTING.md](CONTRIBUTING.md) for info on working on Git LFS and
12+
sending patches.
1313

1414
## Getting Started
1515

1616
Download the [latest client][rel] and run the included install script. The
17-
installer should run `git hawser init` for you, which sets up Git's global
18-
configuration settings for Hawser.
17+
installer should run `git lfs init` for you, which sets up Git's global
18+
configuration settings for Git LFS.
1919

20-
[rel]: https://github.com/hawser/git-hawser/releases
20+
[rel]: https://github.com/github/git-lfs/releases
2121

2222
### Configuration
2323

24-
Hawser uses `.gitattributes` files to configure which are managed by Hawser.
24+
Git LFS uses `.gitattributes` files to configure which are managed by Git LFS.
2525
Here is a sample one that saves zips and mp3s:
2626

2727
$ cat .gitattributes
28-
*.mp3 filter=hawser -crlf
29-
*.zip filter=hawser -crlf
28+
*.mp3 filter=lfs -crlf
29+
*.zip filter=lfs -crlf
3030

31-
Hawser can help manage the paths:
31+
Git LFS can help manage the paths:
3232

33-
$ git hawser add "*.mp3"
33+
$ git lfs add "*.mp3"
3434
Adding path *.mp3
3535

36-
$ git hawser add "*.zip"
36+
$ git lfs add "*.zip"
3737
Adding path *.zip
3838

39-
$ git hawser path
39+
$ git lfs path
4040
Listing paths
4141
*.mp3 (.gitattributes)
4242
*.zip (.gitattributes)
4343

44-
$ git hawser remove "*.zip"
44+
$ git lfs remove "*.zip"
4545
Removing path *.zip
4646

47-
$ git hawser path
47+
$ git lfs path
4848
Listing paths
4949
*.mp3 (.gitattributes)
5050

@@ -55,9 +55,9 @@ Once setup, you're ready to push some commits.
5555
$ git add my.zip
5656
$ git commit -m "add zip"
5757

58-
You can confirm that Hawser is managing your zip file:
58+
You can confirm that Git LFS is managing your zip file:
5959

60-
$ git hawser ls-files
60+
$ git lfs ls-files
6161
my.zip
6262

6363
Once you've made your commits, push your files to the Git remote.
@@ -70,7 +70,7 @@ Once you've made your commits, push your files to the Git remote.
7070
Compressing objects: 100% (5/5), done.
7171
Writing objects: 100% (5/5), 548 bytes | 0 bytes/s, done.
7272
Total 5 (delta 1), reused 0 (delta 0)
73-
To https://github.com/hawser/hawser-test
73+
To https://github.com/github/git-lfs-test
7474
67fcf6a..47b2002 master -> master
7575

76-
See the [Hawser overview](https://github.com/hawser/git-hawser/tree/master/docs) and [man pages](https://github.com/hawser/git-hawser/tree/master/docs/man).
76+
See the [Git LFS overview](https://github.com/github/git-lfs/tree/master/docs) and [man pages](https://github.com/github/git-lfs/tree/master/docs/man).

cmd/git-hawser.go renamed to cmd/git-lfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/hawser/git-hawser/commands"
4+
"github.com/github/git-lfs/commands"
55
)
66

77
func main() {

commands/clean_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestClean(t *testing.T) {
1919

2020
cmd := repo.Command("clean", "somefile")
2121
cmd.Input = bytes.NewBufferString(content)
22-
cmd.Output = `version https://hawser.github.com/spec/v1
22+
cmd.Output = `version https://git-lfs.github.com/spec/v1
2323
oid sha256:` + oid + `
2424
size 3`
2525

@@ -32,7 +32,7 @@ size 3`
3232

3333
cmd = repo.Command("clean")
3434
cmd.Input = bytes.NewBufferString(content)
35-
cmd.Output = `version https://hawser.github.com/spec/v1
35+
cmd.Output = `version https://git-lfs.github.com/spec/v1
3636
oid sha256:` + oid + `
3737
size 3`
3838
customHook := []byte("echo 'yo'")

commands/command_add.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package commands
22

33
import (
44
"fmt"
5-
"github.com/hawser/git-hawser/hawser"
5+
"github.com/github/git-lfs/lfs"
66
"github.com/spf13/cobra"
77
"io"
88
"os"
@@ -18,10 +18,10 @@ var (
1818
)
1919

2020
func addCommand(cmd *cobra.Command, args []string) {
21-
hawser.InstallHooks(false)
21+
lfs.InstallHooks(false)
2222

2323
if len(args) < 1 {
24-
Print("git hawser path add <path> [path]*")
24+
Print("git lfs path add <path> [path]*")
2525
return
2626
}
2727

@@ -52,7 +52,7 @@ func addCommand(cmd *cobra.Command, args []string) {
5252
continue
5353
}
5454

55-
_, err := attributesFile.WriteString(fmt.Sprintf("%s filter=hawser -crlf\n", t))
55+
_, err := attributesFile.WriteString(fmt.Sprintf("%s filter=lfs -crlf\n", t))
5656
if err != nil {
5757
Print("Error adding path %s", t)
5858
continue

commands/command_clean.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package commands
22

33
import (
4-
"github.com/hawser/git-hawser/hawser"
5-
"github.com/hawser/git-hawser/pointer"
4+
"github.com/github/git-lfs/lfs"
5+
"github.com/github/git-lfs/pointer"
66
"github.com/spf13/cobra"
77
"os"
88
)
@@ -16,10 +16,10 @@ var (
1616
)
1717

1818
func cleanCommand(cmd *cobra.Command, args []string) {
19-
hawser.InstallHooks(false)
19+
lfs.InstallHooks(false)
2020

2121
var filename string
22-
var cb hawser.CopyCallback
22+
var cb lfs.CopyCallback
2323
var file *os.File
2424
var fileSize int64
2525
if len(args) > 0 {
@@ -29,7 +29,7 @@ func cleanCommand(cmd *cobra.Command, args []string) {
2929
if err == nil && stat != nil {
3030
fileSize = stat.Size()
3131

32-
localCb, localFile, err := hawser.CopyCallbackFile("clean", filename, 1, 1)
32+
localCb, localFile, err := lfs.CopyCallbackFile("clean", filename, 1, 1)
3333
if err != nil {
3434
Error(err.Error())
3535
} else {
@@ -51,7 +51,7 @@ func cleanCommand(cmd *cobra.Command, args []string) {
5151
}
5252

5353
tmpfile := cleaned.File.Name()
54-
mediafile, err := hawser.LocalMediaPath(cleaned.Oid)
54+
mediafile, err := lfs.LocalMediaPath(cleaned.Oid)
5555
if err != nil {
5656
Panic(err, "Unable to get local media path.")
5757
}

commands/command_env.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package commands
22

33
import (
4-
"github.com/hawser/git-hawser/hawser"
4+
"github.com/github/git-lfs/lfs"
55
"github.com/spf13/cobra"
66
)
77

@@ -14,7 +14,7 @@ var (
1414
)
1515

1616
func envCommand(cmd *cobra.Command, args []string) {
17-
config := hawser.Config
17+
config := lfs.Config
1818

1919
if endpoint := config.Endpoint(); len(endpoint) > 0 {
2020
Print("Endpoint=%s", endpoint)
@@ -24,7 +24,7 @@ func envCommand(cmd *cobra.Command, args []string) {
2424
Print("Endpoint (%s)=%s", remote, config.RemoteEndpoint(remote))
2525
}
2626

27-
for _, env := range hawser.Environ() {
27+
for _, env := range lfs.Environ() {
2828
Print(env)
2929
}
3030
}

commands/command_init.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package commands
22

33
import (
4-
"github.com/hawser/git-hawser/hawser"
4+
"github.com/github/git-lfs/lfs"
55
"github.com/spf13/cobra"
66
)
77

88
var (
99
initCmd = &cobra.Command{
1010
Use: "init",
11-
Short: "Initialize the default Git Media configuration",
11+
Short: "Initialize the default Git LFS configuration",
1212
Run: initCommand,
1313
}
1414

@@ -20,19 +20,19 @@ var (
2020
)
2121

2222
func initCommand(cmd *cobra.Command, args []string) {
23-
if err := hawser.InstallFilters(); err != nil {
23+
if err := lfs.InstallFilters(); err != nil {
2424
Error(err.Error())
2525
}
2626

27-
if hawser.InRepo() {
27+
if lfs.InRepo() {
2828
initHooksCommand(cmd, args)
2929
}
3030

31-
Print("git hawser initialized")
31+
Print("git lfs initialized")
3232
}
3333

3434
func initHooksCommand(cmd *cobra.Command, args []string) {
35-
if err := hawser.InstallHooks(false); err != nil {
35+
if err := lfs.InstallHooks(false); err != nil {
3636
Error(err.Error())
3737
}
3838
}

commands/command_logs.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package commands
22

33
import (
44
"errors"
5-
"github.com/hawser/git-hawser/hawser"
5+
"github.com/github/git-lfs/lfs"
66
"github.com/spf13/cobra"
77
"io/ioutil"
88
"os"
@@ -64,7 +64,7 @@ func logsShowCommand(cmd *cobra.Command, args []string) {
6464
}
6565

6666
name := args[0]
67-
by, err := ioutil.ReadFile(filepath.Join(hawser.LocalLogDir, name))
67+
by, err := ioutil.ReadFile(filepath.Join(lfs.LocalLogDir, name))
6868
if err != nil {
6969
Exit("Error reading log: %s", name)
7070
}
@@ -74,23 +74,23 @@ func logsShowCommand(cmd *cobra.Command, args []string) {
7474
}
7575

7676
func logsClearCommand(cmd *cobra.Command, args []string) {
77-
err := os.RemoveAll(hawser.LocalLogDir)
77+
err := os.RemoveAll(lfs.LocalLogDir)
7878
if err != nil {
79-
Panic(err, "Error clearing %s", hawser.LocalLogDir)
79+
Panic(err, "Error clearing %s", lfs.LocalLogDir)
8080
}
8181

82-
Print("Cleared %s", hawser.LocalLogDir)
82+
Print("Cleared %s", lfs.LocalLogDir)
8383
}
8484

8585
func logsBoomtownCommand(cmd *cobra.Command, args []string) {
8686
Debug("Debug message")
87-
err := hawser.Errorf(errors.New("Inner error message!"), "Error!")
87+
err := lfs.Errorf(errors.New("Inner error message!"), "Error!")
8888
Panic(err, "Welcome to Boomtown")
8989
Debug("Never seen")
9090
}
9191

9292
func sortedLogs() []string {
93-
fileinfos, err := ioutil.ReadDir(hawser.LocalLogDir)
93+
fileinfos, err := ioutil.ReadDir(lfs.LocalLogDir)
9494
if err != nil {
9595
return []string{}
9696
}

0 commit comments

Comments
 (0)