This repository was archived by the owner on Sep 11, 2020. It is now read-only.
worktree: Remove and Move methods #395
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alcortesm
suggested changes
May 17, 2017
worktree_status.go
Outdated
| @@ -72,6 +74,8 @@ func (w *Worktree) status(commit plumbing.Hash) (Status, error) { | |||
| fs.Staging = Unmodified | |||
| } | |||
|
|
|||
| fmt.Println(ch, a) | |||
alcortesm
previously requested changes
May 17, 2017
worktree_status.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fillSystemInfo(e, info.Sys()) | ||
| return nil | ||
| } | ||
|
|
||
| func (w *Worktree) Remove(path string) (plumbing.Hash, error) { |
worktree_status.go
Outdated
| return err | ||
| } | ||
|
|
||
| func (w *Worktree) Move(from, to string) (plumbing.Hash, error) { |
ajnavarro
previously requested changes
May 17, 2017
| @@ -20,3 +20,20 @@ func (s *IndexSuite) TestIndexEntry(c *C) { | |||
| c.Assert(e, IsNil) | |||
| c.Assert(err, Equals, ErrEntryNotFound) | |||
| } | |||
|
|
|||
| func (s *IndexSuite) TestIndexRemove(c *C) { | |||
There was a problem hiding this comment.
TestIndexRemoveNonexistentEntry?
There was a problem hiding this comment.
This is already tested
There was a problem hiding this comment.
👍 I didn't know, because the codecov comment is not appearing...
| @@ -590,3 +590,68 @@ func (s *WorktreeSuite) TestAddUnmodified(c *C) { | |||
| c.Assert(hash.String(), Equals, "c192bd6a24ea1ab01d78686e417c8bdc7c3d197f") | |||
| c.Assert(err, IsNil) | |||
| } | |||
|
|
|||
| func (s *WorktreeSuite) TestRemove(c *C) { | |||
There was a problem hiding this comment.
TestRemoveNonexistentElement?
worktree_test.go
Outdated
| c.Assert(status.File("LICENSE").Staging, Equals, Deleted) | ||
| } | ||
|
|
||
| func (s *WorktreeSuite) TestRemoveDeletedFromWorktree(c *C) { |
There was a problem hiding this comment.
TestRemoveNonexistentDeletedElement?
Codecov Report
@@ Coverage Diff @@
## master #395 +/- ##
==========================================
- Coverage 77.29% 76.62% -0.68%
==========================================
Files 123 123
Lines 8753 8787 +34
==========================================
- Hits 6766 6733 -33
- Misses 1226 1302 +76
+ Partials 761 752 -9
Continue to review full report at Codecov.
|
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requires src-d/go-billy#29