Hylke Bons
34df1996cf
repo git: Fix endless loop when adding empty folders. Closes #967
2012-09-23 12:10:51 +01:00
Hylke Bons
4118f1949c
repo: don't allow multiple syncs at the same time on startup. Fixes #985
2012-09-22 22:43:40 +01:00
Hylke Bons
05101acf28
Merge pull request #984 from brandondahler/master
...
Too large commit log causes git to hang
2012-09-22 05:37:34 -07:00
Brandon Dahler
efd642253a
Fix bug from too large of commit log (introduced 1c8cffd178
).
2012-09-21 19:27:26 -05:00
Hylke Bons
bb67a05e56
statusicon: On sync fail, add error descriptions as submenus. Closes #874
2012-09-18 19:40:06 +01:00
Hylke Bons
7c6e4c4980
repo git: set remote.origin.url from config.xml on startup. #972
2012-09-17 11:22:42 +01:00
Hylke Bons
e8f645147e
docs: Add howto to repo and use 'storage' as default user
2012-08-04 17:22:34 +02:00
Hylke Bons
c65e800d2e
Add backend support for listing history of a file and reverting
2012-08-04 00:32:44 +02:00
Hylke Bons
c9e4218358
Remove Helpers class, add Logger class
2012-07-28 15:58:09 +02:00
Hylke Bons
b4126d11b1
Fix log parse logic
2012-07-26 20:17:01 +02:00
Hylke Bons
ff89044289
repo git: Simplify
2012-07-26 12:43:16 +02:00
Hylke Bons
a90390b22f
lib git: simplify process starting
2012-07-26 12:30:00 +02:00
Hylke Bons
6ced798b3f
Fix build. Closes #876
2012-07-25 13:28:50 +02:00
Hylke Bons
34edbbb99e
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
d1eba721ca
repo git: code cleanup
2012-07-22 11:40:49 +02:00
Hylke Bons
d812c4c146
repo: move changeset list creation logic to base class
2012-07-19 22:21:38 +02:00
Hylke Bons
e8af571c2b
lib: code cleanup
2012-07-18 14:51:09 +02:00
Hylke Bons
3496bfba75
Some rearrangements
2012-07-14 12:45:54 +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
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
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
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
Hylke Bons
40127b849a
repo: change CheckForRemoteChanges method to HasRemoteChanges property
2012-02-06 15:02:41 +01:00
Hylke Bons
aa9b67ffa5
Clean up and remove unneeded references
2012-02-06 14:11:08 +01:00
serras
22d40fd3ea
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
2012-02-05 18:54:32 +01:00
Hylke Bons
2fdad29e0e
controller: fix repo loading
2012-01-29 20:33:12 +00:00
Hylke Bons
4d89897267
event log: show repo url upon hovering of the folder name. Closes #544
2012-01-27 00:52:56 +00:00
Hylke Bons
f892fd9c11
git: always get the url to use from the config.xml. Closes #556
2012-01-25 18:30:57 +00:00
praktikant
154a4e65bf
adapted coding style
2012-01-24 14:46:57 +01:00
praktikant
12f18f34b8
Fixing #298 again first try
2012-01-24 10:47:46 +01:00
serras
bd43afc13c
Make it compile again in Windows
2012-01-19 20:21:48 +01:00
serras
69c5c1dfde
Merge branch 'master' into gettext-cs
2012-01-19 20:04:49 +01:00
Hylke Bons
2a98aec8c7
repo: Cache folder sizes and update them after a sync. Closes #535
2012-01-18 23:21:09 +00:00
Hylke Bons
e367614390
git: Only parse the first 250 files per commit, prevents huge resource consumption. Fixes #500
2012-01-18 00:44:15 +00:00
Hylke Bons
f9a5e6911a
git: Don't turn git repos into submodules, add only the checkout, not the database. Closes #335
2012-01-16 19:58:25 +00:00
Hylke Bons
16280826f5
repo: Move progress interval logic to base class
2012-01-15 23:45:17 +00:00
serras
6148cfc8b2
Merge branch 'master' into gettext-cs
2012-01-14 11:21:53 +01:00
Hylke Bons
a908fde11e
git: Resolve the ?? 'conflict' by adding. Fixes #509
2012-01-12 01:01:24 +00:00
serras
1dd3bdeaf9
Use layout in setup windows
2012-01-09 18:36:24 +01:00