Joey Hess
5e1221ad53
Improve shape of commit tree when importing from unversioned special remotes
...
Make the import have the previous import as a parent, so eg `git log --stat`
displays a useful diff.
Also a minor optimisation, only calculate the depth of the imported history
once.
2019-05-21 11:32:54 -04:00
Joey Hess
5af9e7f3d0
break out a todo
2019-05-21 11:10:13 -04:00
Joey Hess
8958556fe3
thought
2019-05-16 20:41:17 -04:00
Joey Hess
24c8b1b15a
update
2019-05-14 15:25:09 -04:00
Joey Hess
a3e24ed533
more design work
2019-05-14 11:49:23 -04:00
Joey Hess
c5a61ee808
closing in on final design for this
2019-05-14 10:52:00 -04:00
Ilya_Shlyakhter
0610789285
Added a comment: checksums of remote data
2019-05-13 22:03:38 +00:00
Joey Hess
0c7569bb6f
close
2019-05-10 13:59:39 -04:00
Joey Hess
c77d79d343
close old todo
2019-05-10 13:54:32 -04:00
Joey Hess
ae562ad4d7
update old todo item with what still needs doing
...
removed old comments that are no longer relevant
2019-05-10 13:52:40 -04:00
Joey Hess
daa0c6c1c6
close old todo
2019-05-10 13:35:55 -04:00
Joey Hess
d32143e7ad
close
2019-05-10 13:34:44 -04:00
Joey Hess
ccfb800fa6
Merge branch 'master' of ssh://git-annex.branchable.com
2019-05-10 13:31:49 -04:00
Joey Hess
82186ca58f
annex.jobs=cpus etc
...
Added the ability to run one job per CPU (core), by setting annex.jobs=cpus,
or using option --jobs=cpus or -Jcpus.
Built with future expansion in mind, including not defaulting matching on
Concurrency so more constructors can later be added, and using "cpu"
instead of "0".
2019-05-10 13:27:08 -04:00
Ilya_Shlyakhter
e0c73c7f29
Added a comment
2019-05-09 21:07:39 +00:00
Ilya_Shlyakhter
5638ae9688
Added a comment
2019-05-07 00:59:31 +00:00
Joey Hess
b03e65d260
Improved locking when multiple git-annex processes are writing to the .git/index file
2019-05-06 15:15:12 -04:00
Joey Hess
4bc99e4c21
add todo
2019-05-06 14:58:59 -04:00
Joey Hess
6845c1e020
comment
2019-05-06 12:16:19 -04:00
Ilya_Shlyakhter
437fa438e3
Added a comment
2019-05-03 16:31:18 +00:00
Ilya_Shlyakhter
6535d0c1b2
Added a comment
2019-05-03 16:26:40 +00:00
Ilya_Shlyakhter
03a20b225a
Added a comment
2019-05-03 16:11:06 +00:00
Joey Hess
40c749387f
comment
2019-05-03 11:53:03 -04:00
Ilya_Shlyakhter
64bcaff016
added todo for speculate-can-get : extension of speculate-present
2019-05-03 15:34:41 +00:00
Joey Hess
700a3f2787
Merge branch 'master' into import-from-s3
2019-05-01 14:30:52 -04:00
Joey Hess
a405ae015d
remove simple fast-forward todo
...
I think the history looks nice enough without that special case.
2019-05-01 14:29:52 -04:00
Joey Hess
a32f31235a
reuse old imported commits
...
This avoids proliferation of different import commits for the same
trees, and makes the resulting git history nice.
2019-05-01 14:20:26 -04:00
Joey Hess
83a420dd66
update todo
2019-04-30 16:31:46 -04:00
Joey Hess
1503b86a14
make import tree from remote generate a merge commit
...
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.
Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.
The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.
This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
2019-04-30 16:13:21 -04:00
Joey Hess
cd5e685fd1
comment
2019-04-26 10:18:55 -04:00
Joey Hess
3e85707ccf
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-26 10:17:15 -04:00
yarikoptic
b71a1b5483
wishlist for add --json-progress
2019-04-25 16:33:19 +00:00
Joey Hess
2a6824bf9d
close
2019-04-25 10:49:55 -04:00
Joey Hess
ca385a09c1
rename problem
2019-04-24 15:52:05 -04:00
Joey Hess
5b09b016fe
update
2019-04-24 15:22:02 -04:00
Ilya_Shlyakhter
ae04ab3b91
re: backend variants that compute checksum of chunk checksums
2019-04-24 17:40:13 +00:00
Joey Hess
2d0dd34916
initial work toward correctly merging deeper import histories
...
Pure code is tested working, including with even histories that merge
several lines of development. Needs to be hooked up to git histories
next.
2019-04-23 16:34:19 -04:00
Joey Hess
48d30d8753
Merge branch 'master' into import-from-s3
2019-04-23 15:34:26 -04:00
Joey Hess
c3f5e7863c
some more todos
2019-04-23 15:34:11 -04:00
Joey Hess
8d01b00507
update status
2019-04-23 14:50:33 -04:00
Joey Hess
a42e7a012a
refuse unsafe store to unversioned exporttree with old aws version
...
I've developed a patch to aws, once it gets merged, the real version
number of aws can be filled in.
2019-04-23 14:39:30 -04:00
Joey Hess
ae21c88640
tested S3 import/export with versioned bucket
...
rename and delete working
2019-04-23 13:43:41 -04:00
Joey Hess
0c878899ea
update status
2019-04-23 13:21:38 -04:00
Ilya_Shlyakhter
4c79f2b4ac
added suggestion to use git-replace for better implement git-annex-migrate
2019-04-22 01:26:55 +00:00
Joey Hess
2f79cb4b45
versioned import from S3 is working
...
Still some bugs and two stubbed methods to implement though.
2019-04-19 15:13:49 -04:00
Joey Hess
55a5d9679a
implemented mkImportableContentsVersioned
2019-04-19 13:39:33 -04:00
Joey Hess
1968f6d9c6
designing S3 GetBucketObjectVersions to ImportableContents algo
...
I think I have a good algo now, at least poorly explained in English..
2019-04-18 16:25:04 -04:00
Joey Hess
2f740d14da
hmm
2019-04-16 13:18:59 -04:00
Joey Hess
a474304f1d
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-15 13:49:16 -04:00
Joey Hess
c0c38e986d
added renameremote command
2019-04-15 13:49:03 -04:00
