summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* fix parsing of v6 unlocked fileGravatar Joey Hess2016-01-06
| | | | The newline broke this ad-hoc parser; use the normal one.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-06
|\
* | unused: Bug fix when a new file was added to the annex, and then removed ↵Gravatar Joey Hess2016-01-06
| | | | | | | | | | | | | | | | (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such. So, we need to look at both the file on disk to see if it's a annex link, and the file in the index too. lookupFile doesn't look in the index if the file is not present on disk.
* | skip fix test in unlocked v6 passGravatar Joey Hess2016-01-06
| | | | | | | | fix is not relevant for unlocked files
* | fix testGravatar Joey Hess2016-01-06
| | | | | | | | | | | | | | have to change the content of unlocked file before committing otherwise git commit will fail in v6 mode when the file was already unlocked, because no changes have been made
* | fix testGravatar Joey Hess2016-01-06
| | | | | | | | file is locked here, so use right test.
* | fix test failure locking an unlocked not present fileGravatar Joey Hess2016-01-06
| | | | | | | | | | | | | | | | In v5, that was not possible, but it is in v6, and so the test was failing. Investigating, it turns out that locking was copying the pointer file content to the annex object despite the content not being present. So, add a check to prevent that.
* | test: Added --keep-failures option.Gravatar Joey Hess2016-01-06
| |
| * Added a commentGravatar ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a96262016-01-06
|/
* whereis --json: Make url list be included in machine-parseable form.Gravatar Joey Hess2016-01-06
|
* responseGravatar Joey Hess2016-01-06
|
* (no commit message)Gravatar mark@6b90344cdab3158eacb94a3944460d138afc9bef2016-01-05
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-05
|\
* | updateGravatar Joey Hess2016-01-05
| |
* | clarify absPathFromGravatar Joey Hess2016-01-05
| | | | | | | | | | | | | | | | | | | | | | | | The repo path is typically relative, not absolute, so providing it to absPathFrom doesn't yield an absolute path. This is not a bug, just unclear documentation. Indeed, there seem to be no reason to simplifyPath here, which absPathFrom does, so instead just combine the repo path and the TopFilePath. Also, removed an export of the TopFilePath constructor; asTopFilePath is provided to construct one as-is.
* | use TopFilePath for associated filesGravatar Joey Hess2016-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes several bugs with updates of pointer files. When eg, running git annex drop --from localremote it was updating the pointer file in the local repository, not the remote. Also, fixes drop ../foo when run in a subdir, and probably lots of other problems. Test suite drops from ~30 to 11 failures now. TopFilePath is used to force thinking about what the filepath is relative to. The data stored in the sqlite db is still just a plain string, and TopFilePath is a newtype, so there's no overhead involved in using it in DataBase.Keys.
* | fix some tests of v6 unlocked filesGravatar Joey Hess2016-01-05
| |
| * removedGravatar mark@6b90344cdab3158eacb94a3944460d138afc9bef2016-01-05
| |
| * (no commit message)Gravatar felix.hagemann@b76e9ea0928cf33dacffc37ec3dbecf33171a8a52016-01-05
| |
* | Revert "Add Munin module."Gravatar Joey Hess2016-01-05
|/ | | | | | This reverts commit 85379a479663a9ef15a66a99700eb38469b5e14a. Wow, applied to wrong project entirely.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-01-05
|\
* | BF: added forgotten commas for new build-dependsGravatar Yaroslav Halchenko2016-01-05
| |
* | Add Munin module.Gravatar Jelmer Vernooij2016-01-05
| | | | | | | | Signed-off-by: Jelmer Vernooij <jelmer@jelmer.uk>
| * Added a commentGravatar CandyAngel2016-01-05
| |
| * (no commit message)Gravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-01-05
| |
| * Added a commentGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-01-05
| |
| * (no commit message)Gravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-01-05
| |
| * Added a commentGravatar umeboshi2016-01-04
| |
| * (no commit message)Gravatar sameerds2016-01-03
| |
| * Added a commentGravatar eigengrau2016-01-03
| |
| * Fix formatting (grrr)Gravatar umeboshi2016-01-02
| |
| * added ifarchive.org mirror.Gravatar umeboshi2016-01-02
| |
| * removedGravatar umeboshi2016-01-02
| |
| * Added a commentGravatar umeboshi2016-01-02
| |
| * Added a commentGravatar umeboshi2016-01-02
| |
| * (no commit message)Gravatar umeboshi2016-01-02
| |
| * Added a commentGravatar umeboshi2016-01-02
| |
| * (no commit message)Gravatar umeboshi2016-01-02
|/
* Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-01-02
|
* (no commit message)Gravatar ColinW2016-01-01
|
* Added a comment: Re Comment 1Gravatar ColinW2016-01-01
|
* devblogGravatar Joey Hess2016-01-01
|
* fixedGravatar Joey Hess2016-01-01
|
* analysisGravatar Joey Hess2016-01-01
|
* responseGravatar Joey Hess2016-01-01
|
* responseGravatar Joey Hess2016-01-01
|
* info --json: Improve json for "backend usage", using a nested object with ↵Gravatar Joey Hess2016-01-01
| | | | fields for each backend instead of the previous weird nested lists. This may break existing parsers of this json output, if there were any.
* info: Fix "backend usage" numbers, which were counting present keys twice.Gravatar Joey Hess2016-01-01
| | | | Let's just count the referenced keys for that, and not present keys at all.
* responseGravatar Joey Hess2016-01-01
|
* updateGravatar Joey Hess2016-01-01
|