aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #300 from alcortesm/improvement-difftree-simplify-deprecatedMáximo Cuadros2017-03-043-51/+31
|\ | | | | difftree: simplify hash comparison with deprecated files modes
| * difftree: simplify hash comparison with deprecated files modesAlberto Cortés2017-03-033-51/+31
| | | | | | | | | | | | | | | | | | | | Difftree hash comparisson was quite complex because the hashes of deprecated files were diferent from the hashes of regular files. But git's difftree really treat them as equal. This patch fix this by making treenoder return the same hash for regular files than for deprecated files; now the hash comparison function is just a bytes.Equal call.
* | Merge pull request #295 from ajnavarro/improvement/package-git-docAntonio Navarro Perez2017-03-033-42/+52
|\ \ | |/ |/| improve git package documentation (fix #231)
| * Simplify Blame documentationAntonio Jesus Navarro Perez2017-03-031-25/+26
| |
| * Add full stops and keep implementation details as internal comments.Antonio Jesus Navarro Perez2017-03-033-8/+14
| |
| * improve git package documentation (fix #231)Antonio Jesus Navarro Perez2017-03-033-21/+24
| |
* | Merge pull request #299 from ajnavarro/fix/read-allSantiago M. Mola2017-03-032-5/+5
|\ \ | | | | | | Return values of Read not checked (fix #65)
| * | Return values of Read not checked (fix #65)Antonio Jesus Navarro Perez2017-03-022-5/+5
| |/
* | Merge pull request #297 from alcortesm/issue274Santiago M. Mola2017-03-0316-283/+784
|\ \ | |/ |/| issue #274: new filemode package
| * replace os.FileMode use with filemode.FileModeAlberto Cortés2017-03-0114-283/+248
| |
| * new filemode packageAlberto Cortés2017-03-012-0/+536
| |
* | Merge pull request #293 from ajnavarro/improvement/examplesMáximo Cuadros2017-03-018-2/+29
|\ \ | |/ |/| _examples: improve documentation (fix #238)
| * Fix typosAntonio Jesus Navarro Perez2017-02-282-6/+6
| |
| * _examples: improve documentationAntonio Jesus Navarro Perez2017-02-288-2/+29
| |
* | Merge pull request #294 from ajnavarro/improvement/todos-documentationSantiago M. Mola2017-03-017-16/+22
|\ \ | | | | | | Remove TODOs from documentation
| * | Remove TODOs from documentationAntonio Jesus Navarro Perez2017-02-287-16/+22
| |/
* | Merge pull request #292 from ajnavarro/improvement/revlistMáximo Cuadros2017-02-285-98/+144
|\ \ | |/ |/| plumbing/revlist: input as a slice of hashes instead of commits
| * plumbing/revlist: input as a slice of hashes instead of commitsAntonio Jesus Navarro Perez2017-02-275-98/+144
| | | | | | | | | | | | | | - Now the input of the method Objects inside revlist package is a slice of hashes instead of commits. Hashes can be from Blobs, Trees and Commits objects. - ObjectStorer now is used to obtain the object content using hashes slice. - This PR fix #222. Now a test into upload_pack_test.go file is not skipped anymore. - Remove code from remote.go and server.go that is not necessary.
* | Merge pull request #289 from ajnavarro/documentation/cacheSantiago M. Mola2017-02-273-16/+21
|\ \ | | | | | | plumbing/cache: specify units in memory size (Fix #234)
| * | plumbing/cache: specify units in memory size (Fix #234)Antonio Jesus Navarro Perez2017-02-273-16/+21
| |/
* | Merge pull request #288 from ajnavarro/documentation/plumbingMáximo Cuadros2017-02-277-11/+56
|\ \ | |/ |/| plumbing: improve documentation (Fix #242)
| * plumbing: improve documentation (Fix #242)Antonio Jesus Navarro Perez2017-02-237-11/+56
| |
* | Merge pull request #284 from ajnavarro/improvement/move-difftree-to-objectMáximo Cuadros2017-02-248-66/+67
|\ \ | | | | | | plumbing/object: move difftree to object package
| * | Added documentation to Diff methodAntonio Jesus Navarro Perez2017-02-241-0/+1
| | |
| * | plumbing/object: move difftree to object packageAntonio Jesus Navarro Perez2017-02-248-66/+66
|/ / | | | | | | | | - To avoid ciclic dependency errors, we move all the difftree files to object package. - Added Diff method to Tree object.
* | Merge pull request #287 from ajnavarro/improvement/fast-finishMáximo Cuadros2017-02-241-0/+1
|\ \ | | | | | | Add fast_finish flag to travis configuration
| * | Add fast_finish flag to travis configurationAntonio Jesus Navarro Perez2017-02-231-0/+1
| |/ | | | | | | | | | | | | This flag allows us to improve the time spent in travis test execution if: - A build job fails, the build is mark as failed immediately, not waiting to finish the rest of the jobs. - All Build jobs pass. Travis will not wait to Allowed failures jobs to mark the PR as OK.
* | Merge pull request #286 from ajnavarro/fix/reference-iteratorMáximo Cuadros2017-02-242-1/+25
|\ \ | | | | | | plumbing/storer: referenceIterator now returns the error if any
| * | plumbing/storer: referenceIterator now returns the error if anyAntonio Jesus Navarro Perez2017-02-232-1/+25
| |/
* | Merge pull request #285 from alcortesm/fix-issue-279Máximo Cuadros2017-02-243-9/+72
|\ \ | |/ |/| Fix issue 279
| * difftree: ignore permissions changes between regular filesAlberto Cortés2017-02-222-6/+45
| | | | | | | | Fix issue #279.
| * test for issue 279Alberto Cortés2017-02-222-4/+28
|/
* Fix issue 275 (edited) (#276)Alberto Cortés2017-02-228-81/+302
| | | | | | | | | Fix #275 . It was not possible to write a test for this issue as the original fsnoder didn't support filenames with length > 1. Therefore this patch has 3 commits: add support for long filenames in fsnoder. add a test case for the issue using the new long filenames from step 1. fix the issue by comparing paths level by level instead of lexigographically over the whole path.
* Merge pull request #283 from mcuadros/travisMáximo Cuadros2017-02-212-3/+3
|\ | | | | travis update to 1.8 and makefile silence commands
| * travis update to 1.8 and makefile silence commandsMáximo Cuadros2017-02-212-3/+3
| |
* | Merge pull request #282 from mcuadros/ssh-agent-fixMáximo Cuadros2017-02-212-3/+26
|\ \ | |/ |/| plumbing/transport: git, error on empty SSH_AUTH_SOCK
| * plumbing/transport: git, error on empty SSH_AUTH_SOCKMáximo Cuadros2017-02-212-3/+26
| |
* | *: update tests to meet new submodule fixtureMáximo Cuadros2017-02-213-16/+6
| |
* | plumbing/transport: client avoid panics on nil protocolMáximo Cuadros2017-02-212-16/+26
|/
* Merge pull request #278 from ajnavarro/improvement/move-cache-to-plumbingMáximo Cuadros2017-02-215-1/+1
|\ | | | | cache: move package to plumbing
| * cache: move package to plumbingAntonio Jesus Navarro Perez2017-02-215-1/+1
| | | | | | | | Because cache package is only intended to be used at internal level, we move it to the plumbing package.
* | Merge pull request #277 from ajnavarro/remove-csharedMáximo Cuadros2017-02-2112-1900/+0
|\ \ | | | | | | cshared: remove directory (Fix #236)
| * | cshared: remove directory (Fix #236)Antonio Jesus Navarro Perez2017-02-2112-1900/+0
| |/ | | | | | | If some day this code is needed, we can go back into the commit history and get it.
* | Merge pull request #270 from mcuadros/submodules-initMáximo Cuadros2017-02-2130-131/+1092
|\ \ | |/ |/| Submodules init and update
| * rebase masterMáximo Cuadros2017-02-2110-0/+2281
| |\ | |/ |/|
* | difftree for git.Trees (#273)Alberto Cortés2017-02-217-536/+1269
| | | | | | | | | | | | | | | | | | | | | | | | | | Last PR to fix #82: This PR modifies the difftree package itself. The old version extracted the files in both trees and compare them by hand. The new version turn the trees into merkletrie.Noders and call the merkletrie.Difftree function on them. How to review this PR: treenoder.go: defines the treeNoder type that wraps a git.Tree and implements merkletrie.Noder. change.go: defines the type of the output of a difftree operation. The type is the same as before, but I have moved it into its own file to keep the package organized. The old package defines the Action type too (insert, delete, modify), now, we reuse merkletrie.Action and it is no longer a field, but a method. change_adaptor.go: defines functions to turn merkletrie.Changes into difftree.Changes. difftree.go: before this patch this file holds all the logic to do a difftree, now it just turns the git.Trees into treeNoders, call merkletrie.difftree on them, and turns the resulting merkletrie.Changes into difftree.Changes. The only interesting piece of code here is that noders don't have the concept of mode (file permissions). The treenoder type codifies git.Tree modes into the merkletrie.Noder hash, so changes in the mode of a file are detected as modifications, just as the original git diff-tree command does.
* | Merge pull request #269 from smola/remove-referenceMáximo Cuadros2017-02-206-14/+206
|\ \ | | | | | | plumbing/storer: add RemoveReference
| * | plumbing/storer: add RemoveReferenceSantiago M. Mola2017-02-166-14/+206
|/ /
* | transport/file: fix race condition on test (#267)Alberto Cortés2017-02-151-45/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, the `TestClone` and `TestPush` tests of `transport/file` fail in travis. This is due to a race condition caused by an incorrect usage of `Cmd.Wait()` while reading from the output and error pipes of the command. This patch fixes the problem by using `Cmd.CombinedOutput()` instead of calling `Cmd.Start()` and `Cmd.Wait()` while reading from the output and error pipes. Details: From the `exec` package documentation: ``` Wait will close the pipe after seeing the command exit, so most callers need not close the pipe themselves; however, an implication is that it is incorrect to call Wait before all reads from the pipe have completed. For the same reason, it is incorrect to call Run when using StdoutPipe. ``` In our tests, the old `execAndGetOutput` function was creating two gorutines to read from the stderr and stdout pipes of the command and then call `Wait` on the command. This caused a race condition: when the `Wait` call finished before the gorutines have read from the pipes, they returned caused an error on `outErr`. The problem only happens sometimes on travis. To reproduce the problem locally, just add a call to time.Sleep(time.Second) to the gorutine before its `ioutil.ReadAll` call to delay them, then `Wait` will always finish before them, closing the pipes, and the gorutines will fail. The returned error detected by the test will be: ``` FAIL: server_test.go:55: ServerSuite.TestClone server_test.go:65: c.Assert(err, IsNil, Commentf("STDOUT:\n%s\nSTDERR:\n%s\n", stdout, stderr)) ... value *os.PathError = &os.PathError{Op:"read", Path:"|0", Err:0x9} ("read |0: bad file descriptor") ... STDOUT: STDERR: ```
* | merkletrie: fix const action type fuck up (#268)Alberto Cortés2017-02-142-1/+12
| | | | | | | | Action constants (Insert, Delete, Modify) have type int instead of Action. This patch make them Actions.
generated by cgit (git 2.34.1) at 2024-10-30 05:35:44 +0000