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 |
|
Hylke Bons
|
6daf9fd31c
|
repo git: add more git-bin configuration on startup
|
2012-12-18 13:36:36 +01:00 |
|
Hylke Bons
|
95ed386e05
|
fetcher git: increase big file threshold
|
2012-12-14 19:13:30 +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
|
bc1c5d21b2
|
fetcher: compression exclude rules: tar is not compressed, add truecrypt volumes
|
2012-12-11 20:56:07 +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
|
a5ea281c04
|
fetcher git: simplify
|
2012-11-22 09:46:49 +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
|
9e89a92ba7
|
remove GNOME plugin as it isn't actually used by anyone
|
2012-11-10 22:00:03 +00:00 |
|
Hylke Bons
|
b73f422a99
|
fetcher git: add back warning about global gitignore
|
2012-11-10 12:26:47 +00:00 |
|
Hylke Bons
|
3a13cad422
|
fetcher git: explicitly convert to native line endings for .txt files (for Notepad)
|
2012-11-10 10:43:30 +00:00 |
|
Hylke Bons
|
ae90c616b2
|
fetcher git: typo in config setting
|
2012-11-08 16:02:55 +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 |
|