Joey Hess
8a8380f1b7
use sync command merge engine in assistant
...
To handle direct mode merging.
2012-12-25 14:10:07 -04:00
Joey Hess
cc5140d295
assistant adding of modified files in direct mode
...
Works with inotify, but I think in kqueue we don't get events
existing files that get modified.
2012-12-24 14:42:19 -04:00
Joey Hess
95db595e91
make startup scan for deleted files work in direct mode
...
git add --update cannot be used, because it'll stage typechanged direct
mode files. Intead, use ls-files to find deleted files, and stage them
ourselves.
It seems that no commit was made before when the scan staged deleted files.
(Probably masked since if files were added, a commit happened then..)
Now that I'm doing the staging, I was also able to fix that bug.
2012-12-24 14:24:13 -04:00
Joey Hess
c6d2bbe402
assistant adding of files in direct mode
2012-12-24 13:37:29 -04:00
Joey Hess
82617b92e9
move thirdparty program installation for standalone bundle into haskell program
...
This allows it to use Build.SysConfig to always install the programs
configure detected. Amoung other fixes, this ensures the right uuid
generator and checksum programs are installed.
I also cleaned up the handling of lsof's path; configure now checks for
it in PATH, but falls back to looking for it in sbin directories.
2012-12-14 16:07:59 -04:00
Joey Hess
0d50a6105b
whitespace fixes
2012-12-13 00:45:27 -04:00
Joey Hess
501ec95a27
assistant: Fix syncing to just created ssh remotes.
...
This got broken when I optimised reconnecting with remotes, to not do a
full scan if the remote was not diverged.
2012-12-06 17:15:50 -04:00
Joey Hess
551924e6be
webapp: Allow user to specify the ssh port when setting up a remote.
2012-12-06 17:09:38 -04:00
Joey Hess
99a8a5297c
--auto fixes
...
* get/copy --auto: Transfer data even if it would exceed numcopies,
when preferred content settings want it.
* drop --auto: Fix dropping content when there are no preferred content
settings.
2012-12-06 13:22:16 -04:00
Joey Hess
3fdb78a51e
assistant: Allow periods in ssh key comments.
2012-12-06 10:39:51 -04:00
Joey Hess
c59783a549
assistant: Avoid trying to drop content from remotes that don't have it.
2012-12-05 12:44:08 -04:00
Joey Hess
6c0bdc3447
typo
2012-12-05 12:32:26 -04:00
Joey Hess
e5516fc68f
avoid crashing threads that drop content if the drop crashes
2012-12-05 12:28:50 -04:00
Joey Hess
c9fd389fbf
webapp: Encryption can be disabled when setting up remotes.
2012-12-04 13:28:22 -04:00
Joey Hess
45821bd557
tweak
2012-12-02 23:10:11 -04:00
Joey Hess
4f4209b833
webapp: Added help buttons and links next to fields that require explanations.
2012-12-02 22:33:30 -04:00
Joey Hess
7b032dbbc8
webapp: Fix bad interaction between required fields and modals.
2012-12-02 17:32:54 -04:00
Joey Hess
c941523b63
webapp: Prettify error display.
2012-12-02 15:02:49 -04:00
Joey Hess
5de0215986
remove dead code
2012-12-01 15:21:24 -04:00
Joey Hess
2f50af5273
better function name
2012-12-01 15:00:03 -04:00
Joey Hess
0b6c889012
webapp: S3 and Glacier forms now have a select list of all currently-supported AWS regions.
2012-12-01 14:11:37 -04:00
Joey Hess
d2df2e52b4
remove hard link when sanity check failed
...
See http://git-annex.branchable.com/forum/dot_git_slash_annex_slash_tmp/
2012-11-29 16:54:51 -04:00
Joey Hess
3b35cde0e8
assistant: Retrival from glacier now handled.
2012-11-29 15:23:33 -04:00
Joey Hess
600beeb399
typo
2012-11-28 16:17:13 -04:00
Joey Hess
51aa988a9f
Fix broken .config/git-annex/program installed by standalone tarball.
...
It was doubly broken; both missing a slash, and containing
"runshell git-annex", while some parts of the code expected it to be a
simple path to a program. This appears to include the transfer queue
runner, and the code that starts a new assistant process when switching to
another repository in the webapp.
2012-11-28 16:09:38 -04:00
Joey Hess
8dd1d9aaf9
webapp: Defaults to sharing box.com account info with friends, allowing one-click enabling of the repository.
2012-11-28 13:31:49 -04:00
Joey Hess
6991f47e9e
avoid using Data.AssocList, which is cunningly part of hxt
2012-11-27 22:57:04 -04:00
Joey Hess
2525fefbb9
The standalone builds now unset their special path and library path variables before running the system web browser.
...
Should fix a crash reported on OSX.
2012-11-27 17:05:29 -04:00
Joey Hess
18fe34222a
allow building webapp w/o webdav
2012-11-25 14:36:24 -04:00
Joey Hess
3dfc9cadb0
simplify
2012-11-25 00:38:11 -04:00
Joey Hess
59733456ed
refactor
2012-11-25 00:27:17 -04:00
Joey Hess
495b0a898c
automatically create archive directory
2012-11-24 16:39:36 -04:00
Joey Hess
463cf58140
webapp and assistant glacier support
2012-11-24 16:30:15 -04:00
Joey Hess
c282c8b492
queue uploads when a new or renamed symlink is handled
2012-11-24 15:38:24 -04:00
Joey Hess
a5111a6d85
Amazon Glacier special remote; 100% working
2012-11-20 16:43:58 -04:00
Joey Hess
8a5eaf8c3f
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-18 13:21:32 -04:00
Joey Hess
dea2780b78
fix build with yesod-form-1.2.0
2012-11-18 13:21:19 -04:00
Joey Hess
b60d5116a9
fix warning
2012-11-18 13:04:35 -04:00
Joey Hess
70f4bed400
language CPP
2012-11-18 13:03:00 -04:00
Joey Hess
fe11b3a940
fix build with shakespeare-js-1.0.0.2
...
For no apparent reason, this version removes all useful instances of
ToJavaScript, leavind behind only an instance for Aeson.Value. Argh. Pissed
off at this arbitrary breaking change, and seriously considering dropping
this library.
2012-11-18 13:00:35 -04:00
Joey Hess
b0a76592c3
pass Text into julius
...
May fix
http://git-annex.branchable.com/bugs/3.20121112:_build_error_in_assistant/
2012-11-17 16:19:54 -04:00
Joey Hess
453587d392
UI for enabling existing webdav remotes
2012-11-17 16:10:13 -04:00
Joey Hess
7addb89dc1
webapp: support box.com
2012-11-17 15:30:11 -04:00
Joey Hess
3c039d329c
update to dav 0.1, and basic uploading is working!
2012-11-15 13:46:16 -04:00
Joey Hess
e250f6f11f
factor out Creds
2012-11-14 19:32:27 -04:00
Joey Hess
98d45cd383
use System.Timeout
...
I'd forgotten this existed!
2012-11-14 11:53:23 -04:00
Joey Hess
d468e37f46
automatic repolist updating
2012-11-13 17:50:54 -04:00
Joey Hess
c9d58a6590
Fix build of assistant without yesod.
2012-11-13 15:36:34 -04:00
Joey Hess
75dbce69e6
Show error message to user when testing XMPP creds.
2012-11-13 13:21:09 -04:00
Joey Hess
e10137b4da
upper-case first char of buddy name
2012-11-12 13:27:30 -04:00
Joey Hess
8fd78f45a2
fix build without XMPP
...
not sure if I'll keep bothering with this option
2012-11-12 01:48:15 -04:00
Joey Hess
8b22bd8831
add a yes/no confirm for xmpp pairing requests
2012-11-11 22:29:16 -04:00
Joey Hess
522e228aef
auto-accept pair requests from JIDs already paired with
2012-11-11 18:16:11 -04:00
Joey Hess
b91f07fe83
split up xmpp and local pairing UIs
2012-11-11 17:41:56 -04:00
Joey Hess
5e44ab177c
don't try to transfer data to/from XMPP remotes
...
Partition syncRemotes into ones needing git sync (ie, non-special remotes),
and ones needing data sync (ie, non-XMPP remotes).
2012-11-11 16:23:16 -04:00
Joey Hess
217eeede43
allow both one push and one receive-pack to run at the same time
...
Noticed that when pairing, sometimes both sides start to push, and the other
side sends a PushRequest, and the two deadlock, neither doing anything.
(Timeout eventually breaks this.) So, let both run at the same time.
2012-11-11 15:42:03 -04:00
Joey Hess
b44e8bb4a5
add 120 second timeout when waiting for XMPP packets
2012-11-11 13:38:28 -04:00
Joey Hess
6a0756d2fb
use trustExclude
2012-11-11 00:26:29 -04:00
Joey Hess
3f8ce7a0c5
reword alert
2012-11-10 20:52:46 -04:00
Joey Hess
f3bbe075f2
fix creation of creds directory for xmpp
2012-11-10 20:48:45 -04:00
Joey Hess
b160856297
end of xmpp pairing page encourages adding a shared cloud repository
2012-11-10 20:38:52 -04:00
Joey Hess
75048b43e2
split repository comfiguration page into several widgets
2012-11-10 17:08:43 -04:00
Joey Hess
fd22734392
show when a buddy is already paired
2012-11-10 16:36:21 -04:00
Joey Hess
41085cdc8c
set negative XMPP presence priority
...
This should help prevent git-annex clients receiving messages that
were intended for normal clients they're sharing the account with.
Changed XMPP protocol use to always send chat messages directed at the
specific client, as the negative priority blocks less directed messages.
2012-11-10 15:33:12 -04:00
Joey Hess
ec186d6369
avoid sending xmpp push notifications when not pushing to any remotes
2012-11-10 14:52:25 -04:00
Joey Hess
957e742dfc
full-on git-annex assistant syncing now works over XMPP!
...
I decided to use the fallback push mode from the beginning for XMPP, since
while it uses some ugly branches, it avoids the possibility of a normal
push failing, and needing to pull and re-push. Due to the overhead of XMPP,
and the difficulty of building such a chain of actions due to the async
implementation, this seemed reasonable.
It seems to work great!
2012-11-10 14:38:50 -04:00
Joey Hess
7a20b3f1d5
more refactoring
2012-11-10 14:01:24 -04:00
Joey Hess
0cf4c3ba9c
more nice refactoring
2012-11-10 13:00:13 -04:00
Joey Hess
7ab993ffc9
better data types allowed marvelous refactoring
2012-11-10 12:33:55 -04:00
Joey Hess
81953c2131
separate data type for push stages
...
This improves type safety.
2012-11-10 12:18:00 -04:00
Joey Hess
8b8964b523
refactor
2012-11-10 02:35:54 -04:00
Joey Hess
235f2ecb91
use a lookup table for speed
2012-11-10 02:18:19 -04:00
Joey Hess
2286032781
on second thought, do allow deferring StartingPush
...
My reasoning is that StartingPush could be received after another push
starts being received, and it would be better to respond to it afterwards
than not.
2012-11-10 01:41:28 -04:00
Joey Hess
16b2472574
refactor
2012-11-10 01:40:50 -04:00
Joey Hess
c0fab69f85
fix deferring of CanPush, and stop deferring StartingPush
2012-11-10 01:34:03 -04:00
Joey Hess
f57c2ef99e
refactor
2012-11-10 00:24:26 -04:00
Joey Hess
0f8bbcc8fd
refactor
2012-11-10 00:15:00 -04:00
Joey Hess
5fce2c013d
refactor
2012-11-10 00:09:03 -04:00
Joey Hess
341d09adc2
fix exit code propigation
2012-11-10 00:02:55 -04:00
Joey Hess
ee0958e044
refactor
2012-11-09 23:52:51 -04:00
Joey Hess
c00ecfbb83
ensure handles get closed
2012-11-09 23:27:07 -04:00
Joey Hess
3f2467f253
increase chunk size
...
XMPP has no defined message size limits, but some servers will have ad-hoc
limits. However, 4k seems safe, even after the additional bloat of base64.
That should not exceed 8k.
2012-11-09 23:21:51 -04:00
Joey Hess
4a5e758a5a
refactor
2012-11-09 23:17:47 -04:00
Joey Hess
6174c748af
refactor
2012-11-09 23:12:54 -04:00
Joey Hess
6acc4fa83f
avoid excessive debugging
2012-11-09 17:51:26 -04:00
Joey Hess
62fa648455
xmpp git push is working!
...
Various final bug fixes, and tweaks that got it working.
Currently pushes a hardcoded ref, which needs to be fixed, etc.
2012-11-09 17:40:59 -04:00
Joey Hess
1deda1db13
fix murderous typo
2012-11-09 17:33:34 -04:00
Joey Hess
47c032a748
run xmpp push actions in separate thread from xmpp client
...
Took me a while to figure out why the xmpp client was not receiving git xmpp
push messages after a push started.
2012-11-09 16:04:55 -04:00
Joey Hess
232b61e946
fix git push startup
2012-11-09 15:03:16 -04:00
Joey Hess
13547aa659
add canpush xmpp command
2012-11-09 14:34:06 -04:00
Joey Hess
82ccb385e3
use xmpp::user@host for xmpp remotes
...
Inject the required git-remote-xmpp into PATH when running xmpp git push.
Rest of the time it will not be in PATH, and git won't be able to talk to
xmpp remotes.
2012-11-09 13:35:23 -04:00
Joey Hess
29b72205bd
blog for the day
2012-11-08 19:41:36 -04:00
Joey Hess
fb3b9412e4
xmpp push control flow
...
It might even work, although nothing yet triggers XMPP pushes.
Also added a set of deferred push messages. Only one push can run at a
time, and unrelated push messages get deferred. The set will never grow
very large, because it only puts two types of messages in there, that
can only vary in the client doing the push.
2012-11-08 16:46:29 -04:00
Joey Hess
08916ef695
rename
2012-11-08 14:06:43 -04:00
Joey Hess
0238e4ba07
hooked up XMPP git push send/receive (but not yet control flow)
2012-11-08 14:04:41 -04:00
Joey Hess
950c62e6fc
data types and xml generation/parsing for xmpp push
2012-11-07 16:59:18 -04:00
Joey Hess
dbff2a1d73
better git-annex tag handling
...
Allow the tag to contain a value. Better extraction of the attribute value.
2012-11-07 15:47:30 -04:00
Joey Hess
b827afba03
rename another 'close'
2012-11-07 14:56:32 -04:00
Joey Hess
b8585a9452
NetManager is only currently used with dbus
2012-11-07 14:56:32 -04:00
Joey Hess
af44b7ec15
built IO side of xmppReceivePack
2012-11-06 16:36:44 -04:00
