Commit graph

237 commits

Author SHA1 Message Date
Hylke Bons d79408dc79 Manually add host key to know_hosts, don't mess with the user's SSH config. Closes #497 2012-04-11 20:07:34 +02:00
Hylke Bons bf45b91ddc fetcher: Close on cancel too 2012-04-11 13:04:42 +02:00
Hylke Bons 6ae0ca58b2 fetcher: Add debug info for #692 2012-04-11 12:51:53 +02:00
Hylke Bons 9ccc9e6a08 repo git: add debug info for #677 2012-04-10 23:19:33 +02:00
Hylke Bons 8fc30c7d0f repo: basic support for quota detection 2012-04-04 23:45:20 +01:00
Hylke Bons e1a1ab7396 Add option to add projects without full history (git: --depth=1) 2012-03-29 01:44:26 +01:00
Hylke Bons 993d3b1302 repo git: don't hang on large rebase outputs. Should fix #663 2012-03-28 23:11:41 +01:00
Hylke Bons e8903492e7 Use .sparkleshare file for the repo ID, instad of the first commit hash 2012-03-26 00:41:52 +01:00
Hylke Bons bbcb5db1db repo git: ignore global gitconfig options when parsing the git log 2012-03-20 17:26:47 +00:00
Hylke Bons 608b4110b6 repo git: ignore global gitconfig options when parsing the git log 2012-03-20 17:20:28 +00:00
Hylke Bons 12b27f3eb2 windows setup: Reverse button order 2012-03-17 01:44:27 +00:00
Hylke Bons 301e671747 repo: Fix false 'Not everything is synced' messages after succesful conflict resolution 2012-03-16 01:53:23 +00:00
Hylke Bons daf4818cc2 remove some TODOs 2012-03-15 23:54:18 +00:00
Hylke Bons a1d5054af4 setup controller: refactor some order logic. Fixes #627 #630 2012-03-14 03:26:42 +00:00
Hylke Bons fb497c234b repo git: add catch block to PrepareDirectories method 2012-03-12 19:56:06 +00:00
Hylke Bons 4fed581829 Remove the notes feature 2012-03-10 20:51:37 +00:00
Hylke Bons 5b0ccc607c window setup: implement warning about global gitignore 2012-03-09 04:04:16 +00:00
Hylke Bons e6edff1d21 Fix some instances of 'could not load backend' 2012-03-08 23:27:49 +00:00
Hylke Bons 17affe8b63 windows: some small fixes 2012-03-08 14:55:44 +00:00
Hylke Bons 98695afbf4 xplicitly hide supposed to be hidden files. Closes #605 2012-03-08 03:34:45 +00:00
Hylke Bons 1e6cba4baa save work on windows 2012-03-06 01:18:45 +00:00
Hylke Bons ab9358fcdf setup: Create a reusable plugin for each succesfully used host. Closes #547 2012-03-01 23:57:12 +00:00
Hylke Bons 977c225e9f Fix progress delay when there was an error 2012-03-01 17:48:05 +00:00
Hylke Bons 5313ffc47d sparklelib: use a nice SparkleLib.Git namespace 2012-03-01 17:02:52 +00:00
Shish 6835489eff wibble automake to build the extra backend 2012-02-28 14:34:23 +00:00
Shish 554a6e1354 get the backend to load the shared library 2012-02-28 13:34:15 +00:00
Hylke Bons e118dc349a Merge branch 'gettext-cs' of https://github.com/serras/SparkleShare into windows 2012-02-27 16:34:58 +00:00
serras 87ef4ed013 Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons 23fc46bc09 fetcher git: don't simulate progress when clone command failed 2012-02-26 15:58:09 +00:00
Hylke Bons 19797fdc5f fetcher: always finish the progress reporting animation smoothly to 100% 2012-02-18 23:16:25 +01:00
Hylke Bons 8bed56d707 invites: upload the user's pubkey on invite accept 2012-02-17 21:26:13 +01:00
Hylke Bons 5de4491892 fetcher git: add FIXME 2012-02-17 02:48:41 +01:00
Hylke Bons 4d3f1a6e85 repo git: adjust commit message for notes 2012-02-16 22:43:41 +01:00
Hylke Bons 41ea97c927 repo: don't recurse into first .git folder 2012-02-14 20:34:03 +01:00
serras e2e706dc6a Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/Git/SparkleFetcherGit.cs
2012-02-12 16:24:12 +01:00
Hylke Bons fc5a0427ec event log: remove '.empty' files from rename entries of folders 2012-02-11 14:29:23 +01:00
Hylke Bons f2b9e7bce7 More cleanup of SparkleLib API 2012-02-09 02:46:25 +01:00
Hylke Bons 3370a283ea Clean up SparkleLib API 2012-02-08 20:42:29 +01:00
Hylke Bons 9f55680a6a Merge branch 'disconnect'. Fixes #508
Conflicts:
	SparkleLib/SparkleListenerBase.cs
	SparkleLib/SparkleListenerTcp.cs
2012-02-08 02:24:02 +01:00
Hylke Bons 7a0527b7a7 repo: change CheckForRemoteChanges method to HasRemoteChanges property 2012-02-06 15:02:41 +01:00
Hylke Bons e50ad79f92 Remove SparkleBackend crap 2012-02-06 14:43:31 +01:00
Hylke Bons 121bb3e320 Clean up and remove unneeded references 2012-02-06 14:11:08 +01:00
serras d096c39e5d Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2012-02-05 18:54:32 +01:00
Hylke Bons d8bc1c5163 windows: don't show terminal window when running commands 2012-02-05 12:05:47 +01:00
Hylke Bons 5c32eb370f fetcher: move exclude rules to base class. Closes #564 2012-01-31 21:30:23 +00:00
Hylke Bons 8cc50596e9 controller: fix repo loading 2012-01-29 20:33:12 +00:00
Hylke Bons 5fad84ed8e fetcher git: fix type. Closes #565 2012-01-29 18:12:43 +00:00
Hylke Bons 716f5b1f27 event log: show repo url upon hovering of the folder name. Closes #544 2012-01-27 00:52:56 +00:00
Hylke Bons 8695c6c0b7 git: always get the url to use from the config.xml. Closes #556 2012-01-25 18:30:57 +00:00
praktikant 76360b1819 adapted coding style 2012-01-24 14:46:57 +01:00
praktikant a37a041018 Fixing #298 again first try 2012-01-24 10:47:46 +01:00
Hylke Bons 5ef5107b62 Allow ports to be specified once again. Fixes #555 2012-01-23 23:50:54 +00:00
serras a06e58b582 Merge branch 'master' into gettext-cs 2012-01-22 19:19:19 +01:00
Hylke Bons 03596ed073 git: remove unneeded reference 2012-01-22 17:29:14 +00:00
Hylke Bons 01a465d724 mac: set the --exec-path when calling the bundled git 2012-01-22 17:17:36 +00:00
serras 69829cb547 Make it compile again in Windows 2012-01-19 20:21:48 +01:00
serras 8eedf5b148 Merge branch 'master' into gettext-cs 2012-01-19 20:04:49 +01:00
Hylke Bons 1bf440872e repo: Cache folder sizes and update them after a sync. Closes #535 2012-01-18 23:21:09 +00:00
Hylke Bons 994ccbb07b fetcher git: Add some memory limiting settings to the config. Closes #519 2012-01-18 01:50:47 +00:00
Hylke Bons 5267138693 git: Only parse the first 250 files per commit, prevents huge resource consumption. Fixes #500 2012-01-18 00:44:15 +00:00
Hylke Bons 6136730fab git config: Add a tab before options 2012-01-17 01:08:26 +00:00
Hylke Bons 38e8db9e70 git put SparkleGit class in its own file 2012-01-16 20:23:12 +00:00
Hylke Bons be9f264492 git: Don't turn git repos into submodules, add only the checkout, not the database. Closes #335 2012-01-16 19:58:25 +00:00
Hylke Bons 7440445104 fetcher git: ignore Mercurial and Bazaar databases 2012-01-16 19:57:11 +00:00
Hylke Bons 03db2a2f09 repo: Move progress interval logic to base class 2012-01-15 23:45:17 +00:00
serras 81a7c81750 Merge branch 'master' into gettext-cs 2012-01-14 11:21:53 +01:00
Hylke Bons a7ac3b0097 fetcher git: make url parsing more readable by using the Uri object 2012-01-13 23:47:19 +00:00
Hylke Bons 649fab3826 fetcher git: Cleanup 2012-01-13 20:18:16 +00:00
Hylke Bons ab2ee404b5 git: Resolve the ?? 'conflict' by adding. Fixes #509 2012-01-12 01:01:24 +00:00
Hylke Bons 63497bbed3 git: Don't compress already compressed file formats 2012-01-11 22:15:13 +00:00
serras 78a0b5ce34 Use layout in setup windows 2012-01-09 18:36:24 +01:00
serras 0dd7605834 Make it compile with Sparkleshare 0.6 and create .msi file correctly 2012-01-08 22:31:14 +01:00
serras f4c4a94000 Merge remote-tracking branch 'hbons/master' into gettext-cs
Conflicts:
	.gitignore
	.gitmodules
	SparkleLib/Git/SparkleFetcherGit.cs
	SparkleLib/Hg/SparkleRepoHg.cs
	SparkleLib/SparkleConfig.cs
	SparkleLib/SparkleFetcherBase.cs
	SparkleLib/SparkleListenerIrc.cs
	SparkleShare/SparkleBubblesController.cs
	SparkleShare/SparkleControllerBase.cs
	SparkleShare/SparkleStatusIcon.cs
2012-01-07 14:13:36 +01:00
Hylke Bons 394cd39b57 repo: Also report progress on fetch 2011-12-30 15:00:15 +01:00
Hylke Bons f30e534bfb statusicon: add sync progress stats (one repo at a time only for now). Closes #222 2011-12-30 01:44:41 +01:00
Hylke Bons 317c7842a7 Don't exclude all dotfiles, Fixes #495 2011-12-29 12:44:18 +01:00
Hylke Bons b84b6ba499 Fix warning 2011-12-25 20:32:39 +01:00
Hylke Bons 88700a83d6 fetcher git: Fix race condition when stopping a clone 2011-12-24 19:17:54 +01:00
Hylke Bons f1605a566f fetcher git: set the working dir to the tmp path. Fixes #488 2011-12-24 18:04:43 +01:00
Hylke Bons c235248078 Use folders_path config option to create the tmo dir when it is set. Fixes #485 2011-12-18 17:10:06 +01:00
Hylke Bons a4d1e5d120 event log: report size and history size. Closes #379 2011-12-15 16:15:29 +01:00
Hylke Bons 9a3e34381c repo: Improve handling of offline repos. Fixes #439 2011-12-03 12:40:55 +01:00
Hylke Bons 6540b19ae2 git: strip .empty from file paths in commit messages 2011-12-03 12:40:55 +01:00
Hylke Bons 23fed0359f fetcher git: always create folder for ignore file first. Fixes #460 2011-12-01 19:41:49 +01:00
Hylke Bons 6ad39da458 repo git: also check for number of dirs before creating .empty file 2011-11-30 15:04:56 +01:00
Hylke Bons 5030933abf setup: Show a warning when the user has a global gitignore. Closes #432 2011-11-28 14:40:34 +01:00
wimh 2fa6c72fd8 Merge remote-tracking branch 'upstream/master' into windows 2011-11-14 20:50:27 +01:00
Hylke Bons 07b727bb72 repo git: we only need to determine CurrentRevision once per session. 2011-11-13 00:39:29 +00:00
wimh 7d226076a3 Merge remote-tracking branch 'upstream/master' into windows 2011-11-04 21:49:47 +01:00
Hylke Bons 46d8eecb51 Fix host key check disabling/enabling by surrounding config with comments. Closes #390. 2011-10-30 21:24:19 +00:00
wimh 61bd9af894 Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	SparkleLib/SparkleHelpers.cs
2011-10-27 19:12:04 +02:00
Hylke Bons 80cf3cf26a git: add some more MS Office exclude rules 2011-10-24 19:43:55 +01:00
Hylke Bons a018a6181b git: add some more MS Office exclude rules 2011-10-24 19:42:18 +01:00
Hylke Bons 877aff9548 fetcher git: add exclude rules for temporary MS Office files 2011-10-23 13:39:00 +01:00
wimh ef28cb4a14 Merge remote-tracking branch 'beaugunderson/windows' into windows (only SparkleLib/Git/SparkleFetcherGit.cs) 2011-10-17 22:20:37 +02:00
wimh 0453083424 Merge remote-tracking branch 'upstream/master' into windows 2011-10-17 21:24:41 +02:00
Hylke Bons 39ec42d167 git fetcher: System.Xml no longer needed here 2011-10-17 19:37:35 +02:00
Hylke Bons 537218b46e git: Always use user info from global config to commit. Fixes #367 2011-10-17 19:34:46 +02:00
wimh 75eb8c7f32 Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
	.gitignore
	SparkleShare/SparkleStatusIcon.cs
2011-10-15 20:31:20 +02:00
wimh 86c84e4120 Merge remote-tracking branch 'tvollstaedt/issue10' into windows 2011-10-02 02:53:31 +02:00