beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3080 commits 31 branches 6 tags 52 MiB
Commit graph

235 commits

Author SHA1 Message Date
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
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 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 c957a97296 repo git: don't resolve conflicts on the .sparkleshare file. See #807 2012-06-27 00:13:17 +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 6569ae6200 lib git: treat merge commits like any other commit 2012-06-19 10:54:46 +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 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 e0ee50d392 repo: Simplify watch toggling mechanism 2012-06-10 11:03:03 +01:00
Hylke Bons a51e30e486 Tweak some debug output 2012-06-09 16:27:34 +01:00
Carlos Martín Nieto 896abe97da 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 b8743236cd repo git: only squash commits by the same person 2012-05-28 00:14:00 +01:00
Hylke Bons 0280f7481e eventlog: sort changes by timestamp, not type 2012-05-27 19:24:12 +01:00
Hylke Bons 900130bf8b repo git: catch exceptions creating .empty files. Fixes #733 2012-05-20 12:51:09 +01:00
Hylke Bons 6dd657a086 repo: Fix edge case where ID may be empty 2012-05-19 16:15:20 +01:00
Hylke Bons 2302b31f6f Cache changesets in the backend 2012-04-29 15:19:36 +01:00
Hylke Bons aa5092f672 Merge branch 'http' 2012-04-28 09:51:41 +01:00
Hylke Bons 2f6431f193 fetcher git: override global git crlf settings. prevents some sync loops 2012-04-26 18:32:57 +01:00
Hylke Bons ede2f02274 Add SparkleShare.txt and .sparkleshare in a single commit 2012-04-26 16:02:59 +02:00
Hylke Bons 0c7cc6d4e2 Implement encryption using OpenSSL's AES + Mac UI 2012-04-26 16:02:58 +02:00
Hylke Bons a85954d15e fetcher git: accept HTTP(S) addresses 2012-04-26 14:58:05 +02:00
Hylke Bons bd8c9a3dbb fetcher git: also dispose git process on dispose 2012-04-18 11:52:45 +02:00
Hylke Bons 9ec482b3d3 repo git: Don't follow symlinks when preparing the tree. Fixes #701 2012-04-17 19:00:05 +02:00
Hylke Bons 1981705100 git: write error outputs to the debug.log for easier debugging 2012-04-17 11:05:51 +02:00
Hylke Bons 54bc9cbe6c repo git: quote urls to allow push/pull with urls that contain spaces. Fixes #703 2012-04-16 23:26:33 +02:00
Hylke Bons 3255f1b818 config: allow to specify a custom path for each folder. Closes #680 2012-04-15 19:03:36 +02:00
Hylke Bons 6acf096735 repo git: on conflicts, put timestamp before file extension. Fixes #699 2012-04-15 11:50:03 +02:00
Hylke Bons 7017bbcf01 Verify known host fingerprints and warn about new ones 2012-04-13 00:44:31 +02:00
Hylke Bons 7aded56777 fetcher: Fix some url creations errors 2012-04-11 23:10:02 +02:00
Hylke Bons 3612942649 Manually add host key to know_hosts, don't mess with the user's SSH config. Closes #497 2012-04-11 20:07:34 +02:00
Hylke Bons 14b96299a2 fetcher: Close on cancel too 2012-04-11 13:04:42 +02:00