aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* luarocks.repos: refactor repos.package_{modules,commands}Peter Melnichenko2016-11-051-25/+29
* luarocks.repos: refactor recurse_rock_manifest_treePeter Melnichenko2016-11-051-18/+16
* Merge branch 'master' into luarocks-3Peter Melnichenko2016-11-0411-191/+385
|\
| * Merge pull request #644 from mpeterv/fix-conflict-resolveHisham Muhammad2016-11-039-189/+328
| |\
| | * Fix and refactor conflict resolution on deploy/deletePeter Melnichenko2016-11-012-183/+205
| | * Add a test for conflict resolution with mixed deploy typesPeter Melnichenko2016-11-017-6/+123
| * | Use ("%q"):format() for quoting in persistPeter Melnichenko2016-11-021-1/+1
| * | Fix persist for multiline strings ending with closing bracket prefixPeter Melnichenko2016-11-021-1/+2
| * | Add a few tests for luarocks.persistPeter Melnichenko2016-11-021-0/+55
| |/
| * Correct comment to match filename.Hisham2016-11-011-1/+1
| * Use optional lpeg feature when available.Hisham2016-11-011-0/+1
| * Remove dead codeHisham2016-11-011-3/+0
* | Correct comment to match filename.Hisham2016-11-011-1/+1
* | Use optional lpeg feature when available.Hisham2016-11-011-0/+1
* | Remove dead codeHisham2016-11-011-3/+0
* | Deploy new filesHisham2016-10-311-13/+17
* | Fix merge of rocks_provided [2].Hisham2016-10-311-1/+1
* | Fix merge of rocks_provided.Hisham2016-10-311-5/+7
* | Merge branch 'new-cmd-dir' into luarocks-3Hisham2016-10-3033-346/+389
|\ \
| * \ Merge branch 'new-cmd-dir'Hisham2016-10-3078-2084/+2279
| |\ \ | | |/ | |/|
| | * Fix references to writer.make_manifestHisham2016-10-291-4/+4
| | * Fix names of modules that no longer require _cmdHisham2016-10-292-0/+0
| | * Merge branch 'luarocks-3' into new-cmd-dirHisham2016-10-295-86/+180
| | |\
| | * | Move admin commands to luarocks.admin.cmd.*; fix references to modules.Hisham2016-10-2910-35/+36
| | * | This doesn't produce an error, only a warning.Hisham2016-10-291-1/+2
| | * | Keep only command driver functions in luarocks.cmdHisham2016-10-285-1086/+36
| | * | Keep only functions shared among commandsHisham2016-10-285-312/+9
| | * | Move files that will live in base dir back.Hisham2016-10-2819-1896/+0
| | * | Duplicate files to preserve git-blameHisham2016-10-2838-0/+3286
* | | | Merge branch 'master' into luarocks-3Hisham2016-10-306-51/+86
|\| | |
| * | | Merge pull request #641 from mpeterv/missing-deps-check-changes-slurpHisham Muhammad2016-10-306-52/+87
| |\ \ \
| | * | | Get rid of repeated missing deps checksPeter Melnichenko2016-10-306-52/+87
| |/ / /
* | | | "soft-revert" support for building static libs.Hisham2016-10-292-0/+8
* | | | Fix references to writer.make_manifestHisham2016-10-291-4/+4
| |_|/ |/| |
* | | Adjust changes by @mpeterv in #638 to new locations.Hisham2016-10-292-67/+126
* | | Merge branch 'master' into luarocks-3Hisham2016-10-293-19/+54
|\| | | |/ |/|
| * Merge pull request #638 from mpeterv/remove-without-manifest-rebuildHisham Muhammad2016-10-292-64/+122
| |\
| | * Update manifest after removal without rebuildingPeter Melnichenko2016-10-282-9/+84
| | * manif.update_manifest: do not update manifest if rebuiltPeter Melnichenko2016-10-281-8/+4
| | * manif.update_manifest: load manifest as localPeter Melnichenko2016-10-281-1/+1
| | * Rename a variable in manif.update_manifestPeter Melnichenko2016-10-281-6/+6
| | * Refactor store_results in luarocks.manif (2)Peter Melnichenko2016-10-281-21/+8
| | * Refactor store_results in luarocks.manifPeter Melnichenko2016-10-281-22/+22
| * | Improve performance of manif_core.get_versionsPeter Melnichenko2016-10-291-11/+10
| |/
| * Merge pull request #637 from mpeterv/fix-win-abs-pathHisham Muhammad2016-10-282-8/+44
| |\
| | * Fix absolute path detection on WindowsPeter Melnichenko2016-10-281-8/+31
| | * Add test for #632.Hisham2016-10-281-0/+13
* | | Merge branch 'master' into luarocks-3Hisham2016-10-285-33/+40
|\| |
| * | Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-284-32/+39
| |\|
| | * Refactor windows argument quoting functionsPeter Melnichenko2016-10-281-21/+9