Commit graph

432 commits

Author SHA1 Message Date
Hylke Bons d47435573c listener: move reconnect timer from repo. rename channelmessage event. add debuginfo 2011-05-29 00:52:46 +01:00
Hylke Bons aab6e36e4d repo: remove obsolete static IsRepo method 2011-05-28 20:23:33 +01:00
Hylke Bons ad0fa98e6b controller, backend: determine repo backend type in a cleaner way 2011-05-28 19:29:16 +01:00
Hylke Bons de0a53e60e config: user Unknown as default username instead of empty string 2011-05-28 17:52:50 +01:00
Hylke Bons 857cf4e57d config: add url as part of the folder config xml 2011-05-26 23:41:55 +01:00
Hylke Bons 865582eef6 Fix configuration issues 2011-05-26 20:46:49 +01:00
Hylke Bons 160485cff7 repo base: move method for consistency 2011-05-26 02:05:30 +01:00
Hylke Bons 800f70b3ac repo base: use new config scheme to get the user name's and email 2011-05-26 01:44:10 +01:00
Hylke Bons fe1628ce2d Use new XML based config scheme 2011-05-25 21:46:46 +01:00
Hylke Bons aa25e37933 Move the default backend initialisation to SparkleBackend 2011-05-25 20:24:25 +01:00
Hylke Bons b14814c60a hg: fix compile error 2011-05-25 20:20:20 +01:00
Hylke Bons cd114ab82f lib: Fix makefile whitespace 2011-05-25 20:15:15 +01:00
Hylke Bons d538cb668a hg: remove some debug output 2011-05-25 20:13:26 +01:00
Hylke Bons 4c764816e3 backend: don't be inheritable explictly 2011-05-25 20:07:13 +01:00
Hylke Bons 9a38781691 config: remove debug output 2011-05-25 19:38:25 +01:00
Hylke Bons 91553a0884 config: fix RemoveFolder method 2011-05-25 19:36:43 +01:00
Hylke Bons a288b706a7 save scp backend work 2011-05-25 19:33:45 +01:00
Hylke Bons 5e0742f30e config: fix style 2011-05-25 01:22:02 +01:00
Hylke Bons 67cfffc4d4 config: throw exception whenever config file doesn't exist 2011-05-25 01:20:37 +01:00
Hylke Bons 83ca2008e8 config add exception when config file is not found 2011-05-25 01:15:30 +01:00
Hylke Bons d66a075b91 config: add a default static SparkleConfig 2011-05-25 01:00:32 +01:00
Hylke Bons c75b081eff Add SparkleConfig class to deal with configuration 2011-05-25 00:46:55 +01:00
Hylke Bons 803e551dca hg: implement event logs for Mercurial 2011-05-23 21:16:21 +01:00
Hylke Bons 0bc64a297b defines: remove unused OPEN_COMMAND 2011-05-23 19:42:28 +01:00
Hylke Bons 7977ce90c0 rough Mercurial log implementation and crash fixes on empty repo 2011-05-23 04:06:07 +01:00
Hylke Bons fcef8df9c1 repo: fix listener connecting 2011-05-23 01:18:10 +01:00
Hylke Bons 866f97908a don't watch for addition of ~/SparkleShare subfolders 2011-05-22 23:51:12 +01:00
Hylke Bons cda21e52a4 lib: update csproj file 2011-05-22 19:22:13 +01:00
Hylke Bons b496d5c774 lib: update csproj file 2011-05-22 19:21:20 +01:00
Hylke Bons 5b064f065b Do host name checking the same way in back- and frontend 2011-05-22 19:08:14 +01:00
Hylke Bons e307bf0ebe repo git: turn off garbage collection by default 2011-05-22 18:54:47 +01:00
Hylke Bons 5002e19fa0 listener base: code cleanup 2011-05-22 18:52:50 +01:00
Hylke Bons 3a42d1c1de 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 09a8fb6021 repo, listener base: make syncdown queue handle multiple channels 2011-05-22 18:37:36 +01:00
Hylke Bons ee2f21f2ac repo: also announce changes after a syncup->down->up 2011-05-22 18:12:40 +01:00
Hylke Bons cdefa6dc95 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 3efe9060c2 repo: do a full SyncUpBase after a git rebase 2011-05-22 17:51:58 +01:00
Hylke Bons f93983bd57 add debug info 2011-05-22 16:38:34 +01:00
Hylke Bons d78ad40397 repo git: fix compile error 2011-05-22 16:29:23 +01:00
Hylke Bons a6735b7cdb repo git: push changes after conflict resolution 2011-05-22 16:27:06 +01:00
Hylke Bons 3b9cb28fea repo: get the remote changes if detected on a first connect 2011-05-22 16:05:35 +01:00
Hylke Bons aaabfe7bb1 helpers: make debug info easier to read by using whitespace 2011-05-22 16:04:28 +01:00
Hylke Bons 8a35a4a490 repo: tweak algorithm 2011-05-22 15:46:24 +01:00
Hylke Bons f8f7ffa88a build: fix build system 2011-05-22 12:42:22 +01:00
Hylke Bons 1da17be25d build: move backend classes into subfolders 2011-05-22 12:28:14 +01:00
Hylke Bons 7c3c5edd13 use shorter Hg as class names instead of Mercurial 2011-05-22 01:15:46 +01:00
Hylke Bons fd3e0b5191 listener: use one connection with multiple channels per server 2011-05-22 01:02:16 +01:00
Hylke Bons 749d83c832 Rework and abstract the backend. Add basic Mercurial support 2011-05-20 01:55:49 +01:00
Hylke Bons 0826a8287d save work 2011-05-19 17:07:42 +01:00
Hylke Bons e8dfc7b940 listener: only reference relevant libs 2011-05-19 16:51:49 +01:00
Hylke Bons ccf21a658b listener: fix message queueing of last rework 2011-05-19 16:44:01 +01:00
Hylke Bons 88c9ae7c91 listener: move more logic from Irc to Base 2011-05-19 16:41:46 +01:00
Hylke Bons 9ca01e6633 Edited SparkleLib/SparkleListenerBase.cs via GitHub 2011-05-19 08:14:50 -07:00
Hylke Bons 500313cf21 repo: abstract syncdown parts 2011-05-18 23:18:11 +01:00
Hylke Bons 5ca058862a repo: block on commands in methods instead of starting in a new thread afterwards 2011-05-18 19:57:52 +01:00
Hylke Bons 483a5b9a72 repo: move some member declarations up 2011-05-18 19:31:43 +01:00
Hylke Bons e81d1111d0 repo: give more members accessors 2011-05-18 19:12:45 +01:00
Hylke Bons 7f1fa32ec7 repo: rename RemoteOriginUrl to the more git agnostic Url 2011-05-18 17:00:02 +01:00
Hylke Bons 0081abe588 repo: rename and reduce number of enums in SyncStatus. ditch IsSyncing member 2011-05-18 16:34:31 +01:00
Hylke Bons 5c46430b72 repo: use accessors for HasUnsyncedChanges 2011-05-18 14:03:50 +01:00
Hylke Bons dd4e020da2 repo: list up to 20 changes in the commit message 2011-05-17 22:37:22 +01:00
Hylke Bons 8849ad849e repo: fix whitespace in commit messages and remove some useless debuginfo 2011-05-17 20:40:14 +01:00
Hylke Bons dd7491be5d 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 706885a615 Use 'revision' instead of 'hash' 2011-05-17 11:43:02 +01:00
Hylke Bons c1b7c6b064 repo: add Status member that gets updates dynamically 2011-05-17 02:54:38 +01:00
Hylke Bons 2ff19486c3 repo: remove IsFetching and IsPushing members 2011-05-17 02:51:25 +01:00
Hylke Bons e55a5a8e76 repo: rename CurrentHash to Revision 2011-05-17 01:29:51 +01:00
Hylke Bons aa31b9934a repo: remove CommitEndedUpEmpty event 2011-05-17 01:17:40 +01:00
Hylke Bons 6b154f9e2f changeset: rename DateTime to Timestamp 2011-05-17 00:59:08 +01:00
Hylke Bons 7be4718324 build: remove obsolete SparkleEvents class 2011-05-17 00:51:43 +01:00
Hylke Bons cc975eab80 repo: controller: use more git agnostic naming 2011-05-17 00:49:01 +01:00
Hylke Bons ba2e74928e repo: replace multiple events by one SyncStatusChanged event + enum 2011-05-17 00:15:23 +01:00
Hylke Bons 3a21d4e5b2 repo: remove unused Added event 2011-05-16 23:41:35 +01:00
Hylke Bons 39b12f6d0b repo: remove unused Commited event handler 2011-05-16 23:30:45 +01:00
Hylke Bons 2a092c1ad9 fetcher: remove unused arguments for the events 2011-05-16 23:16:56 +01:00
Hylke Bons 0a2b664e51 fetchergit: remove TODO 2011-05-16 21:24:51 +01:00
Hylke Bons 3be31fbcb6 Split up the fetcher code into FetcherBase and FetcherGit 2011-05-16 21:19:58 +01:00
Hylke Bons c7f5545886 listener: use protected members instead of public and use base.x to access them 2011-05-16 21:19:19 +01:00
Hylke Bons 8829c2145e 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 9d3fd8888d Replace abstract out Listener by ListenerBase + ListenerIrc 2011-05-14 18:10:24 +01:00
Hylke Bons 9707481f42 repo: push changes after resolving a conflict 2011-05-14 03:18:38 +01:00
Hylke Bons 9fc70ac197 helpers: fix whitespace and coding style 2011-05-11 20:29:43 +01:00
Hylke Bons 4cb799c08e controller: fetcher: Use and xml based config file and add temporary migration method 2011-05-10 00:30:33 +01:00
Hylke Bons ae20120723 backend: Add IsUsablePath method and adjust related TODOs 2011-05-09 00:44:40 +01:00
Hylke Bons d7b488f2ff Add new backend class and a default backend. Add backend member to repo. 2011-05-09 00:04:53 +01:00
Hylke Bons 7dcd1c9745 repo: fix coding style for private members 2011-05-08 23:01:07 +01:00
Hylke Bons a42292cbe9 events: fix more whitespace 2011-05-08 20:43:12 +01:00
Hylke Bons dc0b047cf8 events: fix whitespace 2011-05-08 20:40:08 +01:00
Hylke Bons 0d9de8bc0b events: listener: code cleanup 2011-05-08 20:35:43 +01:00
Hylke Bons 4e9e766499 controller: dispose the fetcher when we're done so it can be garbage collected 2011-05-08 20:35:26 +01:00
Hylke Bons 3a240ce864 fetcher: prepare for multibackend 2011-05-08 18:25:55 +01:00
Hylke Bons 93c55170af repo: add debug info about conflict type when resolving 2011-05-07 13:08:56 +01:00
Hylke Bons 5b7566898f update AUTHORS, and don't go on the slippery slope of using implicit typing 2011-05-05 00:07:02 +01:00
Gabriel Burt 281870f8df repo: speed up by re-using Regex objects 2011-05-04 23:33:17 +01:00
Hylke Bons f40f2d80b9 fetcher: remove the Cloning prefix from the events to make more sense grammatically 2011-05-03 18:30:51 +01:00
Hylke Bons f4ace4ea9e fetcher: ignore file permission changes in new checkouts 2011-05-01 17:25:42 +02:00
Hylke Bons 8584604677 Fix coding style and whitespace of all of SparkleLib 2011-05-01 15:40:46 +02:00
Hylke Bons 11928a211b repo: resolve any kind of rebase conflict 2011-04-30 02:42:48 +02:00
Hylke Bons cafa0f9a35 use absolute paths to move our version of conflicting file 2011-04-29 00:32:16 +02:00
Hylke Bons 9ab60210e7 save work on conflict resolution fix 2011-04-28 13:49:14 +02:00
Hylke Bons 4131958a0e repo: don't fetch changes when we're busy adding files 2011-04-27 18:44:59 +02:00
Hylke Bons ef89629e7c repo: add support for renames and names with spaces in FormatCommitMessage method 2011-04-27 12:04:51 +02:00
Hylke Bons 7bcefc9831 [repo] Add a simple notification queue when disconnected, and send them when reconnected. 2011-04-23 15:56:05 +02:00
Hylke Bons e609c0b3a4 [repo] add back empty repo check without Git# 2011-04-21 23:14:44 +02:00
Hylke Bons 949e2ed464 Use unicode for standardoutput. Fixes weird characters in logs but needs the latest mono 2011-04-21 19:45:11 +02:00
Bertrand Lorentz 111bef36d8 Remove GitSharp from the build and delete submodule 2011-04-21 17:15:32 +02:00
Hylke Bons aef32e64ab Uncomment out conflict event. Fixes build errors 2011-04-21 16:49:26 +02:00
Hylke Bons 34983c28e7 Remote last bits of Git# code and comment out broken conflict resolution code 2011-04-21 15:46:46 +02:00
Hylke Bons c6d189f028 Don't rely on Git# for FormatCommitMessage () 2011-04-21 14:25:28 +02:00
Hylke Bons 1c5e05685a remove unneeded gitsharp.* libs 2011-04-20 16:43:10 +02:00
Hylke Bons 493e39dabe [repo] add todo 2011-04-20 16:40:17 +02:00
Hylke Bons 97f419666d [repo] don't rely on Git# for username, email and remote url 2011-04-20 16:32:34 +02:00
Hylke Bons 8a93f69892 [repo] don't rely on Git# Directory property 2011-04-20 16:23:02 +02:00
Hylke Bons d7b2a3ed08 [repo] Fix whitespace 2011-04-20 15:02:20 +01:00
Hylke Bons 780d8ccc61 tmp 2011-04-17 12:22:20 +01:00
Hylke Bons dc11211a00 Use git command for committing instead of GitSharp 2011-04-17 00:30:57 +01:00
Hylke Bons 9604be2a53 Use git command for getting the current hash instead of GitSharp 2011-04-17 00:19:42 +01:00
Hylke Bons d4bdea0be6 [repo] pull before pushing in every situation 2011-04-15 01:28:42 +01:00
Hylke Bons 42f461b507 [repo] get remote changes beffore pushing changes that weren't pushed due to a disconnect 2011-04-15 00:56:02 +01:00
Hylke Bons 4c9216a8a2 Fix quit method 2011-03-27 13:56:36 +01:00
Hylke Bons 68f0610979 [repo] Fix the GetCommits regex to also parse GMT-n timezones 2011-03-24 00:50:08 +00:00
Hylke Bons 1e4ef90ef5 [paths] change the way git lookup is done 2011-03-23 23:14:50 +00:00
Hylke Bons 6410633c12 Merge branch 'master' of ssh://github.com/hbons/SparkleShare 2011-03-22 22:50:25 +00:00
Hylke Bons 7a722f52be [lib] Allow disabling of central notification server and fallback to own 2011-03-22 13:44:52 +00:00
Hylke Bons c983d4a067 [osx] quickly fix the git path 2011-03-20 19:24:57 +00:00
Hylke Bons 3cb52d217b [commit] remove unneeded member 2011-03-20 16:26:56 +00:00
Hylke Bons 5959f1db5f [log] remove 'IsFileDump' workaround and move message code to controller 2011-03-20 14:59:35 +00:00
Hylke Bons 6c5bf06558 New thread + spinner instead of freeze when opening big logs 2011-03-16 15:13:14 +00:00
Hylke Bons 0dfac3279f Show menu item icons on Fedora too 2011-03-16 00:01:37 +00:00
Hylke Bons 53eca6e848 [watcher] ignore files in .git/ 2011-03-13 22:26:01 +00:00
Hylke Bons 538bdf0dd0 Fix notifications 2011-03-13 02:07:47 +00:00
Hylke Bons 10b05898dd [statusicon] update icons and add icons for pressed state syncing animation 2011-03-13 01:21:49 +00:00
Hylke Bons d79fcce3a2 [osx] Pop up a warning when the backend (git) isn't found. 2011-03-13 00:15:19 +00:00
Hylke Bons be2edd8866 Fix cloning problem and better debuginfo 2011-03-12 19:39:42 +00:00
Hylke Bons db0af9dbda [repo] add todo 2011-03-12 18:58:04 +00:00
Hylke Bons c000f8cb0c Use SparkleLib.IsRepo for folder checking 2011-03-12 18:36:03 +00:00
Hylke Bons e8ae8198ff Merge branch 'fetcher-fix'
Conflicts:
	SparkleLib/SparkleFetcher.cs
2011-03-12 17:58:53 +00:00
Hylke Bons fa4e7dd368 [fetcher] Fix InstallConfiguration method 2011-03-12 17:53:49 +00:00
Hylke Bons ced6065c18 [fetcher] no need to keep error message in memory 2011-03-12 16:18:36 +00:00
Hylke Bons b1bd01b86a Merge branch 'master' of https://github.com/palango/SparkleShare into palango-master 2011-03-12 16:10:24 +00:00
Hylke Bons 4fb08eae64 [fetcher] set core.ignorecase to false for each folder 2011-03-12 15:38:49 +00:00
Hylke Bons 68d7d99f1e [repo] quick fix to re-push changes after encountering a non fast-forward to origin master 2011-03-09 06:23:24 -08:00
Hylke Bons b4d2b47cb7 Add SparkleAbout to .csproj 2011-03-08 23:55:21 +00:00
Hylke Bons d5dced649b [repo] align regexes 2011-03-06 15:29:36 +00:00
Paul Lange 9f31bc23e2 Add some error messages 2011-03-06 16:07:16 +01:00
Hylke Bons c67277c079 [listener] Use SparkleShare's dedicated notification server instead of irc.gnome.org 2011-03-04 18:31:02 +00:00
Hylke Bons 03db068505 Add some TODO's 2011-03-04 17:03:29 +00:00
Hylke Bons 0d867a8c30 [repo] Not everything is file dumping 2011-03-04 16:50:41 +00:00
Hylke Bons 5e84a9cfe0 Fix hang on commit logs > 4096 bytes 2011-03-04 15:57:22 +00:00
Hylke Bons 17d07bb2eb [repo] Replace gitsharp's AnyDifferences by own implementation 2011-03-04 14:01:29 +00:00
Hylke Bons 91f629b5d5 [fetcher] Ignore Omnigraffle autosave files 2011-03-04 05:30:11 -08:00
Hylke Bons 4e62d010e8 Remove NotifySsharp from solution 2011-03-04 09:05:15 +00:00
Hylke Bons 5a055597d5 remove debug line 2011-03-03 12:08:50 +00:00
Hylke Bons 7431e49fc9 Support showing merge commits in logs (and fix crashes caused by them being missing) 2011-03-03 12:06:25 +00:00
Hylke Bons 9c5a38f352 [repo] fix crash caused by GetCommits(n) returning n-1 entries 2011-03-02 22:07:05 +00:00
Hylke Bons b22fabf5c6 [repo] also push changes the user makes whilst we're syncing 2011-03-02 21:20:25 +00:00
Hylke Bons a8b0fc1a3e remove some leftover debug messages 2011-03-02 00:24:18 +00:00
Hylke Bons 9375f2706c [repo] Fix NewCommit event not being fired 2011-03-01 23:42:00 +00:00
Hylke Bons dc521e4ffd [notifications] Reconnect to the IRC server after a disconnect 2011-03-01 23:13:43 +00:00
Hylke Bons a35b203406 Redo GetCommits method withoug GitSharp. hopefully solves memory problem 2011-02-27 18:50:42 +00:00
Hylke Bons c717d5efb1 change wording a bit 2011-02-27 01:01:13 +00:00
Hylke Bons 51c0de4d5c Tweak irc notifications 2011-02-27 00:53:14 +00:00
Hylke Bons fa3997beff [repo] Make time from event to push 5x shorter by using folder size checking 2011-02-26 23:57:48 +00:00
Hylke Bons 8d5cf4ab5d [repo] only rely on exclude rules to add/ignore changes 2011-02-26 18:46:08 +00:00
Hylke Bons 53294eb351 [repo] massive cleanup, use GitSharp and SparkleGit 2011-02-26 14:20:32 +00:00
Hylke Bons de69954bc0 [listener] use a SHA-1 sum for the nick so no user info is shared 2011-02-24 01:43:06 +00:00
Hylke Bons 11589748c4 [repo] state is polling when checking for remote changes 2011-02-24 01:42:13 +00:00
Hylke Bons 5ad2d09851 [repo] Fix compilation issue 2011-02-23 01:13:54 +00:00
Hylke Bons 0e0bc1c062 [repo] forgot to create commit message before rebasing 2011-02-23 00:21:30 +00:00
Hylke Bons d07d6c71cd [repo] Always commit before rebasing fetched changes in case something changed 2011-02-23 00:09:44 +00:00
Hylke Bons ad2c87356f [paths] look for git using whereis 2011-02-22 22:58:01 +00:00
Hylke Bons c02ec224f1 [repo] Fix pushing bug 2011-02-13 00:02:07 +00:00
Hylke Bons fe0e951d0e [log] Add a default buddy icon and prettify the event log 2011-02-13 00:02:06 +00:00
Hylke Bons f412b6e9b9 [repo] Run 'git gc' about every 10 commits 2011-02-13 00:02:06 +00:00
Hylke Bons b0a7fd8892 [fetcher] Add more handy exclude rules 2011-02-12 23:55:27 +00:00
Hylke Bons f274ffac4d [controller] Disable SSH host key checking temporarily for cloning 2011-02-06 01:10:15 +00:00
Hylke Bons 2e8715fb13 Merge branch 'master' of https://github.com/kristi/SparkleShare into integration 2011-02-05 16:35:47 +00:00
Hylke Bons d959a5a78f [fetcher] adjust gitignore that is to be added adter cloning 2011-02-05 16:22:38 +00:00
Kristi 90b009ddf7 Start processes after adding delegates to avoid duplicate pull messages. 2011-02-01 23:39:50 -08:00
Kristi 48b1d956b1 Fix whitespace 2011-02-01 01:38:56 -08:00
Kristi e7ed9e04c4 Fix bug when syncing a empty repository with no commits 2011-02-01 01:20:30 -08:00
Hylke Bons 7e8d155715 [osx] Hook things up 2010-12-18 01:01:43 +01:00
Łukasz Jernaś 52ef7f8bf1 Get data root dif info from configure
Also fixes the path to the about dialog pixmap.
2010-12-02 22:31:35 +01:00
Hylke Bons 2b274c6140 [paths] Add a SparklePath for git 2010-11-27 21:24:34 +00:00
Hylke Bons e6f16e640b [repo] Combine paths properly 2010-11-27 21:24:34 +00:00
Hylke Bons 9d8ec7bf88 [controller] Make OpenSparkleShareFolder abstract and implement a linux version 2010-11-27 21:24:34 +00:00
Hylke Bons b95e8eae11 [repo] clean up comment a bit 2010-11-27 21:24:34 +00:00
wimh 9c2c6b2be0 fix SparkleRepo.FormatCommitMessage () 2010-11-27 21:24:34 +00:00
Hylke Bons 41c52661a7 [repo][controller] Abstract GetCommits method 2010-11-27 21:24:34 +00:00
Hylke Bons da831f3449 Remove double space type crime in license headers 2010-11-27 21:24:33 +00:00
Hylke Bons 050b6f4b5b [listener] Prevent irc nick from becoming null 2010-11-27 21:24:33 +00:00
Hylke Bons a58c450ade [listener] Fix nick not being set 2010-11-27 21:24:32 +00:00
Hylke Bons faafe0dc93 Move more logic from [intro] to [controller] 2010-11-27 21:24:31 +00:00
Hylke Bons f90ad36bc4 Create a working Mac solution file and add some temporary workarounds 2010-11-27 21:24:31 +00:00
Hylke Bons 9dde45bc5d Create a working Mac solution file and add some temporary workarounds 2010-11-27 21:24:30 +00:00
Hylke Bons 5e35cb74d7 [listener] Fix crash due to empty username 2010-11-16 00:56:21 +00:00
Hylke Bons 600948d3ed [build] Make SS build and run on OSX 2010-11-13 22:30:00 +00:00
Hylke Bons 81854f610a [log] pass avatars to the new webkit view 2010-11-07 23:59:07 +01:00
Hylke Bons cde668fe77 [notifications] restructure and make commit messages translatable 2010-11-02 10:45:37 +00:00
Hylke Bons 264af48a54 [fetcher] allow spaces in folders and urls by adding quotes 2010-11-02 10:45:37 +00:00