Hylke Bons
687cbd4b60
lib: Check if we're in the middle on a rebase on startup, if so: abort
2012-07-25 11:41:51 +02:00
Hylke Bons
afd894ac50
Revert master watcher
2012-07-25 11:25:52 +02:00
Hylke Bons
63eaf5daa5
Code cleanup
2012-07-25 10:01:31 +02:00
Hylke Bons
0b500c3ef4
fetcher: code cleanup
2012-07-22 22:54:59 +02:00
Hylke Bons
ce844af1ee
Disable git-bin by default
2012-07-22 20:59:51 +02:00
Hylke Bons
7d9e963c73
lib: Code cleanup
2012-07-22 11:51:56 +02:00
Hylke Bons
471be2cd9f
repo git: code cleanup
2012-07-22 11:40:49 +02:00
Hylke Bons
126d696d5a
repo: move changeset list creation logic to base class
2012-07-19 22:21:38 +02:00
Hylke Bons
32848f8772
repo: simplify remote timer check
2012-07-19 22:05:29 +02:00
Hylke Bons
437cfbe1e1
eventlog: Fix some occasions where the spinner doesn't appear.
2012-07-18 23:31:50 +02:00
Matthias Dittrich
0887aff38d
fixes windows build
2012-07-18 15:40:29 +02:00
Hylke Bons
f3784ddc98
lib: code cleanup
2012-07-18 14:51:09 +02:00
Hylke Bons
78e96474b2
Remove event handling boilerplate everywhere
2012-07-18 13:09:37 +02:00
Hylke Bons
e0949ae082
windows: Remove SparkleShare folder migration code
2012-07-17 22:45:33 +02:00
Hylke Bons
2ca2c12475
controller: Code cleanups
2012-07-17 22:14:58 +02:00
Hylke Bons
accf447456
git: Use the same Unicode form on all filesystems. Closes #478
2012-07-15 21:01:06 +02:00
Hylke Bons
7fb8cc587f
mac invites: don't check certificate
2012-07-15 15:59:04 +02:00
Hylke Bons
dde10d33da
watcher: Fix disposing, style fixes
2012-07-15 12:05:58 +02:00
Hylke Bons
da15d03621
repo: don't dispose common listeners/watchers
2012-07-14 17:54:34 +02:00
Hylke Bons
e61e33b47f
repo: remove unneeded try/catch block and fix up some logic
2012-07-14 17:18:29 +02:00
Hylke Bons
f67df255d4
repo: avoid race condition causing multiple syncups at the same time
2012-07-14 14:35:55 +02:00
Hylke Bons
f5b0af6e54
windows: add missing file reference. Fixes #852
2012-07-14 13:29:07 +02:00
Hylke Bons
0514d3963f
config: Remove the folders_path option
2012-07-14 13:18:13 +02:00
Hylke Bons
eaead8c87d
Some rearrangements
2012-07-14 12:45:54 +02:00
Hylke Bons
64bb74f06e
Merge branch 'master' into about
2012-07-13 14:20:10 +02:00
Hylke Bons
ed190db27b
repo: send Idle event when there are no changes after activities have settled. Fixes #850
2012-07-13 14:19:46 +02:00
Hylke Bons
29eaffc6d4
config: Don't accept null values as identifiers
2012-07-11 22:31:45 +02:00
Hylke Bons
165181c009
config: Adjust coding style of last commit
2012-07-10 22:13:18 +02:00
Matthias Dittrich
63eb793abc
Fixed a NullreferenceException on startup #844
2012-07-10 16:25:20 +02:00
Hylke Bons
ca22672842
Use only a single watcher to monitor the SparkleShare folder
2012-07-08 23:53:44 +02:00
Hylke Bons
f209602f3a
Disable git-bin
2012-07-08 12:49:17 +02:00
Hylke Bons
a7d926b6fa
fetcher git: show error messages when host key has changed
2012-07-08 12:30:37 +02:00
Hylke Bons
afe0a0c5fd
fetcher: simplfy ID generation
2012-07-08 11:29:00 +02:00
Hylke Bons
ec2f5f36a2
Allow renaming of folders. Closes #466
2012-07-06 11:26:02 +02:00
Hylke Bons
c769f6c7a8
Calculate IDs in the fetcher and add the to the config
2012-07-05 13:38:55 +02:00
Hylke Bons
b87b642742
listener tcp: Remove lock
2012-07-05 13:37:18 +02:00
Matthias Dittrich
404ee662ac
Sparkle can now handle files with special characters
2012-07-05 13:37:18 +02:00
Hylke Bons
22fcca2fac
lib: style cleanups
2012-07-03 09:59:19 +02:00
Hylke Bons
c03bbc2fa1
repo git: Use a more descriptive flag when calling git-log
2012-07-03 09:59:18 +02:00
Hylke Bons
9692ca655e
repo git: rewrite HasLocalChanges
2012-07-03 09:59:18 +02:00
Hylke Bons
aeafa39c0d
repo git: catch IOException in ResolveConflict method
2012-07-03 09:59:18 +02:00
Hylke Bons
f28dfd0318
repo git: Fix conflict resolution
2012-07-03 09:59:18 +02:00
Hylke Bons
a7b0e775e0
repo git: refactor andf fix Rebase and FormatCommitMessage methods
2012-07-03 09:59:18 +02:00
Hylke Bons
b3040b5276
repo git: Remove some redundant lines
2012-07-03 09:59:18 +02:00
Matthias Dittrich
288317a8bb
Now filesnames with special chars will be written properly in the comments
2012-07-03 09:59:18 +02:00
Matthias Dittrich
0b7fa8a193
Tried to set stylecop to match the project code style
2012-07-03 09:59:18 +02:00
Hylke Bons
aa9af2c094
lib git: Run commit with --all and deduplicate code somewhat
2012-07-03 09:59:18 +02:00
Hylke Bons
ef196d00b8
repo git: Fix coding style for #823
2012-07-03 09:59:17 +02:00
Matthias Dittrich
0be8c17a05
Found another place where the Utf8-fix is required
2012-07-03 09:59:17 +02:00
Matthias Dittrich
02487a466b
Sparkle can now handle files with special characters
2012-07-03 09:59:17 +02:00
Hylke Bons
91fdb44445
lib git: Clear git-bin cache after sync
2012-06-29 21:43:49 +01:00
Hylke Bons
865525dee2
lib git: only do remote_url check when needed
2012-06-29 17:08:12 +01:00
Hylke Bons
9dc0b6af5b
lib git: Add detection of git-bin repos
2012-06-29 16:44:02 +01:00
Hylke Bons
efccc2c1c3
fetcher git: Refactor
2012-06-29 14:00:25 +01:00
Hylke Bons
8470b06a01
fetcher git: Simplify attributes file creation
2012-06-29 13:17:59 +01:00
Hylke Bons
a4718cf100
fetcher git: Simplify install of config after clone
2012-06-29 12:53:13 +01:00
Hylke Bons
799314ceee
lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess
2012-06-29 00:12:37 +01:00
Hylke Bons
a0b3c101d9
repo: Fix some cases where the remote timer isn't resumed
2012-06-29 00:11:25 +01:00
Hylke Bons
4bef356142
repo git: hide .sparkleshare and .empty after a rebase. Fixes #814
2012-06-28 14:21:33 +01:00
Hylke Bons
1b04fda8f7
fetcher git: don't read output on checkout and add --quiet option
2012-06-28 12:18:00 +01:00
Hylke Bons
5ee72e37f5
fetcher: Always delete the tmp host key file after getting its fingerprint
2012-06-28 12:03:04 +01:00
Hylke Bons
744d4f2ffa
fetcher: put quotes around host key file path. Fixes #815
2012-06-28 11:57:10 +01:00
Hylke Bons
22698aa00b
config: change debug log file name
2012-06-27 13:12:04 +01:00
Hylke Bons
349410927a
repo git: don't resolve conflicts on the .sparkleshare file. See #807
2012-06-27 00:13:17 +01:00
Hylke Bons
2f847093c4
windows: bump version number
2012-06-25 22:55:43 +01:00
Hylke Bons
330e80c22b
repo git: reuse git objects
2012-06-24 23:20:45 +01:00
Hylke Bons
4bee67b3d5
git: return to setting author on local repository, specifying in the command causes issues. Fixes #678
2012-06-24 19:14:52 +01:00
Hylke Bons
4c945e5611
lib: add folder name to debug info for each git call. Closes #796
2012-06-21 17:58:07 +01:00
Hylke Bons
e72b3828d1
linux: fix build
2012-06-19 15:59:54 +01:00
Hylke Bons
090a34a3c7
lib git: treat merge commits like any other commit
2012-06-19 10:54:46 +01:00
Hylke Bons
142e0b46a1
Remove some unused code
2012-06-19 10:43:30 +01:00
Hylke Bons
ace1fb2c40
setup: show raw (git) error message on failed add
2012-06-17 22:57:15 +01:00
Hylke Bons
6d796f35bf
make
2012-06-17 21:56:27 +01:00
Hylke Bons
37b94b23bf
mac eventlog: make window resizable
2012-06-17 00:24:30 +01:00
Hylke Bons
7ceb17907d
Simplify command line argument parsing
2012-06-15 13:08:13 +01:00
Hylke Bons
07c4d271e3
Allow apostrophes and single quotes in folder names, but don't allow double quotes. Fixes #787
2012-06-14 13:54:59 +01:00
Hylke Bons
febd993f29
Refactor adding of (empty) repos. Fixes #773
2012-06-10 23:56:39 +01:00
Hylke Bons
19b7250b61
repo: more cleanup
2012-06-10 11:57:31 +01:00
Hylke Bons
fccb790a2d
repo: Simplify watch toggling mechanism
2012-06-10 11:03:03 +01:00
Hylke Bons
c99e57ea74
repo: Simplify local change detection code using a single thread
2012-06-10 01:16:28 +01:00
Hylke Bons
fe3f28d7c4
Tweak some debug output
2012-06-09 16:27:34 +01:00
Carlos Martín Nieto
a7e24dc3aa
SparkleLib: Use rev-parse HEAD to determine latest commit
...
While `git log -1 --format=%H` does show the same data, it needs to
start up the revision walking machinery just to show the latest
commit's hash. `git rev-parse HEAD` tells us this commit's hash
without doing all the extra work.
2012-06-07 15:42:59 +02:00
Hylke Bons
be1fbdc928
listener: set port 80 as the default
2012-05-28 00:51:37 +01:00
Hylke Bons
52e3e78d2f
Only fetch gravatars once, fix some UI blocking
2012-05-28 00:14:45 +01:00
Hylke Bons
43703b94f8
repo git: only squash commits by the same person
2012-05-28 00:14:00 +01:00
Hylke Bons
32735aa730
Remove unneeded reference
2012-05-27 19:25:14 +01:00
Hylke Bons
e1c16f0f5f
eventlog: sort changes by timestamp, not type
2012-05-27 19:24:12 +01:00
Hylke Bons
9a7e1eaee1
setup: Fix page logic
2012-05-20 17:16:14 +01:00
Hylke Bons
6a0ee9ed63
listener tcp: Catch more exceptions and increase poll/ping interval. Fixes #734
2012-05-20 14:28:14 +01:00
Hylke Bons
ea432c32e8
repo git: catch exceptions creating .empty files. Fixes #733
2012-05-20 12:51:09 +01:00
Hylke Bons
23a31230a4
repo: fix whitespace
2012-05-19 16:17:09 +01:00
Hylke Bons
1a97616e38
repo: Fix edge case where ID may be empty
2012-05-19 16:15:20 +01:00
Hylke Bons
d149d9dce8
Fix crashes with unavailable notification service
2012-05-14 23:35:59 +01:00
Hylke Bons
07eda17fa6
fetcher base: be more specific about ignoring OS X's Icon files
2012-05-14 21:34:16 +01:00
Hylke Bons
9800bcf421
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
06246c0ebf
mac: Remove unused graphic from project
2012-04-28 17:19:21 +01:00
Hylke Bons
921d66baa6
Merge branch 'http'
2012-04-28 09:51:41 +01:00
Hylke Bons
b2ce29f5f2
Remove some debug rules used for crypto feature
2012-04-26 18:48:18 +01:00
Hylke Bons
8ee99fa5a0
fetcher git: override global git crlf settings. prevents some sync loops
2012-04-26 18:32:57 +01:00
Hylke Bons
b230d14d4a
Add SparkleShare.txt and .sparkleshare in a single commit
2012-04-26 16:02:59 +02:00