mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Command
History
Joey Hess b6b34f4916
automatic conflict resolution for v6 unlocked files 
Several tricky parts:

* When the conflict is just between the same key being locked and unlocked,
  the unlocked version wins, and the file is not renamed in this case.

* Need to update associated file map when conflict resolution renames
  an unlocked file.

* git merge runs the smudge filter on the conflicting file, and actually
  overwrites the file with the same content it had before, and so
  invalidates its inode cache. This makes it difficult to know when it's
  safe to remove such files as conflict cruft, without going so far as to
  compare their entire contents.

  Dealt with this by preventing the smudge filter from populating the file
  when a merge is run. However, that also prevents the smudge filter being
  run for non-conflicting files, so eg moving a file won't put its new
  content into place.

* Ideally, if a merge or a merge conflict resolution renames an unlocked
  file, the file in the work tree can just be moved, rather than copying
  the content to a new worktree file.

  This is attempted to be done in merge conflict resolution, but
  due to git merge's behavior of running smudge filters, what actually
  seems to happen is the old worktree file with the content is deleted and
  rewritten as a pointer file, so doesn't get reused.

So, this is probably not as efficient as it optimally could be.
If that becomes a problem, could look into running the merge in a separate
worktree and updating the real worktree more efficiently, similarly to the
direct mode merge. However, the direct mode merge had a lot of bugs, and
I'd rather not use that more error-prone method unless really needed.
2015-12-29 15:41:09 -04:00
..
Add.hs finish v6 support for assistant 2015-12-22 15:23:27 -04:00
AddUnused.hs refactoring 2015-12-22 13:42:58 -04:00
AddUrl.hs Merge branch 'master' into smudge 2015-12-22 18:10:40 -04:00
Assistant.hs converted Assistant and Watch; avoid duplicate arg parsing for no repo mode 2015-07-13 11:42:42 -04:00
CheckPresentKey.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Commit.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
ConfigList.hs Use git-annex init --version=6 to get v6 for now 2015-12-15 17:17:13 -04:00
ContentLocation.hs converted ContentLocation, ExampleKey, LookupKey 2015-07-11 20:43:45 -04:00
Copy.hs missed adding allowConcurrentOutput here 2015-11-06 13:41:26 -04:00
Dead.hs convert Dead, and allow multiple --key options 2015-07-13 10:26:54 -04:00
Describe.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
DiffDriver.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Direct.hs don't let git-annex direct be run in a v6 repo 2015-12-04 16:33:09 -04:00
Drop.hs drop -Jn 2015-11-04 17:13:20 -04:00
DropKey.hs fix local dropping to not require extra locking of copies, but only that the local copy be locked for removal 2015-10-09 15:48:02 -04:00
DropUnused.hs dropunused: Make more robust when trying to drop an object that has already been dropped. 2015-12-03 15:58:00 -04:00
EnableRemote.hs enableremote: List uuids and descriptions of remotes that can be enabled, and accept either the uuid or the description in leu if the name. 2015-10-26 14:55:40 -04:00
ExamineKey.hs converted ContentLocation, ExampleKey, LookupKey 2015-07-11 20:43:45 -04:00
Expire.hs convert Expire 2015-07-10 16:26:23 -04:00
Find.hs convert FindRef 2015-07-10 20:38:11 -04:00
FindRef.hs convert FindRef 2015-07-10 20:38:11 -04:00
Fix.hs fix file perms after breaking hard link 2015-12-27 16:12:48 -04:00
Forget.hs converted Forget and TestRemote 2015-07-11 00:42:32 -04:00
FromKey.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Fsck.hs persistent-sqlite is now a hard build dependency, since v6 repository mode needs it. 2015-12-26 13:00:52 -04:00
FuzzTest.hs wip 2015-07-09 16:05:45 -04:00
GCryptSetup.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Get.hs arrange for regional output manager to run when -J is enabled 2015-11-04 16:22:43 -04:00
Group.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
GroupWanted.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Help.hs let optparse-applicative handle the usage display when run w/o command or bad command 2015-07-09 11:52:47 -04:00
Import.hs addurl, importfeed: Changed to honor annex.largefiles settings, when the content of the url is downloaded. (Not when using --fast or --relaxed.) 2015-12-02 15:12:33 -04:00
ImportFeed.hs use action, not sideAction 2015-10-11 13:29:44 -04:00
InAnnex.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Indirect.hs refactoring 2015-12-22 13:42:58 -04:00
Info.hs enableremote: List uuids and descriptions of remotes that can be enabled, and accept either the uuid or the description in leu if the name. 2015-10-26 14:55:40 -04:00
Init.hs Use git-annex init --version=6 to get v6 for now 2015-12-15 17:17:13 -04:00
InitRemote.hs Special remotes configured with autoenable=true will be automatically enabled when git-annex init is run. 2015-09-14 14:49:48 -04:00
List.hs convert List 2015-07-10 20:46:48 -04:00
Lock.hs annex.thin 2015-12-27 15:59:59 -04:00
LockContent.hs implement lockContent for ssh remotes 2015-10-09 16:55:41 -04:00
Log.hs converted Log 2015-07-13 10:44:51 -04:00
LookupKey.hs converted ContentLocation, ExampleKey, LookupKey 2015-07-11 20:43:45 -04:00
Map.hs map: Improve display of git remotes with non-ssh urls, including http and gcrypt. 2015-11-18 15:08:55 -04:00
Merge.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
MetaData.hs metadata: Fix reversion introduced in 5.20150727 that caused display of metadata to not work. 2015-08-11 13:19:01 -04:00
Migrate.hs fsck for v6 unlocked files 2015-12-11 16:07:54 -04:00
Mirror.hs arrange for regional output manager to run when -J is enabled 2015-11-04 16:22:43 -04:00
Move.hs arrange for regional output manager to run when -J is enabled 2015-11-04 16:22:43 -04:00
NotifyChanges.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
NumCopies.hs avoid using print action, which is reserved for debugging 2015-10-06 15:26:42 -04:00
PreCommit.hs annex.thin 2015-12-27 15:59:59 -04:00
Proxy.hs unused import 2015-08-05 13:25:03 -04:00
ReadPresentKey.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
RecvKey.hs add unlocked flag for git-annex-shell recvkey 2015-12-26 13:59:27 -04:00
RegisterUrl.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Reinit.hs Use git-annex init --version=6 to get v6 for now 2015-12-15 17:17:13 -04:00
Reinject.hs other 80% of avoding verification when hard linking to objects in shared repo 2015-10-02 14:35:12 -04:00
ReKey.hs refactoring 2015-12-22 13:42:58 -04:00
RemoteDaemon.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Repair.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Required.hs started converting to use optparse-applicative 2015-07-08 13:36:25 -04:00
ResolveMerge.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
RmUrl.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Schedule.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Semitrust.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
SendKey.hs add some debugs to get timings 2015-08-13 16:13:16 -04:00
SetKey.hs other 80% of avoding verification when hard linking to objects in shared repo 2015-10-02 14:35:12 -04:00
SetPresentKey.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Smudge.hs automatic conflict resolution for v6 unlocked files 2015-12-29 15:41:09 -04:00
Status.hs status: On crippled filesystems, was displaying M for all annexed files that were present. Probably caused by a change to what git status displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files. 2015-12-19 13:36:40 -04:00
Sync.hs arrange for regional output manager to run when -J is enabled 2015-11-04 16:22:43 -04:00
Test.hs wire tasty's option parser into the main program option parser 2015-07-13 13:20:10 -04:00
TestRemote.hs use action, not sideAction 2015-10-11 13:29:44 -04:00
TransferInfo.hs converted copy and move 2015-07-09 15:23:14 -04:00
TransferKey.hs Do verification of checksums of annex objects downloaded from remotes. 2015-10-01 15:56:39 -04:00
TransferKeys.hs Do verification of checksums of annex objects downloaded from remotes. 2015-10-01 15:56:39 -04:00
Trust.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Unannex.hs remove (v6) associated file in unannex 2015-12-21 18:00:48 -04:00
Undo.hs support pointer files 2015-12-07 15:35:36 -04:00
Ungroup.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Uninit.hs fix local dropping to not require extra locking of copies, but only that the local copy be locked for removal 2015-10-09 15:48:02 -04:00
Unlock.hs annex.thin 2015-12-27 15:59:59 -04:00
Untrust.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Unused.hs reorg 2015-12-15 15:34:28 -04:00
Upgrade.hs reorg 2015-12-15 15:34:28 -04:00
VAdd.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
VCycle.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Version.hs add v6; keep v5 working for now and manual upgrade 2015-12-04 16:14:48 -04:00
VFilter.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Vicfg.hs converted ViCfg (trivially) 2015-07-10 20:40:30 -04:00
View.hs use action, not sideAction 2015-10-11 13:29:44 -04:00
VPop.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Wanted.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Watch.hs converted Assistant and Watch; avoid duplicate arg parsing for no repo mode 2015-07-13 11:42:42 -04:00
WebApp.hs convert WebApp; avoid duplicate arg parsing for no repo mode 2015-07-13 11:53:42 -04:00
Whereis.hs make whereis show urls when web remote does not have content 2015-08-17 11:35:34 -04:00
XMPPGit.hs converted Assistant and Watch; avoid duplicate arg parsing for no repo mode 2015-07-13 11:42:42 -04:00