Commit graph

765 commits

Author SHA1 Message Date
Hylke Bons b85ef3fed7 repo git: Use a more descriptive flag when calling git-log 2012-07-03 00:08:34 +02:00
Hylke Bons 4acb33ae0d repo git: rewrite HasLocalChanges 2012-07-02 23:58:37 +02:00
Hylke Bons 90ce809d6f repo git: catch IOException in ResolveConflict method 2012-07-02 23:42:49 +02:00
Hylke Bons 6d6b2c240c repo git: Fix conflict resolution 2012-07-02 23:23:28 +02:00
Hylke Bons 9f3dff6270 Merge pull request #831 from matthid/pullProjectSettings
Improved Project settings
2012-07-02 13:01:36 -07:00
Hylke Bons 11e15daf67 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-02 21:54:29 +02:00
Hylke Bons 96254f01e2 repo git: Remove some redundant lines 2012-07-02 18:37:35 +02:00
Matthias Dittrich f89403046a Now filesnames with special chars will be written properly in the comments 2012-07-02 12:44:19 +02:00
Matthias Dittrich 0b01a84796 Tried to set stylecop to match the project code style 2012-07-02 12:42:41 +02:00
Hylke Bons 32d149dad1 lib git: Run commit with --all and deduplicate code somewhat 2012-07-01 13:30:33 +02:00
Hylke Bons eebb412914 repo git: Fix coding style for #823 2012-07-01 10:46:42 +02:00
Matthias Dittrich bacd781d94 Found another place where the Utf8-fix is required 2012-07-01 01:38:48 +02:00
Matthias Dittrich 01071047ea Sparkle can now handle files with special characters 2012-06-30 23:36:19 +02: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