summaryrefslogtreecommitdiff
path: root/Command
Commit message (Collapse)AuthorAge
* add AdjBranch newtype; some simplicationsGravatar Joey Hess2016-04-09
|
* hard links on windowsGravatar Joey Hess2016-04-08
| | | | | * annex.thin and annex.hardlink are now supported on Windows. * unannex --fast now makes hard links on Windows.
* run out of tree merge with --no-ffGravatar Joey Hess2016-04-06
| | | | | | This is how direct mode does it too, and somehow, for reasons that currently escape me, this makes git merge not care if it's run with an empty work tree.
* fix auto merge conflict resolution when doing out of tree merge for adjusted ↵Gravatar Joey Hess2016-04-06
| | | | branch
* sync: Show output of git commit.Gravatar Joey Hess2016-04-05
| | | | | | Rationalle: User might have hook scripts whose output they want to see. Also, git commit output may tell the user they forgot to add a file. The output is not too ugly when there's nothing to commit.
* Merge branch 'adjustedbranch'Gravatar Joey Hess2016-03-31
|\
| * fixed merging of changes from adjusted branch + a remoteGravatar Joey Hess2016-03-31
| |
| * autoinit on upgradeGravatar Joey Hess2016-03-31
| |
| * made some progress on syncing adjusted branches, but still buggyGravatar Joey Hess2016-03-31
| |
* | log --raw-date: Use to display seconds from unix epoch.Gravatar Joey Hess2016-03-29
| |
* | log: Display time with time zone.Gravatar Joey Hess2016-03-29
| | | | | | | | Also cleaned up ugliness with zombies.
| * prevent git-annex adjust changing things out from under the daemonGravatar Joey Hess2016-03-29
| |
| * init: Automatically enter the adjusted unlocked branch when in a v6 repo on ↵Gravatar Joey Hess2016-03-29
| | | | | | | | a filesystem not supporting symlinks.
| * limit git annex adjust to v6 modeGravatar Joey Hess2016-03-29
| | | | | | | | doesn't work in v5
| * option parser for adjust commandGravatar Joey Hess2016-03-29
| |
| * Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-29
| |\ | |/ |/|
* | Correct git-annex info to include unlocked files in v6 repository.Gravatar Joey Hess2016-03-14
| | | | | | | | | | | | | | | | | | | | | | An unlocked present file does not have a pointer file in the worktree, so info skipped counting it. It may be that unused was also affected by the problem, but it seemed not to be in my tests. I think because of the use of the associatedFilesFilter. This fix slows down both info and unused a little bit, since they have to query the contents of files from git, but only when handling unlocked files.
| * implement another adjustment -- easy to do now!Gravatar Joey Hess2016-03-11
| |
| * Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-11
| |\ | |/ |/|
* | remove redundant start messageGravatar Joey Hess2016-03-09
| |
* | refactorGravatar Joey Hess2016-03-09
| |
* | dropkey --jsonGravatar Joey Hess2016-03-06
| |
* | dropkey: Add --batch.Gravatar Joey Hess2016-03-06
| |
* | Merge branch 'no-cbits'Gravatar Joey Hess2016-03-05
|\ \
| | * working toward adjusted commit propigationGravatar Joey Hess2016-03-03
| | |
| | * push original branch, not adjusted branchGravatar Joey Hess2016-03-03
| | |
| | * fix bug introduced in recent commitGravatar Joey Hess2016-02-29
| | |
| | * update sync branch to the orig branch when in adjusted branchGravatar Joey Hess2016-02-29
| | |
| | * make assistant aware of adjusted branches when mergingGravatar Joey Hess2016-02-29
| | |
| | * make sync aware of adjusted branchesGravatar Joey Hess2016-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, it will pull and push the original branch, not the adjusted one. And, for merging, it will use updateAdjustedBranch (not implemented yet). Note that remaining uses of Git.Branch.current need to be checked too; for things that should act on the original branch, and not the adjusted branch.
| | * Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-02-29
| | |\ | |_|/ |/| |
* | | metadata: Added -r to remove all current values of a field.Gravatar Joey Hess2016-02-29
| | |
* | | use DelMeta to unset tagGravatar Joey Hess2016-02-29
| | | | | | | | | | | | No behavior change, just simplification.
| | * adjusted branches, proof of conceptGravatar Joey Hess2016-02-25
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git annex adjust" may be a temporary interface, but works for a proof of concept. It is pretty fast at creating the adjusted branch. The main overhead is injecting pointer files. It might be worth optimising that by reusing the symlink target as the pointer file content. When I tried to do that, the problem was that the clean filter doesn't use that same format, and so git thought files had changed. Could be dealt with, perhaps make the clean filter use symlink format for pointer files when on an adjusted branch? But the real overhead is in checking out the branch, when git runs the smudge filter once per file. That is perhaps too slow to be usable, although it may only affect initial checkout of the branch, and not updates. TBD.
* | info: Mention when run in a dead repository.Gravatar Joey Hess2016-02-19
| |
* | fsck: When the only copy of a file is in a dead repository, mention the ↵Gravatar Joey Hess2016-02-19
| | | | | | | | repository.
* | annex.addunlockedGravatar Joey Hess2016-02-16
| | | | | | | | | | | | | | * add, addurl, import, importfeed: When in a v6 repository on a crippled filesystem, add files unlocked. * annex.addunlocked: New configuration setting, makes files always be added unlocked. (v6 only)
| * move old ghc compat code into separate module; eliminate WITH_CLIBSGravatar Joey Hess2016-02-15
|/ | | | | This avoids hsc2hs being run except when building for the old version of ghc. Should speed up builds.
* fsck: Populate unlocked files in v6 repositories whose content is present in ↵Gravatar Joey Hess2016-02-14
| | | | | | annex/objects but didn't reach the work tree. This also handles fixing up after f9dfeaf801da2e4d5879b3de5895dc3cef68a329
* fsck: Detect and fix missing associated file mappings in v6 repositories.Gravatar Joey Hess2016-02-14
| | | | | This also handles fixing up after the bad data written by f9dfeaf801da2e4d5879b3de5895dc3cef68a329.
* files with only 1 linkCount may still be unlockedGravatar Joey Hess2016-02-14
| | | | When on crippled filesystem, or without annex.thin set.
* clean upGravatar Joey Hess2016-02-14
|
* avoid --batch crashing if a remote fails to be accessedGravatar Joey Hess2016-02-12
|
* checkpresentkey: Allow to be run without an explicit remote and add --batchGravatar Joey Hess2016-02-12
| | | | | * checkpresentkey: Allow to be run without an explicit remote. * checkpresentkey: Added --batch.
* matchexpression: Added --largefiles option to parse an annex.largefiles ↵Gravatar Joey Hess2016-02-03
| | | | expression.
* Limit annex.largefiles parsing to the subset of preferred content ↵Gravatar Joey Hess2016-02-03
| | | | | | expressions that make sense in its context. So, not "standard" or "lackingcopies", etc.
* annex.largefiles can be configured in .gitattributes tooGravatar Joey Hess2016-02-02
| | | | | This is particulary useful for v6 repositories, since the .gitattributes configuration will apply in all clones of the repository.
* Fix reversion in lookupkey, contentlocation, and examinekey which caused ↵Gravatar Joey Hess2016-01-29
| | | | them to sometimes output side messages.
* annex.addsmallfiles: New option controlling what is done when adding files ↵Gravatar Joey Hess2016-01-28
| | | | not matching annex.largefiles.
* Ord constraint redundantGravatar Gabor Greif2016-01-28
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 00:11:08 +0000