Hylke Bons
3496bfba75
Some rearrangements
2012-07-14 12:45:54 +02:00
Hylke Bons
e58bd78148
Disable git-bin
2012-07-08 12:49:17 +02:00
Hylke Bons
430b7f7a4b
fetcher git: show error messages when host key has changed
2012-07-08 12:30:37 +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
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
Hylke Bons
0a2f5929b6
fetcher: Add debug info for #692
2012-04-11 12:51:53 +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
bad4bf9a46
Add option to add projects without full history (git: --depth=1)
2012-03-29 01:44:26 +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
ae61d47be8
remove some TODOs
2012-03-15 23:54:18 +00:00
Hylke Bons
15ff139bf5
setup controller: refactor some order logic. Fixes #627 #630
2012-03-14 03:26:42 +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
ae907e54f4
window setup: implement warning about global gitignore
2012-03-09 04:04:16 +00:00
Hylke Bons
5080e036ee
Fix some instances of 'could not load backend'
2012-03-08 23:27:49 +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
d40b387004
setup: Create a reusable plugin for each succesfully used host. Closes #547
2012-03-01 23:57:12 +00:00
Hylke Bons
57ade79173
Fix progress delay when there was an error
2012-03-01 17:48:05 +00:00
Hylke Bons
2eaefb452c
sparklelib: use a nice SparkleLib.Git namespace
2012-03-01 17:02:52 +00:00
Shish
f0f00b97de
wibble automake to build the extra backend
2012-02-28 14:34:23 +00:00
Shish
3aa614565c
get the backend to load the shared library
2012-02-28 13:34:15 +00:00
Hylke Bons
32a696e696
Merge branch 'gettext-cs' of https://github.com/serras/SparkleShare into windows
2012-02-27 16:34:58 +00:00
serras
ab6765868d
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons
9190988597
fetcher git: don't simulate progress when clone command failed
2012-02-26 15:58:09 +00:00
Hylke Bons
910a05ae0b
fetcher: always finish the progress reporting animation smoothly to 100%
2012-02-18 23:16:25 +01:00
Hylke Bons
c1d54929a4
invites: upload the user's pubkey on invite accept
2012-02-17 21:26:13 +01:00
Hylke Bons
85d33dd135
fetcher git: add FIXME
2012-02-17 02:48:41 +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
f5c433f327
Merge branch 'disconnect'. Fixes #508
...
Conflicts:
SparkleLib/SparkleListenerBase.cs
SparkleLib/SparkleListenerTcp.cs
2012-02-08 02:24:02 +01:00
Hylke Bons
40127b849a
repo: change CheckForRemoteChanges method to HasRemoteChanges property
2012-02-06 15:02:41 +01:00
Hylke Bons
edacb8ca5d
Remove SparkleBackend crap
2012-02-06 14:43:31 +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
e750f2e7b8
windows: don't show terminal window when running commands
2012-02-05 12:05:47 +01:00
Hylke Bons
8af28f3b9f
fetcher: move exclude rules to base class. Closes #564
2012-01-31 21:30:23 +00:00
Hylke Bons
2fdad29e0e
controller: fix repo loading
2012-01-29 20:33:12 +00:00
Hylke Bons
62c8a1fcb2
fetcher git: fix type. Closes #565
2012-01-29 18:12:43 +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
Hylke Bons
602ffa2280
Allow ports to be specified once again. Fixes #555
2012-01-23 23:50:54 +00:00
serras
d9c072669a
Merge branch 'master' into gettext-cs
2012-01-22 19:19:19 +01:00
Hylke Bons
c5bbd382a8
git: remove unneeded reference
2012-01-22 17:29:14 +00:00
Hylke Bons
43f2129236
mac: set the --exec-path when calling the bundled git
2012-01-22 17:17:36 +00: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
ecb19db9b7
fetcher git: Add some memory limiting settings to the config. Closes #519
2012-01-18 01:50:47 +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
e50cbc69bb
git config: Add a tab before options
2012-01-17 01:08:26 +00:00
Hylke Bons
f6637233be
git put SparkleGit class in its own file
2012-01-16 20:23:12 +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
669d1d9f5a
fetcher git: ignore Mercurial and Bazaar databases
2012-01-16 19:57:11 +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
a58342a798
fetcher git: make url parsing more readable by using the Uri object
2012-01-13 23:47:19 +00:00
Hylke Bons
807dd55d90
fetcher git: Cleanup
2012-01-13 20:18:16 +00:00
Hylke Bons
a908fde11e
git: Resolve the ?? 'conflict' by adding. Fixes #509
2012-01-12 01:01:24 +00:00
Hylke Bons
aa5aae1922
git: Don't compress already compressed file formats
2012-01-11 22:15:13 +00:00
serras
1dd3bdeaf9
Use layout in setup windows
2012-01-09 18:36:24 +01:00
serras
d91220f04e
Make it compile with Sparkleshare 0.6 and create .msi file correctly
2012-01-08 22:31:14 +01:00
serras
b98c4ee5fb
Merge remote-tracking branch 'hbons/master' into gettext-cs
...
Conflicts:
.gitignore
.gitmodules
SparkleLib/Git/SparkleFetcherGit.cs
SparkleLib/Hg/SparkleRepoHg.cs
SparkleLib/SparkleConfig.cs
SparkleLib/SparkleFetcherBase.cs
SparkleLib/SparkleListenerIrc.cs
SparkleShare/SparkleBubblesController.cs
SparkleShare/SparkleControllerBase.cs
SparkleShare/SparkleStatusIcon.cs
2012-01-07 14:13:36 +01:00
Hylke Bons
84e3fff6df
repo: Also report progress on fetch
2011-12-30 15:00:15 +01:00
Hylke Bons
eb65f5e125
statusicon: add sync progress stats (one repo at a time only for now). Closes #222
2011-12-30 01:44:41 +01:00
Hylke Bons
aaf540a3ff
Don't exclude all dotfiles, Fixes #495
2011-12-29 12:44:18 +01:00
Hylke Bons
883e0acc1c
Fix warning
2011-12-25 20:32:39 +01:00
Hylke Bons
2b71c01f09
fetcher git: Fix race condition when stopping a clone
2011-12-24 19:17:54 +01:00
Hylke Bons
fa1f52ad68
fetcher git: set the working dir to the tmp path. Fixes #488
2011-12-24 18:04:43 +01:00
Hylke Bons
53db52610f
Use folders_path config option to create the tmo dir when it is set. Fixes #485
2011-12-18 17:10:06 +01:00
Hylke Bons
89c75c0746
event log: report size and history size. Closes #379
2011-12-15 16:15:29 +01:00
Hylke Bons
c01c8525ef
repo: Improve handling of offline repos. Fixes #439
2011-12-03 12:40:55 +01:00
Hylke Bons
d83df10953
git: strip .empty from file paths in commit messages
2011-12-03 12:40:55 +01:00
Hylke Bons
6cb6eebca4
fetcher git: always create folder for ignore file first. Fixes #460
2011-12-01 19:41:49 +01:00
Hylke Bons
1856a9e922
repo git: also check for number of dirs before creating .empty file
2011-11-30 15:04:56 +01:00
Hylke Bons
e4317fc412
setup: Show a warning when the user has a global gitignore. Closes #432
2011-11-28 14:40:34 +01:00
wimh
a3899d6b1f
Merge remote-tracking branch 'upstream/master' into windows
2011-11-14 20:50:27 +01:00
Hylke Bons
92e698ec40
repo git: we only need to determine CurrentRevision once per session.
2011-11-13 00:39:29 +00:00
wimh
36d562ab2c
Merge remote-tracking branch 'upstream/master' into windows
2011-11-04 21:49:47 +01:00
Hylke Bons
1c801b1e94
Fix host key check disabling/enabling by surrounding config with comments. Closes #390 .
2011-10-30 21:24:19 +00:00
wimh
da5e79f217
Merge remote-tracking branch 'upstream/master' into windows
...
Conflicts:
SparkleLib/SparkleHelpers.cs
2011-10-27 19:12:04 +02:00
Hylke Bons
c9d5c2c8c2
git: add some more MS Office exclude rules
2011-10-24 19:43:55 +01:00
Hylke Bons
a7c130295f
git: add some more MS Office exclude rules
2011-10-24 19:42:18 +01:00