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
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
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
10c6e2f5b3
make
2012-06-17 21:56:27 +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
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
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
26ef2173bb
repo git: add debug info for #677
2012-04-10 23:19:33 +02:00
Hylke Bons
513febcf1a
repo: basic support for quota detection
2012-04-04 23:45:20 +01:00
Hylke Bons
6d1b6adbf8
repo git: don't hang on large rebase outputs. Should fix #663
2012-03-28 23:11:41 +01:00
Hylke Bons
774db39599
Use .sparkleshare file for the repo ID, instad of the first commit hash
2012-03-26 00:41:52 +01:00
Hylke Bons
d5fd131a3a
repo git: ignore global gitconfig options when parsing the git log
2012-03-20 17:26:47 +00:00
Hylke Bons
4e4a2fa207
repo git: ignore global gitconfig options when parsing the git log
2012-03-20 17:20:28 +00:00
Hylke Bons
059c87b344
windows setup: Reverse button order
2012-03-17 01:44:27 +00:00
Hylke Bons
7afdaabc68
repo: Fix false 'Not everything is synced' messages after succesful conflict resolution
2012-03-16 01:53:23 +00:00
Hylke Bons
f6698520c6
repo git: add catch block to PrepareDirectories method
2012-03-12 19:56:06 +00:00
Hylke Bons
30b1b4a1bf
Remove the notes feature
2012-03-10 20:51:37 +00:00
Hylke Bons
b540d331aa
windows: some small fixes
2012-03-08 14:55:44 +00:00
Hylke Bons
8a798d675d
xplicitly hide supposed to be hidden files. Closes #605
2012-03-08 03:34:45 +00:00
Hylke Bons
b1493c74fb
save work on windows
2012-03-06 01:18:45 +00:00
Hylke Bons
2eaefb452c
sparklelib: use a nice SparkleLib.Git namespace
2012-03-01 17:02:52 +00:00
Shish
3aa614565c
get the backend to load the shared library
2012-02-28 13:34:15 +00:00
serras
ab6765868d
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons
c1d54929a4
invites: upload the user's pubkey on invite accept
2012-02-17 21:26:13 +01:00
Hylke Bons
ef3f15ebcf
repo git: adjust commit message for notes
2012-02-16 22:43:41 +01:00
Hylke Bons
7080a115e6
repo: don't recurse into first .git folder
2012-02-14 20:34:03 +01:00
serras
8c26969335
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/Git/SparkleFetcherGit.cs
2012-02-12 16:24:12 +01:00
Hylke Bons
93f9b7f777
event log: remove '.empty' files from rename entries of folders
2012-02-11 14:29:23 +01:00
Hylke Bons
06f70c5f2e
More cleanup of SparkleLib API
2012-02-09 02:46:25 +01:00
Hylke Bons
a4678941f4
Clean up SparkleLib API
2012-02-08 20:42:29 +01:00