Commit graph

241 commits

Author SHA1 Message Date
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 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 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 2fc62e783c repo: update sync algorithm. fewer threads, less complexity 2013-02-09 23:42:32 +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 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 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 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
Hylke Bons 6daf9fd31c repo git: add more git-bin configuration on startup 2012-12-18 13:36:36 +01:00
Hylke Bons 7cf1e375e9 repo git: add private key info when using git-bin 2012-12-14 17:03:00 +01:00
Hylke Bons cfc0011386 repo git: when setting the url from config, also set the git-bin.sshUrl 2012-12-14 13:40:49 +01:00
Hylke Bons 3450354f12 mac: fix occasional crash when updating the menu whilst it's open 2012-12-04 23:51:32 +00:00
Hylke Bons aea3176846 various rearrangements and tweaks 2012-11-28 20:17:39 +00:00
Hylke Bons c45d883728 fetcher git: fix crypto. 'git branch -a' doesn't always show all branches 2012-11-27 21:57:05 +00:00
Hylke Bons f5463f98ba repo: fix typo 2012-11-23 10:08:50 +00:00
Hylke Bons 63fde5a7d9 repo statusicon: add error type: 'project not found' 2012-11-23 00:20:43 +00:00
Hylke Bons 0c3905e58a fetcher: log exceptions more cleanly 2012-11-22 12:32:04 +00:00
Hylke Bons 804b390eba repo git: fix parsing of changed host key error. #1078 2012-11-21 23:08:32 +00:00
Hylke Bons cd6f69ef43 repo git: don't try to resolve conflicts when a rebase failed due to locked files 2012-11-21 09:22:55 +00:00
Hylke Bons 8948837a59 repo git: fix getting stuck in conflict resolution loop when there are no conflicts 2012-11-20 20:33:02 +00:00
Hylke Bons cdf28e8d20 repo git: reuse regex objects 2012-11-18 18:49:57 +00:00
Hylke Bons 278a1df06d statusicon: start on a new thread when forcing a retry 2012-11-18 15:00:34 +00:00
Hylke Bons 8e1c79226e statusicon: fix progress not appearing sometimes 2012-11-18 14:29:10 +00:00
Hylke Bons 2e73338337 repo git: catch any exceptions trying to parse transfer speeds 2012-11-18 11:36:09 +00:00
Hylke Bons 6015950fc5 pass transfer speeds in bytes, not strings. report both directions when needed. 2012-11-17 23:05:29 +00:00
Hylke Bons 7c71c3d67f repo git: show error when we can't rebase due to locked files 2012-11-17 19:03:37 +00:00
Hylke Bons 7165cc7cae repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058 2012-11-16 10:05:57 +00:00
Hylke Bons 94c1354a70 repo git: always use the default repo branch, even if it's not master 2012-11-12 22:47:40 +00:00
Hylke Bons c60153b90c repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721 2012-11-11 19:15:42 +00:00
Hylke Bons d79f093996 fetcher git: explicitly set the push strategy. fixes #1035 2012-10-26 13:43:54 +01:00
Hylke Bons e4d8e88deb repo git: cleanups 2012-10-22 21:41:00 +01:00
Hylke Bons 9601506d31 windows: fix for the .sparkleshare file sometimes not being hidden 2012-10-21 21:16:38 +01:00
Hylke Bons c274e87019 fetcher git: fixes for crypto setup 2012-10-20 23:22:41 +01:00
Hylke Bons 3a8d7bec4f controller: small fix for status icon text not updating sometimes 2012-10-16 22:00:35 +01:00
Hylke Bons 2c94a9938d event log: show the last month worth of changes 2012-10-16 22:00:35 +01:00
Hylke Bons 423717bd1d eventlog: change default size 2012-10-16 22:00:35 +01:00
Hylke Bons a20d377192 history: implement back button 2012-10-16 22:00:34 +01:00