Hylke Bons
351ad0df92
Fix build. Closes #876
2012-07-25 13:28:50 +02:00
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
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
f3784ddc98
lib: code cleanup
2012-07-18 14:51:09 +02:00
Hylke Bons
eaead8c87d
Some rearrangements
2012-07-14 12:45:54 +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
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
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
799314ceee
lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess
2012-06-29 00:12:37 +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
349410927a
repo git: don't resolve conflicts on the .sparkleshare file. See #807
2012-06-27 00:13:17 +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
090a34a3c7
lib git: treat merge commits like any other commit
2012-06-19 10:54:46 +01:00
Hylke Bons
6d796f35bf
make
2012-06-17 21:56:27 +01:00
Hylke Bons
febd993f29
Refactor adding of (empty) repos. Fixes #773
2012-06-10 23:56:39 +01:00
Hylke Bons
fccb790a2d
repo: Simplify watch toggling mechanism
2012-06-10 11:03:03 +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
43703b94f8
repo git: only squash commits by the same person
2012-05-28 00:14:00 +01:00
Hylke Bons
e1c16f0f5f
eventlog: sort changes by timestamp, not type
2012-05-27 19:24:12 +01:00
Hylke Bons
ea432c32e8
repo git: catch exceptions creating .empty files. Fixes #733
2012-05-20 12:51: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
9800bcf421
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
b230d14d4a
Add SparkleShare.txt and .sparkleshare in a single commit
2012-04-26 16:02:59 +02:00
Hylke Bons
b087fde663
Implement encryption using OpenSSL's AES + Mac UI
2012-04-26 16:02:58 +02:00
Hylke Bons
145e8fe01d
repo git: Don't follow symlinks when preparing the tree. Fixes #701
2012-04-17 19:00:05 +02:00
Hylke Bons
5829bf4622
git: write error outputs to the debug.log for easier debugging
2012-04-17 11:05:51 +02:00
Hylke Bons
d542f3e75a
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
37f8e050c6
config: allow to specify a custom path for each folder. Closes #680
2012-04-15 19:03:36 +02:00
Hylke Bons
192779a1b7
repo git: on conflicts, put timestamp before file extension. Fixes #699
2012-04-15 11:50:03 +02:00
Hylke Bons
9ccc9e6a08
repo git: add debug info for #677
2012-04-10 23:19:33 +02:00
Hylke Bons
8fc30c7d0f
repo: basic support for quota detection
2012-04-04 23:45:20 +01:00
