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
5bef8dd3cc
fetcher: code cleanup
2012-07-22 22:54:59 +02:00
Hylke Bons
1d8e8eb810
Disable git-bin by default
2012-07-22 20:59: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
3bd2630a13
git: Use the same Unicode form on all filesystems. Closes #478
2012-07-15 21:01:06 +02:00
Hylke Bons
0839657282
repo: remove unneeded try/catch block and fix up some logic
2012-07-14 17:18:29 +02:00
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