git-annex.git
9 years agoconvert TMVars that are never left empty into TVars
Joey Hess [Fri, 30 Sep 2016 23:51:16 +0000 (19:51 -0400)]
convert TMVars that are never left empty into TVars

This is probably more efficient, and it avoids mistakenly leaving them
empty.

9 years agodevblog
Joey Hess [Fri, 30 Sep 2016 19:02:27 +0000 (15:02 -0400)]
devblog

9 years agoinclude external special remote process number in debug
Joey Hess [Fri, 30 Sep 2016 18:42:48 +0000 (14:42 -0400)]
include external special remote process number in debug

Not actual pid, because System.Process does not expose that.

9 years agoallow multiple concurrent external special remote processes
Joey Hess [Fri, 30 Sep 2016 18:29:02 +0000 (14:29 -0400)]
allow multiple concurrent external special remote processes

Multiple external special remote processes for the same remote will be
started as needed when using -J.

This should not beak any existing external special remotes, because running
multiple git-annex commands at the same time could already start multiple
processes for the same external special remotes.

9 years agomove externalConfig into ExternalState
Joey Hess [Fri, 30 Sep 2016 17:36:50 +0000 (13:36 -0400)]
move externalConfig into ExternalState

Groundwork to having multiple processes running at once for an external
special remote; each needs its own externalConfig.

9 years agoremove unnecessary mvar
Joey Hess [Fri, 30 Sep 2016 17:17:49 +0000 (13:17 -0400)]
remove unnecessary mvar

9 years agodevblog
Joey Hess [Thu, 29 Sep 2016 21:17:14 +0000 (17:17 -0400)]
devblog

9 years agoMake --json-progress output be shown even when the size of a object is not known.
Joey Hess [Thu, 29 Sep 2016 20:59:48 +0000 (16:59 -0400)]
Make --json-progress output be shown even when the size of a object is not known.

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 29 Sep 2016 20:58:09 +0000 (16:58 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agosummary of progress
Joey Hess [Thu, 29 Sep 2016 20:52:35 +0000 (16:52 -0400)]
summary of progress

9 years agoAdded a comment
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Thu, 29 Sep 2016 20:45:48 +0000 (20:45 +0000)]
Added a comment

9 years agoAdd "total-size" field to --json-progress output.
Joey Hess [Thu, 29 Sep 2016 20:29:54 +0000 (16:29 -0400)]
Add "total-size" field to --json-progress output.

9 years agoOptimised git-annex branch log file timestamp parsing. 10% speedup
Joey Hess [Thu, 29 Sep 2016 18:04:53 +0000 (14:04 -0400)]
Optimised git-annex branch log file timestamp parsing. 10% speedup

This sped up git annex find --not --in web from 6.64s to 5.69s.
The optimised parser is probably more like 50% faster than the general one
it replaced.

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 29 Sep 2016 17:37:11 +0000 (13:37 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoOptimisations to git-annex branch query and setting, avoiding repeated copies of...
Joey Hess [Thu, 29 Sep 2016 17:36:48 +0000 (13:36 -0400)]
Optimisations to git-annex branch query and setting, avoiding repeated copies of the environment.

Speeds up commands like  "git-annex find --in remote" by over 50%.

Profiling showed that adjustGitEnv was 21% of the time and 37% of the
allocations of that command. It copied the environment each time with
getEnvironment.

The only repeated use of adjustGitEnv is in withIndexFile, which tends to
be run at least once per file. So, it was optimised by keeping a cache of
the environment, which can be reused.

There could be other better ways to optimise this. Maybe get the while
environment once at startup. But, then it would have to be serialized back
out each time running a child process, so I doubt that would be a net win.

It might be better to cache a version of the environment that is
pre-modified to use .git-annex/index. But, profiling doesn't show that
modifying the enviroment is taking any significant time.

9 years agofollowup
Joey Hess [Thu, 29 Sep 2016 15:33:42 +0000 (11:33 -0400)]
followup

9 years ago(no commit message)
yomguy [Thu, 29 Sep 2016 14:29:24 +0000 (14:29 +0000)]

9 years ago(no commit message)
yomguy [Thu, 29 Sep 2016 14:26:12 +0000 (14:26 +0000)]

9 years ago(no commit message)
yomguy [Thu, 29 Sep 2016 14:24:49 +0000 (14:24 +0000)]

9 years agoAdded a comment: Using gitolite 3.6.6 mirror not working with annex
git-annex@5b470e1f6ed6d30997d729f0a8b1c841dea886f1 [Wed, 28 Sep 2016 18:12:56 +0000 (18:12 +0000)]
Added a comment: Using gitolite 3.6.6 mirror not working with annex

9 years agoremove incorrect bit about multiple concurrent transfers, and improve description...
Joey Hess [Mon, 26 Sep 2016 23:19:32 +0000 (19:19 -0400)]
remove incorrect bit about multiple concurrent transfers, and improve description of protocol flow

9 years agotodo
Joey Hess [Mon, 26 Sep 2016 23:06:56 +0000 (19:06 -0400)]
todo

9 years agodevblog
Joey Hess [Mon, 26 Sep 2016 20:53:42 +0000 (16:53 -0400)]
devblog

9 years agocomment
Joey Hess [Mon, 26 Sep 2016 20:53:27 +0000 (16:53 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 26 Sep 2016 20:49:21 +0000 (16:49 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoOptimisations to time it takes git-annex to walk working tree and find files to work...
Joey Hess [Mon, 26 Sep 2016 20:47:59 +0000 (16:47 -0400)]
Optimisations to time it takes git-annex to walk working tree and find files to work on. Sped up by around 18%.

key2file and file2key were top cost centers according to profiling.
The repeated use of replace was not efficient. This new approach is quite a
lot more efficient.

This commit was sponsored by Denis Dzyubenko on Patreon.

9 years agomore profiling
Joey Hess [Mon, 26 Sep 2016 20:39:18 +0000 (16:39 -0400)]
more profiling

9 years agoprofiling
Joey Hess [Mon, 26 Sep 2016 19:49:42 +0000 (15:49 -0400)]
profiling

9 years ago(no commit message)
sven.rieke@2bfe1de15de1bb402f962e41f9e5bfc1be1cf8d1 [Sun, 25 Sep 2016 15:01:28 +0000 (15:01 +0000)]

9 years ago(no commit message)
sven.rieke@2bfe1de15de1bb402f962e41f9e5bfc1be1cf8d1 [Sun, 25 Sep 2016 15:00:18 +0000 (15:00 +0000)]

9 years ago(no commit message)
madduck [Sun, 25 Sep 2016 13:25:03 +0000 (13:25 +0000)]

9 years agoAdded a comment
PaulK [Sun, 25 Sep 2016 03:08:41 +0000 (03:08 +0000)]
Added a comment

9 years ago(no commit message)
erics [Sun, 25 Sep 2016 02:28:19 +0000 (02:28 +0000)]

9 years agoAdded a comment
erics [Sun, 25 Sep 2016 00:33:57 +0000 (00:33 +0000)]
Added a comment

9 years agoAdded a comment
PaulK [Sat, 24 Sep 2016 04:16:52 +0000 (04:16 +0000)]
Added a comment

9 years agoAdded a comment: +may be "byte-target" field? ;)
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Sat, 24 Sep 2016 02:43:22 +0000 (02:43 +0000)]
Added a comment: +may be "byte-target" field? ;)

9 years agoremove cabal.config
Joey Hess [Fri, 23 Sep 2016 15:55:02 +0000 (11:55 -0400)]
remove cabal.config

fixes cabal sdist

9 years agocleanup
Joey Hess [Fri, 23 Sep 2016 13:47:48 +0000 (09:47 -0400)]
cleanup

9 years agoadd news item for git-annex 6.20160923
Joey Hess [Fri, 23 Sep 2016 13:46:19 +0000 (09:46 -0400)]
add news item for git-annex 6.20160923

9 years agoprep release
Joey Hess [Fri, 23 Sep 2016 13:45:46 +0000 (09:45 -0400)]
prep release

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 23 Sep 2016 13:43:03 +0000 (09:43 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agouse System.Directory not Utility.Directory
Joey Hess [Thu, 22 Sep 2016 15:34:55 +0000 (11:34 -0400)]
use System.Directory not Utility.Directory

This module does not use isSymbolicLink so avoid depending on extra
Utility.* stuff, to make it more easily reused elsewhere.

9 years agoavoid needing PartialPrelude
Joey Hess [Thu, 22 Sep 2016 15:29:53 +0000 (11:29 -0400)]
avoid needing PartialPrelude

9 years agouse takeDirectory instead of parentDir
Joey Hess [Thu, 22 Sep 2016 15:25:01 +0000 (11:25 -0400)]
use takeDirectory instead of parentDir

No need for a trailing slash in the directory here, so avoid pulling in an
extra module.

9 years agoavoid using split unnecessarily
Joey Hess [Thu, 22 Sep 2016 15:22:41 +0000 (11:22 -0400)]
avoid using split unnecessarily

I'd like to get rid of all uses of Data.String.Utils eventually..

9 years agoAdded a comment: thanks for considering this!
https://anarc.at/openid/ [Thu, 22 Sep 2016 12:43:12 +0000 (12:43 +0000)]
Added a comment: thanks for considering this!

9 years agoAdded a comment: simpler use case
JasonWoof [Thu, 22 Sep 2016 00:40:08 +0000 (00:40 +0000)]
Added a comment: simpler use case

9 years agoAdded a comment
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 [Wed, 21 Sep 2016 22:49:56 +0000 (22:49 +0000)]
Added a comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 21 Sep 2016 22:02:53 +0000 (18:02 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agopin concurrent-output to a version that works on windows
Joey Hess [Wed, 21 Sep 2016 22:01:46 +0000 (18:01 -0400)]
pin concurrent-output to a version that works on windows

9 years agoRevert "stack.yaml: Update to lts-7.0 (ghc 8)"
Joey Hess [Wed, 21 Sep 2016 22:00:24 +0000 (18:00 -0400)]
Revert "stack.yaml: Update to lts-7.0 (ghc 8)"

This reverts commit e1816031037ea10c536daaf968522a1abba9082b.

This broke the i386ancient autobuilder due to its use of
--flag git-annex:XMPP --flag=git-annex:dbus

-- Failure when adding dependencies:
fdo-notify: needed ((>=0.3)), stack configuration has no specified version
(latest applicable is 0.3.1)
gnutls: needed ((>=0.1.4)), stack configuration has no specified version
(latest applicable is 0.2)
network-protocol-xmpp: needed (-any), stack configuration has no specified
version (latest applicable is 0.4.8)

OSX autobuilder also seems hosed by it, so too soon.

De-revert later..

9 years agodevblog
Joey Hess [Wed, 21 Sep 2016 21:56:50 +0000 (17:56 -0400)]
devblog

9 years agoupdate
Joey Hess [Wed, 21 Sep 2016 21:56:40 +0000 (17:56 -0400)]
update

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 21:53:59 +0000 (17:53 -0400)]
comment

9 years agoAdded a comment: re: regular ssh remote
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b [Wed, 21 Sep 2016 21:30:25 +0000 (21:30 +0000)]
Added a comment: re: regular ssh remote

9 years agoaddurl, importfeed: Improve behavior when file being added is gitignored.
Joey Hess [Wed, 21 Sep 2016 21:21:48 +0000 (17:21 -0400)]
addurl, importfeed: Improve behavior when file being added is gitignored.

9 years agoAdded a comment: re: mangling is normal
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b [Wed, 21 Sep 2016 21:12:16 +0000 (21:12 +0000)]
Added a comment: re: mangling is normal

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 20:46:45 +0000 (16:46 -0400)]
comment

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 20:37:38 +0000 (16:37 -0400)]
comment

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 20:23:41 +0000 (16:23 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 21 Sep 2016 20:15:13 +0000 (16:15 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoresponse
Joey Hess [Wed, 21 Sep 2016 20:14:11 +0000 (16:14 -0400)]
response

9 years agoresponse
Joey Hess [Wed, 21 Sep 2016 20:05:50 +0000 (16:05 -0400)]
response

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 19:58:02 +0000 (15:58 -0400)]
comment

9 years agoupdate
Joey Hess [Wed, 21 Sep 2016 19:53:34 +0000 (15:53 -0400)]
update

9 years agomerge
Joey Hess [Wed, 21 Sep 2016 19:47:37 +0000 (15:47 -0400)]
merge

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 19:39:32 +0000 (15:39 -0400)]
comment

9 years agoAdded a comment
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 [Wed, 21 Sep 2016 19:32:07 +0000 (19:32 +0000)]
Added a comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 21 Sep 2016 19:24:53 +0000 (15:24 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agofix bugs in handing of deep branches with sync and adjusted branches
Joey Hess [Wed, 21 Sep 2016 19:18:51 +0000 (15:18 -0400)]
fix bugs in handing of deep branches with sync and adjusted branches

* sync: Previously, when run in a branch with a slash in its name,
  such as "foo/bar", the sync branch was "synced/bar". That conflicted
  with the sync branch used for branch "bar", so has been changed to
  "synced/foo/bar".
* adjust: Previously, when adjusting a branch with a slash in its name,
  such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)".
  That conflicted with the adjusted branch used for branch "bar",
  so has been changed to "adjusted/foo/bar(unlocked)"
* Also, running sync in an adjusted branch did not correctly sync
  changes back to the parent branch when it had a slash in its name.
  This bug has been fixed.

Eliminate use of Git.Ref.under and Git.Ref.basename; using
Git.Ref.underBase and Git.Ref.base make everything handle deep branches
correctly.

Probably noone was adjusting deep branches, and v6 is still experimental
anyway, so I'm not going to worry about the mess that was left by that bug.

In the case of git-annex sync, using a fixed git-annex with an old unfixed
one will mean they use different sync branches for a deep branch, and so
they may stop syncing until the old one is upgraded. However, that's only
a problem when syncing between repositories without going via a central
bare repository. Added a warning about this to the CHANGELOG, but it's
probably not going to affect many people at all.

This commit was sponsored by Riku Voipio.

9 years agoAdded a comment: Pre Commit Hook
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 [Wed, 21 Sep 2016 19:20:05 +0000 (19:20 +0000)]
Added a comment: Pre Commit Hook

9 years agoimprove comment
Joey Hess [Wed, 21 Sep 2016 18:57:44 +0000 (14:57 -0400)]
improve comment

9 years agobug
Joey Hess [Wed, 21 Sep 2016 18:55:52 +0000 (14:55 -0400)]
bug

9 years agocomments
Joey Hess [Wed, 21 Sep 2016 18:29:17 +0000 (14:29 -0400)]
comments

9 years agocomment, retitle
Joey Hess [Wed, 21 Sep 2016 17:42:42 +0000 (13:42 -0400)]
comment, retitle

9 years agocomment and close
Joey Hess [Wed, 21 Sep 2016 17:32:45 +0000 (13:32 -0400)]
comment and close

9 years agoresponse
Joey Hess [Wed, 21 Sep 2016 17:22:47 +0000 (13:22 -0400)]
response

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 17:19:02 +0000 (13:19 -0400)]
comment

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 17:17:03 +0000 (13:17 -0400)]
comment

9 years agolacking problem description
Joey Hess [Wed, 21 Sep 2016 17:09:35 +0000 (13:09 -0400)]
lacking problem description

9 years agoclose
Joey Hess [Wed, 21 Sep 2016 17:06:34 +0000 (13:06 -0400)]
close

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 17:06:12 +0000 (13:06 -0400)]
comment

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 16:56:35 +0000 (12:56 -0400)]
comment

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 16:53:29 +0000 (12:53 -0400)]
comment

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 16:51:40 +0000 (12:51 -0400)]
comment

9 years agoanswer
Joey Hess [Wed, 21 Sep 2016 16:49:38 +0000 (12:49 -0400)]
answer

9 years agocomment
Joey Hess [Wed, 21 Sep 2016 16:16:52 +0000 (12:16 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 21 Sep 2016 15:58:49 +0000 (11:58 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoupdate
Joey Hess [Wed, 21 Sep 2016 15:32:40 +0000 (11:32 -0400)]
update

9 years ago(no commit message)
braiamp@5e499cae72e60f63a517d773978deffdfec35c4c [Wed, 21 Sep 2016 05:35:43 +0000 (05:35 +0000)]

9 years agoAdded a comment
PaulK [Mon, 19 Sep 2016 04:39:08 +0000 (04:39 +0000)]
Added a comment

9 years agoAdded a comment: Groups...
kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1 [Sun, 18 Sep 2016 20:35:01 +0000 (20:35 +0000)]
Added a comment: Groups...

9 years ago(no commit message)
kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1 [Sun, 18 Sep 2016 18:57:18 +0000 (18:57 +0000)]

9 years agopromote the neurodebian backport since the official backport looks like it will never...
https://anarc.at/openid/ [Sun, 18 Sep 2016 01:56:21 +0000 (01:56 +0000)]
promote the neurodebian backport since the official backport looks like it will never come

9 years ago(no commit message)
git-starter [Fri, 16 Sep 2016 14:40:49 +0000 (14:40 +0000)]

9 years agoI got the files to come back, but I don't want Android making these dumb delete-loads...
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 [Fri, 16 Sep 2016 03:03:19 +0000 (03:03 +0000)]
I got the files to come back, but I don't want Android making these dumb delete-loads-of-newly-added-stuff commits

9 years ago(no commit message)
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 [Fri, 16 Sep 2016 01:56:57 +0000 (01:56 +0000)]

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 15 Sep 2016 17:24:03 +0000 (13:24 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoinfo: Support being passed a treeish, and show info about the annexed files in it...
Joey Hess [Thu, 15 Sep 2016 16:51:00 +0000 (12:51 -0400)]
info: Support being passed a treeish, and show info about the annexed files in it similar to how a directory is handled.

9 years agoAdded a comment
Adam000 [Thu, 15 Sep 2016 16:03:42 +0000 (16:03 +0000)]
Added a comment