Commit graph

367 commits

Author SHA1 Message Date
Hylke Bons 452dc783e4 setup fetcher: Show download speed on initial project fetch. #1361 2013-08-25 18:46:06 +02:00
Hylke Bons abaeae1465 repo git: add more debug info for resolving conflicts 2013-07-10 17:11:16 +01:00
Hylke Bons 850395862b repo git: Add more debug lines for rebasing 2013-07-06 20:00:27 +01:00
Hylke Bons af2f7c58f7 fetcher git: Fix typo pointing to excludes file 2013-07-06 19:05:12 +01:00
Hylke Bons a0677e753b setup: Fix grammar, punctuation and inconsistencies 2013-07-06 16:49:41 +01:00
Hylke Bons 84954bab2e repo git: Skip unparseable lines and show an error 2013-07-06 16:04:59 +01:00
Hylke Bons 921b062c2e repo git: Detect more out of space errors 2013-07-06 15:53:41 +01:00
Hylke Bons 77e48b3587 fetcher git: Quote paths passed to openssl. #1315 2013-07-02 12:07:29 +01:00
Hylke Bons b4fabcf944 controller: Move cloned folder deletion logic to fetcher 2013-06-30 15:48:35 +01:00
Hylke Bons 8cf594039f repo git: Simplify log parsing 2013-06-29 18:34:36 +01:00
Hylke Bons 007f26227c repo git: check for errors moving files when rebasing. add more debug info 2013-06-29 11:48:36 +01:00
Hylke Bons f858572ee1 Fix coding style 2013-06-26 10:11:03 +01:00
Hylke Bons fd163a0c93 Merge branch 'tortoise'
Conflicts:
	SparkleLib/Git/SparkleGit.cs
	SparkleLib/SparkleFetcherSSH.cs
	SparkleShare/SparkleControllerBase.cs
2013-06-23 10:03:09 +01:00
Hylke Bons 711811f13d fetcher git: Catch stream errors when process has been killed by user. Fixes #1187 2013-06-20 21:44:34 +01:00
Hylke Bons e93e868a45 repo git: show first file revision in history if unedited file has been deleted. fixes #1272 2013-05-14 22:40:20 +01:00
Hylke Bons 982cb7d898 git: don't crash on parsing progress info. fixes #1237 2013-05-04 17:47:43 -04:00
Hylke Bons e16dea81dc git: fix crash when committing renames with spaces. closes #1267 2013-05-04 17:07:52 -04:00
Hylke Bons 4b1e07cb19 fetcher: fix host key check. closes #1249 2013-04-27 13:02:54 +01:00
Hylke Bons 0fba958e49 fetcher: create separate Base, SSH, and Git classes. cleaner abstraction. 2013-03-24 23:55:54 +01:00
Hylke Bons ac879068e5 fetcher: create separate Base, SSH, and Git classes. cleaner abstraction. 2013-03-24 23:52:05 +01:00
Hylke Bons 75e8a17d8a git: only add GIT_SSH env var if it doesn't exist already 2013-03-11 21:01:41 +00:00
Hylke Bons f302f34c9b repo git: error out when files can't be added to the database. closes #1212 2013-03-11 17:10:03 +00:00
Hylke Bons cfbb23b452 fetcher: configure to ignore the global gitignore file. closes #1194 2013-02-27 17:45:41 +00:00
Hylke Bons 89120dc377 git: only add new language env var if it doesn't exist yet. fixes #1191 2013-02-21 13:53:23 +00:00
Hylke Bons 85cea028ef git: force language to be en_US for output 2013-02-18 21:19:31 +00:00
Hylke Bons bf1e87fde0 repo git: fix formatting of commit message 2013-02-18 19:59:09 +00:00
Hylke Bons 0116fef1be repo: ignore ASCII DEL characters when compiling the log. fixes #1185 2013-02-14 20:21:23 +00:00
Hylke Bons 46a6caff92 fetcher: add .dmg to list of files not to compress 2013-02-14 11:04:31 +00:00
Hylke Bons 1c02a4f7e8 windows: explicitly point GIT_SSH to ssh.exe 2013-02-13 22:45:12 +00:00
Hylke Bons 2fc62e783c repo: update sync algorithm. fewer threads, less complexity 2013-02-09 23:42:32 +00:00
Hylke Bons a2dff5785e fetcher: use FetcherInfo object to wrap parameters and respect AnouncementsUrl 2013-01-27 19:24:36 +00:00
Hylke Bons 857d34d939 repo git: catch exceptions when parsing sync speed. fixes #1163 2013-01-27 11:47:48 +00:00
Hylke Bons 1c8ffe407f repo git: check if remote rev is in local history when determining state. closes #1155 2013-01-24 20:10:42 +00:00
Hylke Bons 7d7cddc680 repo: refactor size calculation, ignore symlinks. fixes #1149 2013-01-11 19:58:14 +01:00
Hylke Bons afd7b76866 repo git: empty logs make me sad. always show something when no changes this month 2013-01-11 19:38:49 +01:00
Hylke Bons 8fd5974cad Revert "Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining."
This reverts commit b2b49012c1.

Conflicts:

	SparkleShare/SparkleControllerBase.cs
2013-01-06 19:33:55 +01:00
Hylke Bons b2400bb5bc fix coding style 2013-01-06 15:58:11 +01:00
Hylke Bons c1d6289507 repo git: reduce the number of status commands being called on activity 2013-01-06 12:21:54 +01:00
Hylke Bons 3381e5a517 Merge branch 'PathFix' of https://github.com/brandondahler/SparkleShare
Conflicts:
	SparkleShare/SparkleControllerBase.cs
2013-01-05 10:56:19 +01:00
Brandon Dahler 4ee5187c84 Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining. 2013-01-05 02:38:01 -06:00
Hylke Bons 6d2852622f git: fix typo. closes #1134 2013-01-03 22:13:18 +01:00
Hylke Bons 345b399b24 Search for git in the install dir, so people can add their custom copy of git. closes #1126 2013-01-03 13:34:47 +01:00
Hylke Bons 06840064b5 Merge pull request #1131 from brandondahler/CultureFix
Manually set locale to en-US for parsing numbers out of git output
2013-01-02 10:19:53 -08:00
Hylke Bons 8eed12ff30 Merge pull request #1122 from brandondahler/HistoryFix
Do not include /.git file in calculating subdirectory size
2013-01-02 06:09:24 -08:00
Brandon Dahler 75021f7444 Manually set locale to en-US for parsing numbers out of git output 2012-12-31 04:06:07 -06:00
Brandon Dahler e01143389e Do not include /.git file in calculating subdirectory size 2012-12-25 00:32:39 -06:00
Hylke Bons 829ce766f7 fetcher: ssh+backend strip should be in the derived class, not the base class. #1118 2012-12-21 22:02:35 +01:00
Hylke Bons c7089c884e git: adjust git-bin configuration to use sftp 2012-12-20 18:40:55 +01:00
Hylke Bons 268507d4d0 repo git: when things are utterly wrong, abandon rebase 2012-12-19 21:57:55 +01:00
Hylke Bons 93125e9e23 fix build 2012-12-18 18:05:06 +01:00