Commit graph

780 commits

Author SHA1 Message Date
Hylke Bons ed3c86e067 Use only a single watcher to monitor the SparkleShare folder 2012-07-08 23:53:44 +02:00
Hylke Bons e58bd78148 Disable git-bin 2012-07-08 12:49:17 +02:00
Hylke Bons 430b7f7a4b fetcher git: show error messages when host key has changed 2012-07-08 12:30:37 +02:00
Hylke Bons 77a15ab64c fetcher: simplfy ID generation 2012-07-08 11:29:00 +02:00
Hylke Bons 2122b79ab5 Allow renaming of folders. Closes #466 2012-07-06 11:26:02 +02:00
Hylke Bons d244f12459 Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons 201a753c41 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Matthias Dittrich 49fd14ebdb Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons aa87519cc6 lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons 08649a9aae repo git: Use a more descriptive flag when calling git-log 2012-07-03 09:59:18 +02:00
Hylke Bons 34376dacf8 repo git: rewrite HasLocalChanges 2012-07-03 09:59:18 +02:00
Hylke Bons cf84864911 repo git: catch IOException in ResolveConflict method 2012-07-03 09:59:18 +02:00
Hylke Bons e439d53a7b repo git: Fix conflict resolution 2012-07-03 09:59:18 +02:00
Hylke Bons 1c8cffd178 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-03 09:59:18 +02:00
Hylke Bons 62c7a797f9 repo git: Remove some redundant lines 2012-07-03 09:59:18 +02:00
Matthias Dittrich dc21e9a285 Now filesnames with special chars will be written properly in the comments 2012-07-03 09:59:18 +02:00
Matthias Dittrich 583f13c8ff Tried to set stylecop to match the project code style 2012-07-03 09:59:18 +02:00
Hylke Bons bb2a6b8662 lib git: Run commit with --all and deduplicate code somewhat 2012-07-03 09:59:18 +02:00
Hylke Bons 4ab153eb1f repo git: Fix coding style for #823 2012-07-03 09:59:17 +02:00
Matthias Dittrich b02d57d727 Found another place where the Utf8-fix is required 2012-07-03 09:59:17 +02:00
Matthias Dittrich c5c63636e2 Sparkle can now handle files with special characters 2012-07-03 09:59:17 +02:00
Hylke Bons 618b0b520c lib git: Clear git-bin cache after sync 2012-06-29 21:43:49 +01:00
Hylke Bons 8df73d9bee lib git: only do remote_url check when needed 2012-06-29 17:08:12 +01:00
Hylke Bons e320edfb7f lib git: Add detection of git-bin repos 2012-06-29 16:44:02 +01:00
Hylke Bons eb543fef5e fetcher git: Refactor 2012-06-29 14:00:25 +01:00
Hylke Bons a2353405dd fetcher git: Simplify attributes file creation 2012-06-29 13:17:59 +01:00
Hylke Bons 7ebc93f40e fetcher git: Simplify install of config after clone 2012-06-29 12:53:13 +01:00
Hylke Bons a3d60412ee lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess 2012-06-29 00:12:37 +01:00
Hylke Bons 7896abfcdf repo: Fix some cases where the remote timer isn't resumed 2012-06-29 00:11:25 +01:00
Hylke Bons 063b38ff28 repo git: hide .sparkleshare and .empty after a rebase. Fixes #814 2012-06-28 14:21:33 +01:00
Hylke Bons 8f95a38e26 fetcher git: don't read output on checkout and add --quiet option 2012-06-28 12:18:00 +01:00
Hylke Bons 3bf2cf56e9 fetcher: Always delete the tmp host key file after getting its fingerprint 2012-06-28 12:03:04 +01:00
Hylke Bons 9a5373fe42 fetcher: put quotes around host key file path. Fixes #815 2012-06-28 11:57:10 +01:00
Hylke Bons 0725729f7f config: change debug log file name 2012-06-27 13:12:04 +01:00
Hylke Bons c957a97296 repo git: don't resolve conflicts on the .sparkleshare file. See #807 2012-06-27 00:13:17 +01:00
Hylke Bons 4daf76f85e windows: bump version number 2012-06-25 22:55:43 +01:00
Hylke Bons 9538781dd3 repo git: reuse git objects 2012-06-24 23:20:45 +01:00
Hylke Bons 15bd9d77a4 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 4a6a0c5dbb lib: add folder name to debug info for each git call. Closes #796 2012-06-21 17:58:07 +01:00
Hylke Bons 4e0ee26e35 linux: fix build 2012-06-19 15:59:54 +01:00
Hylke Bons 6569ae6200 lib git: treat merge commits like any other commit 2012-06-19 10:54:46 +01:00
Hylke Bons f28fd55fdc Remove some unused code 2012-06-19 10:43:30 +01:00
Hylke Bons c17ad92a73 setup: show raw (git) error message on failed add 2012-06-17 22:57:15 +01:00
Hylke Bons 10c6e2f5b3 make 2012-06-17 21:56:27 +01:00
Hylke Bons 3cd210d44c mac eventlog: make window resizable 2012-06-17 00:24:30 +01:00
Hylke Bons a7ab23da72 Simplify command line argument parsing 2012-06-15 13:08:13 +01:00
Hylke Bons febc13d4f4 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 1720984e5a Refactor adding of (empty) repos. Fixes #773 2012-06-10 23:56:39 +01:00
Hylke Bons 92fdcbec17 repo: more cleanup 2012-06-10 11:57:31 +01:00
Hylke Bons e0ee50d392 repo: Simplify watch toggling mechanism 2012-06-10 11:03:03 +01:00