Christian Jann
1fbe6b6c96
Better way to fix bug "Found a bug but no bugtracker"
2011-04-06 17:09:05 +02:00
Christian Jann
92dc16a59e
Increase version numbers.
2011-04-06 17:08:52 +02:00
Christian Jann
c848d8ffd7
added conflict-copy option to csync client
2011-04-06 17:08:30 +02:00
Christian Jann
2627275da5
updated .gitignore
2011-04-06 17:08:14 +02:00
Christian Jann
9864baa0c8
fixed small error:
...
csync/first/a~
was renamed to:
csync/first/~a_conflict-20110326-190457~
but it should be:
csync/first/a_conflict-20110326-190457~
2011-04-06 17:08:01 +02:00
Christian Jann
d842119065
improved logging
2011-04-06 17:07:20 +02:00
Duncan Mac-Vicar P
25315dfdec
fix warning
2011-04-06 17:03:10 +02:00
Christian Jann
e4d8e793f6
added new conflict resolution to libcsync
...
- use the latest version of the two files under its original filename
in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
using the same file extension with appended marker (e.g. "conflict")
and timestamp in both destinations
(e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
on the side where the conflict has occurred and gets synced to the other side
on the second sync.
2011-04-06 16:57:24 +02:00
Christian Jann
29616c0b2e
ignore kdevelop project files
2011-04-06 16:56:27 +02:00
Christian Jann
09980fcf5a
fix hundreds of these warnings:
...
csync.c:272:75: warning: ISO C99 requires rest arguments to be used
2011-04-06 16:56:05 +02:00
Christian Jann
f76d9fbcc3
added kate's suffix for backupfiles to .gitignore
2011-04-06 16:55:14 +02:00
Duncan Mac-Vicar P
a4c5996f47
Make the folders network state aware
2011-04-06 15:57:18 +02:00
Duncan Mac-Vicar P
65c41b6368
add simple network location infrastructure
2011-04-06 15:22:40 +02:00
Duncan Mac-Vicar P
5162b9def2
missing goal
2011-04-06 13:50:31 +02:00
Duncan Mac-Vicar P
598929a22f
better goals
2011-04-06 13:49:58 +02:00
Duncan Mac-Vicar P
098c848e02
Merge branch 'master' of github.com:dmacvicar/mirall
2011-04-06 12:10:33 +02:00
Duncan Mac-Vicar P
293333b28e
add license text
2011-04-06 12:10:16 +02:00
Duncan Mac-Vicar P
f882fe46e2
Use icons from theme. Qt already handles this in a nice way
2011-04-06 12:09:56 +02:00
Duncan Mac-Vicar P
2411b0c9b7
add proper licensing
2011-04-06 11:48:02 +02:00
Duncan Mac-Vicar P
9a6a87d9af
add proper licensing
2011-04-06 11:45:05 +02:00
Duncan Mac-Vicar P
637068236f
fix markdown in README
2011-04-06 11:31:54 +02:00
Duncan Mac-Vicar P
5ebaca5b8d
preparing for first packaging
2011-04-06 11:28:38 +02:00
Duncan Mac-Vicar P
493b6924c9
Setup the menu for new added folders
2011-04-06 10:56:20 +02:00
Duncan Mac-Vicar P
ab86052f8a
typo, it is path() not root()
2011-04-06 10:56:16 +02:00
Duncan Mac-Vicar P
79f28c7f10
stop poll timer when syncing, and add path to the debug messages
2011-04-06 10:40:15 +02:00
Duncan Mac-Vicar P
c19c9859e3
add alias to folder
2011-04-06 09:52:02 +02:00
Duncan Mac-Vicar P
c16fd94150
Fix crash at shutdown.
...
Menu contains actions from the folders so we should
first delete the tray and the folders later.
Also change QHash in inotify watcher map to QMap as QHash
gives weird crashes with the inotify thread.
2011-04-05 18:31:19 +02:00
Duncan Mac-Vicar P
f1d6352f27
working folder wizard, only actual creation of the folder pending
2011-04-05 18:31:14 +02:00
Duncan Mac-Vicar P
9055cdc60d
move polling system to Folder where it belongs
2011-04-05 12:16:24 +02:00
Duncan Mac-Vicar P
e721acd7e8
add folder wizard class
2011-04-05 11:10:44 +02:00
Duncan Mac-Vicar P
4e45cab2c1
- lot of stability improvements
...
- the crash with threads goes away by using QMap
- add a polling timer
2011-04-04 18:41:14 +02:00
Duncan Mac-Vicar P
389507d92f
Change icon when sync is running
2011-04-04 12:23:30 +02:00
Duncan Mac-Vicar P
5aa1e08558
unused member variable
2011-04-04 11:40:14 +02:00
Duncan Mac-Vicar P
8d5a760d91
implemented dynamic creation of folder configurations
...
from INI files in user's home directory
2011-04-04 11:36:44 +02:00
Duncan Mac-Vicar P
f22caca96b
- refactor tests repeat-myself with a cmake macro
...
- enable cmake testing
2011-03-31 20:26:51 +02:00
Duncan Mac-Vicar P
9ac0397ff9
unneeded
2011-03-31 20:26:32 +02:00
Duncan Mac-Vicar P
3f32499c4e
If the first event happens before 5 secs after starting the
...
program, it will always cause it to queue it to avoid event
flood (5 secs). So don't init the QTime for last event, and then
check if it is null.
2011-03-31 19:07:45 +02:00
Duncan Mac-Vicar P
7bac43c5c3
I missunderstood how mkdtemp worked. Allocate a buffer duplicating
...
the template. Then free this buffer.
2011-03-31 19:06:30 +02:00
Duncan Mac-Vicar P
f917dbc2ad
- Use a full sync (without -path) the first time
...
unison is invoked
- disable -confirmbigdel
2011-03-31 08:19:04 +02:00
Duncan Mac-Vicar P
bad489adcc
add testcases for unison
2011-03-30 23:36:30 +02:00
Duncan Mac-Vicar P
9d09b7ea5f
show only a summary of subdirectories
2011-03-29 22:23:42 +02:00
Duncan Mac-Vicar P
1b19507ca8
* Missing brackets changed all logic around an 'if'
...
* Improve debug output
2011-03-28 11:54:10 +02:00
Duncan Mac-Vicar P
15579232f7
refactor the notification timer in a new method
...
some debug messages cleanup
2011-03-27 23:29:45 +02:00
Duncan Mac-Vicar P
6b8589f4dc
When syncing, disable event notifier and start accumulating them
...
until the sync is done. When they are enabled again, a forced
event is scheduled to empty the queue.
2011-03-27 01:26:41 +01:00
Duncan Mac-Vicar P
64e4d531b3
sync process now runs, but no synchronization between sync processes
2011-03-25 18:25:56 +01:00
Duncan Mac-Vicar P
f31ddde36d
Merge branch 'fix_inotify'
...
Conflicts:
src/mirall/folder.cpp
src/mirall/folder.h
2011-03-22 23:21:56 +01:00
Duncan Mac-Vicar P
d885fe39f8
Implement an event queue:
...
- If FolderWatcher receives a inotify event in less than 5
seconds from the last one, then the paths are queued and a timer
is setup for 5 seconds more. New events are queued if a timer
is running. The next event after the time gap is due will process
the full path list
2011-03-22 23:03:43 +01:00
Duncan Mac-Vicar P
f42169a8fc
The unison folder class.
...
May be factor it out in a external process tool folder type later.
2011-03-21 00:58:53 +01:00
Duncan Mac-Vicar P
25685de4fd
move the subfolder list function to FileUtils
2011-03-20 22:43:03 +01:00
Duncan Mac-Vicar P
89361db55d
Only fire folderChanged if > 2 seconds since last event
2011-03-20 22:38:33 +01:00
