Commit graph

513 commits

Author SHA1 Message Date
Alex Hudson 524496efc9 Put in XML fragment parsing - listener now basically works over tcp 2011-06-29 23:36:18 +01:00
Alex Hudson b94e7c846a Convert JSON commands to TCP server into XML fragments. 2011-06-29 23:36:18 +01:00
Alex Hudson 2769e38866 Remove IRC listener code from TCP version 2011-06-29 23:36:18 +01:00
Alex Hudson 5fea05f84d Make tcp listener startup-able 2011-06-29 23:36:18 +01:00
Alex Hudson c385fe21ea Fix bpbb on git callout 2011-06-29 22:40:34 +01:00
Hylke Bons cfbdf98150 repo git: don't hang on huge command outputs 2011-06-29 20:45:37 +01:00
Hylke Bons de564d89ff repo: add a property that shows the currenly unsynced paths (to hook up with the badger) 2011-06-29 20:28:49 +01:00
Hylke 138e8e744f Fix nullreference exception when adding new files before starting sparkleshare 2011-06-28 20:54:47 +01:00
Hylke d3e20e22d7 repo: create watch after initial change set 2011-06-28 20:06:04 +01:00
Hylke ca762a9220 repo git: sync up initial commit 2011-06-28 20:03:10 +01:00
Alex Hudson 2e31e0094d Change 'notification' language to 'announcement' 2011-06-28 20:03:10 +01:00
Alex Hudson b27725ab72 Make listener type configurable from config file 2011-06-28 20:03:10 +01:00
Alex Hudson 7a7da66a50 Simplify some config functions, add a notification server entry 2011-06-28 20:03:10 +01:00
Hylke Bons 4018f82728 remove some TODOs 2011-06-26 02:41:00 +01:00
Hylke Bons c9b56efb3a Move translations initialization to SparkleUI and add translations to Mac UI 2011-06-26 02:00:53 +01:00
Hylke Bons a9c52ea738 note: don't push notes to read only repos 2011-06-25 22:39:53 +01:00
Hylke cd0b76bba8 fetch notes periodically 2011-08-25 16:02:34 +01:00
Hylke 7b87b1f6b9 avatars: save to buffer instead of file: less blinking of event log, simpler, so fewer bugs 2011-08-25 15:36:26 +01:00
Hylke ee51f685ef don't show a notification on new notes 2011-06-24 23:55:23 +01:00
Hylke b9eab774dc git fetch all branches 2011-06-24 23:43:11 +01:00
Hylke 52e44b2053 add note fetching line to config 2011-06-24 23:23:41 +01:00
Hylke ef292b34cc Merge branch 'master' into notes
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2011-06-24 19:13:02 +01:00
Hylke 6889b42963 Merge branch 'master' of github.com:hbons/SparkleShare 2011-06-23 15:24:08 +01:00
Hylke c5a092c8a4 repo: don't show warning statusicon upon initial commit 2011-06-23 13:56:25 +01:00
Hylke Bons 25e08545d2 continue implementing notes 2011-06-23 01:44:43 +01:00
Hylke Bons b7c9fe4431 save progress on notes 2011-06-23 01:44:43 +01:00
Hylke Bons de98e29f70 Add each note to its own namespace to avoid conflicts 2011-06-23 01:44:43 +01:00
Hylke Bons a801f68340 fix AddNote, add Note object 2011-06-23 01:44:43 +01:00
Hylke Bons 1d5dd2a8b0 make adding a note work 2011-06-23 01:44:43 +01:00
Hylke Bons f1ff61950c add AddNote method 2011-06-23 01:44:43 +01:00
Hylke Bons 75afaff2cd repo: ignore external watchers when watching is disabled 2011-06-22 16:02:38 +01:00
Hylke Bons 4574ae6056 Add a TCP based listener 2011-06-18 22:42:34 +01:00
Hylke Bons 06683678b2 Fix timzones in timestamps, again... 2011-06-15 00:34:29 +01:00
Hylke Bons 296d830917 repo: Move watcher to its own subclass 2011-06-14 23:14:03 +01:00
Hylke Bons 1d2a077b91 update NEWS and version 2011-06-14 19:08:28 +01:00
Hylke Bons 1f0d0c9da9 fetcher: create .ssh if it's not there 2011-06-14 14:48:18 +01:00
Hylke Bons 593d327660 repo base: disable watching by using the existing method instead 2011-06-14 14:25:25 +01:00
Hylke Bons 93bb772db0 repo base: disable watching when syncing down 2011-06-13 18:57:56 +01:00
Alex Hudson d139a53a3f Merge branch 'master' of https://github.com/hbons/SparkleShare 2011-06-13 13:30:11 +01:00
Alex Hudson a5cf9d3bed Attempt to merge the smartirc4net references into single build reference 2011-06-13 13:27:48 +01:00
Hylke Bons 773f940e69 repo base: make polling intervals setting a bit more readable 2011-06-12 02:56:01 +01:00
wimh 35c9c043dd fix portability issue in OnFileActivity 2011-06-12 01:53:38 +01:00
Hylke Bons 72f4052526 repo git: strip quotes from git commit message 2011-06-11 18:51:39 +01:00
Hylke Bons 4fdee4bf07 default disconnected polling interval is 3min 2011-06-11 18:51:39 +01:00
Hylke Bons c16b2cb420 Save work 2011-06-10 00:01:45 +01:00
Hylke Bons a07e0a6b8d repo: don't poll every 10sec when disconnected 2011-06-09 23:59:56 +01:00
Hylke Bons 911a1f941a changeset: Add a Folder property 2011-06-09 21:25:36 +01:00
Hylke Bons 18ec890574 repo base: poll continously even when connected (but not as frequent) 2011-06-09 21:20:57 +01:00
Hylke Bons 5b9455b73e repo base: add some properties to be used for the manual polling 2011-06-09 18:53:36 +01:00
Travis Glenn Hansen 267987763c removing is_polling completely 2011-06-09 10:21:55 -06:00
Travis Glenn Hansen e937aa168f Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
Conflicts:
	SparkleLib/SparkleConfig.cs
2011-06-09 10:20:15 -06:00
Hylke Bons 169b5dfd7a about: remove references to SparkleLib 2011-06-08 22:37:29 +01:00
Hylke Bons 1319a566f9 config: Only trim user name if it isn't null 2011-06-08 21:40:12 +01:00
Travis Glenn Hansen 1704d86b2f Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes 2011-06-07 19:39:34 -06:00
Hylke Bons f658ea2b86 Work with repos on host names with a dash in them 2011-06-08 02:04:54 +01:00
Hylke Bons 60ffd9ef7a config: never let user name be null or empty 2011-06-08 01:30:01 +01:00
Hylke Bons ae8d03ebdc listener irc: Fix race condition joining channel when not connected 2011-06-08 01:30:01 +01:00
Travis Glenn Hansen b54ac8b259 fixing upstream issue 200 2011-06-07 14:39:35 -06:00
Hylke Bons 50dd9b1a95 config: never let username be empty 2011-06-06 21:00:06 +01:00
Hylke Bons 33338c2c0c listener irc: adjust ping interval and timeout 2011-06-05 23:08:17 +01:00
Hylke Bons 9df0fd6440 Detect the correct .shh path on Windows 2011-06-05 19:59:48 +01:00
Hylke Bons 80e5343908 fetcher base: check if thread exists before disposing it 2011-06-05 17:35:22 +01:00
Hylke Bons 91bd2bff63 config: get default username depending on platform 2011-06-05 17:22:40 +01:00
Hylke Bons b3fb85c305 Move OS detection code to the backend 2011-06-05 17:07:33 +01:00
Hylke Bons efb2d2c878 Don't check for root user on non-unix systems. 2011-06-05 01:47:45 +01:00
Hylke Bons f6dac691ca controller: add a Initialize () method, instead of doing everything in the constructor 2011-06-04 18:16:00 +01:00
Hylke Bons 0458cf826d paths: Use more the more crossplatform Environment.SpecialFolder enumeration to determine used paths. 2011-06-04 15:16:32 +01:00
Hylke Bons 4d972c66d1 repo base: only emit NewChangeSet event when SyncDown was successful 2011-06-03 01:33:41 +01:00
Hylke Bons 85be7121ab Code cleanup 2011-06-03 00:35:51 +01:00
Hylke Bons 04d63c0a27 Update out of date SparkleShare tagline 2011-06-02 00:08:05 +01:00
Hylke Bons 503b02e85f listener irc: only join a channel once 2011-06-01 23:59:18 +01:00
Hylke Bons 1e91f40569 Use custom folder watcher on Mac 2011-05-31 21:02:08 +01:00
Hylke Bons 6dfab204e7 fetcher git: fix url construction 2011-05-31 18:30:28 +01:00
Hylke Bons 71b43d530a Move url forming logic to the fetcher 2011-05-31 02:28:23 +01:00
Hylke Bons bda1bc3bc4 comment out debug rule 2011-05-30 16:22:09 +01:00
Hylke Bons a941bd3b80 repo git: only disable emable watching once 2011-05-30 16:20:25 +01:00
Hylke Bons 39394de3bc listener: get announcement server url from the config file 2011-05-30 02:19:58 +01:00
Hylke Bons e2d75a57fb listener: add Dispose method 2011-05-29 20:01:56 +01:00
Hylke Bons 6298c86a36 repo git: convert commit timestamps by converting them to utc, then converting them to our timezone 2011-05-29 17:47:40 +01:00
Hylke Bons 6926638822 repo: normalise timezones for the log 2011-05-29 16:48:47 +01:00
Hylke Bons a7547f5076 repo base: don't call AnyDifferences on changes in .git or .hg 2011-05-29 13:53:09 +01:00
Hylke Bons ec6c69452a listener: move reconnect timer from repo. rename channelmessage event. add debuginfo 2011-05-29 00:52:46 +01:00
Hylke Bons 9549ae3816 repo: remove obsolete static IsRepo method 2011-05-28 20:23:33 +01:00
Hylke Bons c2cff43f46 controller, backend: determine repo backend type in a cleaner way 2011-05-28 19:29:16 +01:00
Hylke Bons 0b937a0dda config: user Unknown as default username instead of empty string 2011-05-28 17:52:50 +01:00
Hylke Bons 10ac5cbe5c config: add url as part of the folder config xml 2011-05-26 23:41:55 +01:00
Hylke Bons 109f75aee9 Fix configuration issues 2011-05-26 20:46:49 +01:00
Hylke Bons 898c685cb6 repo base: move method for consistency 2011-05-26 02:05:30 +01:00
Hylke Bons 2e075959c4 repo base: use new config scheme to get the user name's and email 2011-05-26 01:44:10 +01:00
Hylke Bons 942aecc710 Use new XML based config scheme 2011-05-25 21:46:46 +01:00
Hylke Bons cb27d3f551 Move the default backend initialisation to SparkleBackend 2011-05-25 20:24:25 +01:00
Hylke Bons 04c3aeca3b hg: fix compile error 2011-05-25 20:20:20 +01:00
Hylke Bons aa01351e2a lib: Fix makefile whitespace 2011-05-25 20:15:15 +01:00
Hylke Bons 4e6fc33e3f hg: remove some debug output 2011-05-25 20:13:26 +01:00
Hylke Bons d5ec6472fd backend: don't be inheritable explictly 2011-05-25 20:07:13 +01:00
Hylke Bons ae87d1e68b config: remove debug output 2011-05-25 19:38:25 +01:00
Hylke Bons c2d844268d config: fix RemoveFolder method 2011-05-25 19:36:43 +01:00
Hylke Bons 1f3ab4f529 save scp backend work 2011-05-25 19:33:45 +01:00
Hylke Bons f2320abc11 config: fix style 2011-05-25 01:22:02 +01:00
Hylke Bons 44572da5c7 config: throw exception whenever config file doesn't exist 2011-05-25 01:20:37 +01:00
Hylke Bons 607b347dd5 config add exception when config file is not found 2011-05-25 01:15:30 +01:00
Hylke Bons 7634b7f655 config: add a default static SparkleConfig 2011-05-25 01:00:32 +01:00
Hylke Bons 80c676de6c Add SparkleConfig class to deal with configuration 2011-05-25 00:46:55 +01:00
Hylke Bons 1288494ae5 hg: implement event logs for Mercurial 2011-05-23 21:16:21 +01:00
Hylke Bons 6779d3bdea defines: remove unused OPEN_COMMAND 2011-05-23 19:42:28 +01:00
Hylke Bons 3d286a4b60 rough Mercurial log implementation and crash fixes on empty repo 2011-05-23 04:06:07 +01:00
Hylke Bons 5a0c45bc6a repo: fix listener connecting 2011-05-23 01:18:10 +01:00
Hylke Bons 1bbf352028 don't watch for addition of ~/SparkleShare subfolders 2011-05-22 23:51:12 +01:00
Hylke Bons e881206ab9 lib: update csproj file 2011-05-22 19:22:13 +01:00
Hylke Bons bd60da2627 lib: update csproj file 2011-05-22 19:21:20 +01:00
Hylke Bons 4d6ea9d707 Do host name checking the same way in back- and frontend 2011-05-22 19:08:14 +01:00
Hylke Bons 0167aef16a repo git: turn off garbage collection by default 2011-05-22 18:54:47 +01:00
Hylke Bons 4eb8abad8d listener base: code cleanup 2011-05-22 18:52:50 +01:00
Hylke Bons 00327a1eb0 repo: set HasUnsyncedChanges to true after a resolved conflict, so we'll push them later 2011-05-22 18:49:04 +01:00
Hylke Bons 2e6d8ac33e repo, listener base: make syncdown queue handle multiple channels 2011-05-22 18:37:36 +01:00
Hylke Bons b4329eb928 repo: also announce changes after a syncup->down->up 2011-05-22 18:12:40 +01:00
Hylke Bons b1950be6ff repo base: Syncup after a SyncDownBase triggered by an initial SyncUpBase. leave it to the remote_timer to push afterwards 2011-05-22 18:06:28 +01:00
Hylke Bons b18db88b61 repo: do a full SyncUpBase after a git rebase 2011-05-22 17:51:58 +01:00
Hylke Bons 37cd521d44 add debug info 2011-05-22 16:38:34 +01:00
Hylke Bons 442dc62980 repo git: fix compile error 2011-05-22 16:29:23 +01:00
Hylke Bons 0a91597291 repo git: push changes after conflict resolution 2011-05-22 16:27:06 +01:00
Hylke Bons 0a1fa73196 repo: get the remote changes if detected on a first connect 2011-05-22 16:05:35 +01:00
Hylke Bons c9a472ee80 helpers: make debug info easier to read by using whitespace 2011-05-22 16:04:28 +01:00
Hylke Bons 7be63b07c9 repo: tweak algorithm 2011-05-22 15:46:24 +01:00
Hylke Bons 16bfce692a build: fix build system 2011-05-22 12:42:22 +01:00
Hylke Bons 3e65a4fc94 build: move backend classes into subfolders 2011-05-22 12:28:14 +01:00
Hylke Bons fbfd8885ed use shorter Hg as class names instead of Mercurial 2011-05-22 01:15:46 +01:00
Hylke Bons 359ec616f9 listener: use one connection with multiple channels per server 2011-05-22 01:02:16 +01:00
Hylke Bons 3c1c0ed4f3 Rework and abstract the backend. Add basic Mercurial support 2011-05-20 01:55:49 +01:00
Hylke Bons 2168fa2ab9 save work 2011-05-19 17:07:42 +01:00
Hylke Bons 19aca9d238 listener: only reference relevant libs 2011-05-19 16:51:49 +01:00
Hylke Bons 50473764c8 listener: fix message queueing of last rework 2011-05-19 16:44:01 +01:00
Hylke Bons 73f2b2c2dd listener: move more logic from Irc to Base 2011-05-19 16:41:46 +01:00
Hylke Bons bd5fd01533 Edited SparkleLib/SparkleListenerBase.cs via GitHub 2011-05-19 08:14:50 -07:00
Hylke Bons cf54ba0ddd repo: abstract syncdown parts 2011-05-18 23:18:11 +01:00
Hylke Bons 9a4c950823 repo: block on commands in methods instead of starting in a new thread afterwards 2011-05-18 19:57:52 +01:00
Hylke Bons e13b4d8501 repo: move some member declarations up 2011-05-18 19:31:43 +01:00
Hylke Bons 4920d4a61d repo: give more members accessors 2011-05-18 19:12:45 +01:00
Hylke Bons f45eeefbd4 repo: rename RemoteOriginUrl to the more git agnostic Url 2011-05-18 17:00:02 +01:00
Hylke Bons 685fa91e47 repo: rename and reduce number of enums in SyncStatus. ditch IsSyncing member 2011-05-18 16:34:31 +01:00
Hylke Bons 04cc6debfd repo: use accessors for HasUnsyncedChanges 2011-05-18 14:03:50 +01:00
Hylke Bons 80289b499a repo: list up to 20 changes in the commit message 2011-05-17 22:37:22 +01:00
Hylke Bons d589a79a66 repo: fix whitespace in commit messages and remove some useless debuginfo 2011-05-17 20:40:14 +01:00
Hylke Bons d544400234 repo: fix bug where the first commit hash wasn't used for the channel name 2011-05-17 13:15:44 +01:00
Hylke Bons f887b28e45 Use 'revision' instead of 'hash' 2011-05-17 11:43:02 +01:00
Hylke Bons 1eac6ea67b repo: add Status member that gets updates dynamically 2011-05-17 02:54:38 +01:00
Hylke Bons be219a85dc repo: remove IsFetching and IsPushing members 2011-05-17 02:51:25 +01:00
Hylke Bons 7e301ea1d1 repo: rename CurrentHash to Revision 2011-05-17 01:29:51 +01:00
Hylke Bons 59f3bd6e8b repo: remove CommitEndedUpEmpty event 2011-05-17 01:17:40 +01:00
Hylke Bons d1a545d65f changeset: rename DateTime to Timestamp 2011-05-17 00:59:08 +01:00
Hylke Bons 2888d269e8 build: remove obsolete SparkleEvents class 2011-05-17 00:51:43 +01:00
Hylke Bons 13f78f4a7e repo: controller: use more git agnostic naming 2011-05-17 00:49:01 +01:00
Hylke Bons 032f9dbc55 repo: replace multiple events by one SyncStatusChanged event + enum 2011-05-17 00:15:23 +01:00
Hylke Bons a858d8e537 repo: remove unused Added event 2011-05-16 23:41:35 +01:00
Hylke Bons 0951760f1d repo: remove unused Commited event handler 2011-05-16 23:30:45 +01:00
Hylke Bons ef27c2f1b5 fetcher: remove unused arguments for the events 2011-05-16 23:16:56 +01:00
Hylke Bons bba6621218 fetchergit: remove TODO 2011-05-16 21:24:51 +01:00
Hylke Bons 68fc6499c5 Split up the fetcher code into FetcherBase and FetcherGit 2011-05-16 21:19:58 +01:00
Hylke Bons d22475de81 listener: use protected members instead of public and use base.x to access them 2011-05-16 21:19:19 +01:00
Hylke Bons 7235d9fa30 repo: use the first commit hash as an id for the repo and use that as the channel name' did not match any files 2011-05-14 18:11:31 +01:00
Hylke Bons 5f36f8a9e0 Replace abstract out Listener by ListenerBase + ListenerIrc 2011-05-14 18:10:24 +01:00
Hylke Bons 17b614121c repo: push changes after resolving a conflict 2011-05-14 03:18:38 +01:00
Hylke Bons dc61820baf helpers: fix whitespace and coding style 2011-05-11 20:29:43 +01:00
Hylke Bons 79e2cda777 controller: fetcher: Use and xml based config file and add temporary migration method 2011-05-10 00:30:33 +01:00
Hylke Bons 19a1eba8dd backend: Add IsUsablePath method and adjust related TODOs 2011-05-09 00:44:40 +01:00
Hylke Bons a29f7b32bc Add new backend class and a default backend. Add backend member to repo. 2011-05-09 00:04:53 +01:00
Hylke Bons 3322e46fc9 repo: fix coding style for private members 2011-05-08 23:01:07 +01:00
Hylke Bons 7f2b555e95 events: fix more whitespace 2011-05-08 20:43:12 +01:00
Hylke Bons 3795e1e1fa events: fix whitespace 2011-05-08 20:40:08 +01:00
Hylke Bons 26dfba06e3 events: listener: code cleanup 2011-05-08 20:35:43 +01:00
Hylke Bons 26a99679a7 controller: dispose the fetcher when we're done so it can be garbage collected 2011-05-08 20:35:26 +01:00
Hylke Bons 825ea5b200 fetcher: prepare for multibackend 2011-05-08 18:25:55 +01:00
Hylke Bons 2400fa6d6f repo: add debug info about conflict type when resolving 2011-05-07 13:08:56 +01:00
Hylke Bons daad99c38b update AUTHORS, and don't go on the slippery slope of using implicit typing 2011-05-05 00:07:02 +01:00
Gabriel Burt 2e638b9b02 repo: speed up by re-using Regex objects 2011-05-04 23:33:17 +01:00
Hylke Bons f07dd48d0d fetcher: remove the Cloning prefix from the events to make more sense grammatically 2011-05-03 18:30:51 +01:00
Hylke Bons f1bafe1834 fetcher: ignore file permission changes in new checkouts 2011-05-01 17:25:42 +02:00
Hylke Bons f9b2fbe724 Fix coding style and whitespace of all of SparkleLib 2011-05-01 15:40:46 +02:00
Hylke Bons d91a922782 repo: resolve any kind of rebase conflict 2011-04-30 02:42:48 +02:00
Hylke Bons d584367340 use absolute paths to move our version of conflicting file 2011-04-29 00:32:16 +02:00
Hylke Bons f01a3b41e4 save work on conflict resolution fix 2011-04-28 13:49:14 +02:00
Hylke Bons 28aa6d2305 repo: don't fetch changes when we're busy adding files 2011-04-27 18:44:59 +02:00
Hylke Bons a8ab0a2db4 repo: add support for renames and names with spaces in FormatCommitMessage method 2011-04-27 12:04:51 +02:00
Hylke Bons 43621431d9 [repo] Add a simple notification queue when disconnected, and send them when reconnected. 2011-04-23 15:56:05 +02:00
Hylke Bons 6213b95ef1 [repo] add back empty repo check without Git# 2011-04-21 23:14:44 +02:00
Hylke Bons ff779d6932 Use unicode for standardoutput. Fixes weird characters in logs but needs the latest mono 2011-04-21 19:45:11 +02:00
Bertrand Lorentz 1e88eab334 Remove GitSharp from the build and delete submodule 2011-04-21 17:15:32 +02:00
Hylke Bons 31289e984e Uncomment out conflict event. Fixes build errors 2011-04-21 16:49:26 +02:00
Hylke Bons 780ed8e751 Remote last bits of Git# code and comment out broken conflict resolution code 2011-04-21 15:46:46 +02:00
Hylke Bons 739f06b37b Don't rely on Git# for FormatCommitMessage () 2011-04-21 14:25:28 +02:00
Hylke Bons f3a3218848 remove unneeded gitsharp.* libs 2011-04-20 16:43:10 +02:00
Hylke Bons 22bf0a821a [repo] add todo 2011-04-20 16:40:17 +02:00
Hylke Bons 8ac8fee912 [repo] don't rely on Git# for username, email and remote url 2011-04-20 16:32:34 +02:00
Hylke Bons 1d3d5fe82a [repo] don't rely on Git# Directory property 2011-04-20 16:23:02 +02:00
Hylke Bons f5f80e9a8d [repo] Fix whitespace 2011-04-20 15:02:20 +01:00
Hylke Bons 9f0b0571a9 tmp 2011-04-17 12:22:20 +01:00
Hylke Bons 4eaa233bb6 Use git command for committing instead of GitSharp 2011-04-17 00:30:57 +01:00
Hylke Bons 062d705920 Use git command for getting the current hash instead of GitSharp 2011-04-17 00:19:42 +01:00
Hylke Bons 462fd68708 [repo] pull before pushing in every situation 2011-04-15 01:28:42 +01:00
Hylke Bons 695dbaddbe [repo] get remote changes beffore pushing changes that weren't pushed due to a disconnect 2011-04-15 00:56:02 +01:00