Merge lp://staging/~isak-karlsson/syncany/syncany-remote-watch-interval into lp://staging/~syncany-team/syncany/trunk
- syncany-remote-watch-interval
- Merge into trunk
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~isak-karlsson/syncany/syncany-remote-watch-interval |
Merge into: | lp://staging/~syncany-team/syncany/trunk |
Diff against target: |
1264 lines (+451/-353) 7 files modified
syncany/src/org/syncany/config/Profile.java (+5/-0) syncany/src/org/syncany/gui/settings/ProfilePanel.form (+2/-2) syncany/src/org/syncany/gui/settings/ProfilePanel.java (+60/-60) syncany/src/org/syncany/gui/settings/RepositoryPanel.form (+73/-27) syncany/src/org/syncany/gui/settings/RepositoryPanel.java (+137/-115) syncany/src/org/syncany/i18n/I18n_en_US.properties (+2/-0) syncany/src/org/syncany/watch/remote/RemoteWatcher.java (+172/-149) |
To merge this branch: | bzr merge lp://staging/~isak-karlsson/syncany/syncany-remote-watch-interval |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Philipp C. Heckel | Approve | ||
Review via email:
|
Commit message
Description of the change
Added the ability to change the remote checking inverval.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Philipp C. Heckel (binwiederhier) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
isakkarlsson (isak-karlsson) wrote : | # |
I'll fix the native.py script first..
On 06/16/2011 05:13 PM, Philipp C. Heckel wrote:
> I'll review this tonight and then merge it :-D
>
> On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson<email address hidden> wrote:
>> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>
>> Requested reviews:
>> Syncany Team (syncany-team)
>>
>> For more details, see:
>> https:/
>>
>> Added the ability to change the remote checking inverval.
>> --
>> https:/
>> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>
>> === modified file 'syncany/
>> --- syncany/
>> +++ syncany/
>> @@ -1,4 +1,4 @@
>> -#!/usr/bin/python
>> +#!/usr/bin/python2
>> #
>> # Syncany Linux Native Functions
>> # Copyright (C) 2011 Philipp C. Heckel<email address hidden>
>>
>> === modified file 'syncany/
>> --- syncany/
>> +++ syncany/
>> @@ -149,6 +149,8 @@
>> // Repo
>> repository = new Repository();
>> repository.
>> +
>> + remoteWatcher.
>>
>> // Folders
>> folders = new Folders(this);
>> @@ -175,5 +177,8 @@
>>
>> // Folders
>> folders.
>> +
>> + // Watcher
>> + remoteWatcher.
>> }
>> }
>>
>> === modified file 'syncany/
>> --- syncany/
>> +++ syncany/
>> @@ -28,8 +28,8 @@
>> <Component id="cbActive" alignment="0" min="-2" max="-2" attributes="0"/>
>> <Group type="102" alignment="0" attributes="0">
>> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
>> -<EmptySpace max="-2" attributes="0"/>
>> -<Component id="txtProfileName" pref="344" max="32767" attributes="0"/>
>> +<EmptySpace min="-2" pref="62" max="-2" attributes="0"/>
>> +<Component id="txtProfileName" pref="294" max="32767" attributes="0"/>
>> </Group>
>> </Group>
>> <EmptySpace max="-2" attributes="0"/>
>>
>> === modified file 'syncany/
>> --- syncany/
>> +++ syncany/
>> @@ -69,65 +69,65 @@
>> * always regenerated by the F...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Philipp C. Heckel (binwiederhier) wrote : | # |
While you're at it: I noticed that due to your chanes in the GUI, the
internationaliz
was in the Netbeans-
overwritten it.
Could you by any chance try to make it work again? Maybe just
overwrite the values in the constructor of the frame:
lblXYZ.
On Thu, Jun 16, 2011 at 7:16 PM, isakkarlsson <email address hidden> wrote:
> I'll fix the native.py script first..
>
> On 06/16/2011 05:13 PM, Philipp C. Heckel wrote:
>> I'll review this tonight and then merge it :-D
>>
>> On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson<email address hidden> wrote:
>>> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>
>>> Requested reviews:
>>> Syncany Team (syncany-team)
>>>
>>> For more details, see:
>>> https:/
>>>
>>> Added the ability to change the remote checking inverval.
>>> --
>>> https:/
>>> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>
>>> === modified file 'syncany/
>>> --- syncany/
>>> +++ syncany/
>>> @@ -1,4 +1,4 @@
>>> -#!/usr/bin/python
>>> +#!/usr/bin/python2
>>> #
>>> # Syncany Linux Native Functions
>>> # Copyright (C) 2011 Philipp C. Heckel<email address hidden>
>>>
>>> === modified file 'syncany/
>>> --- syncany/
>>> +++ syncany/
>>> @@ -149,6 +149,8 @@
>>> // Repo
>>> repository = new Repository();
>>> repository.
>>> +
>>> + remoteWatcher.
>>>
>>> // Folders
>>> folders = new Folders(this);
>>> @@ -175,5 +177,8 @@
>>>
>>> // Folders
>>> folders.
>>> +
>>> + // Watcher
>>> + remoteWatcher.
>>> }
>>> }
>>>
>>> === modified file 'syncany/
>>> --- syncany/
>>> +++ syncany/
>>> @@ -28,8 +28,8 @@
>>> <Component id="cbActive" alignment="0" min="-2" max="-2" attributes="0"/>
>>> <Group type="102" alignment="0" attributes="0">
>>> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
>>> -<EmptySpace max="-2" attributes="0"/>
>>> -<Component id="txtProfileName" pref="344" max="32767" attributes="0"/>
>>> +<EmptySpace min="-2" pref="62" max="-2" attributes="0"/>
>...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
isakkarlsson (isak-karlsson) wrote : | # |
I've fixed it now.
On 06/16/2011 07:31 PM, Philipp C. Heckel wrote:
> While you're at it: I noticed that due to your chanes in the GUI, the
> internationaliz
> was in the Netbeans-
> overwritten it.
>
> Could you by any chance try to make it work again? Maybe just
> overwrite the values in the constructor of the frame:
> lblXYZ.
>
> On Thu, Jun 16, 2011 at 7:16 PM, isakkarlsson<email address hidden> wrote:
>> I'll fix the native.py script first..
>>
>> On 06/16/2011 05:13 PM, Philipp C. Heckel wrote:
>>> I'll review this tonight and then merge it :-D
>>>
>>> On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson<email address hidden> wrote:
>>>> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>
>>>> Requested reviews:
>>>> Syncany Team (syncany-team)
>>>>
>>>> For more details, see:
>>>> https:/
>>>>
>>>> Added the ability to change the remote checking inverval.
>>>> --
>>>> https:/
>>>> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>
>>>> === modified file 'syncany/
>>>> --- syncany/
>>>> +++ syncany/
>>>> @@ -1,4 +1,4 @@
>>>> -#!/usr/bin/python
>>>> +#!/usr/bin/python2
>>>> #
>>>> # Syncany Linux Native Functions
>>>> # Copyright (C) 2011 Philipp C. Heckel<email address hidden>
>>>>
>>>> === modified file 'syncany/
>>>> --- syncany/
>>>> +++ syncany/
>>>> @@ -149,6 +149,8 @@
>>>> // Repo
>>>> repository = new Repository();
>>>> repository.
>>>> +
>>>> + remoteWatcher.
>>>>
>>>> // Folders
>>>> folders = new Folders(this);
>>>> @@ -175,5 +177,8 @@
>>>>
>>>> // Folders
>>>> folders.
>>>> +
>>>> + // Watcher
>>>> + remoteWatcher.
>>>> }
>>>> }
>>>>
>>>> === modified file 'syncany/
>>>> --- syncany/
>>>> +++ syncany/
>>>> @@ -28,8 +28,8 @@
>>>> <Component id="cbActive" alignment="0" min="-2" max="-2" attributes="0"/>
>>>> <Group type="102" alignment="0" attributes="0">
>>>> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
>>>> -<EmptySpace m...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Philipp C. Heckel (binwiederhier) wrote : | # |
Hi Isak,
Just so you know; I reviewed the code and it looks good. However, I
did not yet merge it into the trunk, but I already merged it in my
local version. It'll be in the branch with the new sync algorithm (not
yet published).
Cheers,
Philipp
On Thu, Jun 16, 2011 at 8:12 PM, isakkarlsson <email address hidden> wrote:
> I've fixed it now.
>
> On 06/16/2011 07:31 PM, Philipp C. Heckel wrote:
>> While you're at it: I noticed that due to your chanes in the GUI, the
>> internationaliz
>> was in the Netbeans-
>> overwritten it.
>>
>> Could you by any chance try to make it work again? Maybe just
>> overwrite the values in the constructor of the frame:
>> lblXYZ.
>>
>> On Thu, Jun 16, 2011 at 7:16 PM, isakkarlsson<email address hidden> wrote:
>>> I'll fix the native.py script first..
>>>
>>> On 06/16/2011 05:13 PM, Philipp C. Heckel wrote:
>>>> I'll review this tonight and then merge it :-D
>>>>
>>>> On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson<email address hidden> wrote:
>>>>> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>>
>>>>> Requested reviews:
>>>>> Syncany Team (syncany-team)
>>>>>
>>>>> For more details, see:
>>>>> https:/
>>>>>
>>>>> Added the ability to change the remote checking inverval.
>>>>> --
>>>>> https:/
>>>>> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>>
>>>>> === modified file 'syncany/
>>>>> --- syncany/
>>>>> +++ syncany/
>>>>> @@ -1,4 +1,4 @@
>>>>> -#!/usr/bin/python
>>>>> +#!/usr/bin/python2
>>>>> #
>>>>> # Syncany Linux Native Functions
>>>>> # Copyright (C) 2011 Philipp C. Heckel<email address hidden>
>>>>>
>>>>> === modified file 'syncany/
>>>>> --- syncany/
>>>>> +++ syncany/
>>>>> @@ -149,6 +149,8 @@
>>>>> // Repo
>>>>> repository = new Repository();
>>>>> repository.
>>>>> +
>>>>> + remoteWatcher.
>>>>>
>>>>> // Folders
>>>>> folders = new Folders(this);
>>>>> @@ -175,5 +177,8 @@
>>>>>
>>>>> // Folders
>>>>> folders.
>>>>> +
>>>>> + // Watcher
>>>>> + remoteWatcher.
>>>>> }
>>>>> }
>>>>>
>>>>> === modified file 'syncany/
>>>>> --- syncany/
...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
isakkarlsson (isak-karlsson) wrote : | # |
Hi,
Sounds like a plan. When will the thesis (on the algorithm) be publised?
Sounds like an interesting read.
Regards
On 06/17/2011 09:27 PM, Philipp C. Heckel wrote:
> Hi Isak,
>
> Just so you know; I reviewed the code and it looks good. However, I
> did not yet merge it into the trunk, but I already merged it in my
> local version. It'll be in the branch with the new sync algorithm (not
> yet published).
>
> Cheers,
> Philipp
>
> On Thu, Jun 16, 2011 at 8:12 PM, isakkarlsson<email address hidden> wrote:
>> I've fixed it now.
>>
>> On 06/16/2011 07:31 PM, Philipp C. Heckel wrote:
>>> While you're at it: I noticed that due to your chanes in the GUI, the
>>> internationaliz
>>> was in the Netbeans-
>>> overwritten it.
>>>
>>> Could you by any chance try to make it work again? Maybe just
>>> overwrite the values in the constructor of the frame:
>>> lblXYZ.
>>>
>>> On Thu, Jun 16, 2011 at 7:16 PM, isakkarlsson<email address hidden> wrote:
>>>> I'll fix the native.py script first..
>>>>
>>>> On 06/16/2011 05:13 PM, Philipp C. Heckel wrote:
>>>>> I'll review this tonight and then merge it :-D
>>>>>
>>>>> On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson<email address hidden> wrote:
>>>>>> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>>>
>>>>>> Requested reviews:
>>>>>> Syncany Team (syncany-team)
>>>>>>
>>>>>> For more details, see:
>>>>>> https:/
>>>>>>
>>>>>> Added the ability to change the remote checking inverval.
>>>>>> --
>>>>>> https:/
>>>>>> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>>>
>>>>>> === modified file 'syncany/
>>>>>> --- syncany/
>>>>>> +++ syncany/
>>>>>> @@ -1,4 +1,4 @@
>>>>>> -#!/usr/bin/python
>>>>>> +#!/usr/bin/python2
>>>>>> #
>>>>>> # Syncany Linux Native Functions
>>>>>> # Copyright (C) 2011 Philipp C. Heckel<email address hidden>
>>>>>>
>>>>>> === modified file 'syncany/
>>>>>> --- syncany/
>>>>>> +++ syncany/
>>>>>> @@ -149,6 +149,8 @@
>>>>>> // Repo
>>>>>> repository = new Repository();
>>>>>> repository.
>>>>>> +
>>>>>> + remoteWatcher.
>>>>>>
>>>>>> // Folders
>>>>>> folders = new Folders(this);
>>>>>> @@ -175,5 +177,8 @@
>>>>>>
>>>>>> // Folders
>>>>>> folders.
>>>>>> +
>>>>>> + // Watcher
>>>>>> + remoteWatcher.s...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Philipp C. Heckel (binwiederhier) wrote : | # |
Hi Isak,
Although the syncing stuff will be briefly described in the thesis, is
not really the core of my thesis -- I'm doing that just for fun :-D
The thesis is more about optimizing the bandwidth and storage
utilization.
I'll push the code as soon as it's working. Hopefully today or tomorrow :-D
Cheers
Philipp
On Sat, Jun 18, 2011 at 1:34 AM, isakkarlsson <email address hidden> wrote:
> Hi,
>
> Sounds like a plan. When will the thesis (on the algorithm) be publised?
> Sounds like an interesting read.
>
> Regards
>
> On 06/17/2011 09:27 PM, Philipp C. Heckel wrote:
>> Hi Isak,
>>
>> Just so you know; I reviewed the code and it looks good. However, I
>> did not yet merge it into the trunk, but I already merged it in my
>> local version. It'll be in the branch with the new sync algorithm (not
>> yet published).
>>
>> Cheers,
>> Philipp
>>
>> On Thu, Jun 16, 2011 at 8:12 PM, isakkarlsson<email address hidden> wrote:
>>> I've fixed it now.
>>>
>>> On 06/16/2011 07:31 PM, Philipp C. Heckel wrote:
>>>> While you're at it: I noticed that due to your chanes in the GUI, the
>>>> internationaliz
>>>> was in the Netbeans-
>>>> overwritten it.
>>>>
>>>> Could you by any chance try to make it work again? Maybe just
>>>> overwrite the values in the constructor of the frame:
>>>> lblXYZ.
>>>>
>>>> On Thu, Jun 16, 2011 at 7:16 PM, isakkarlsson<email address hidden> wrote:
>>>>> I'll fix the native.py script first..
>>>>>
>>>>> On 06/16/2011 05:13 PM, Philipp C. Heckel wrote:
>>>>>> I'll review this tonight and then merge it :-D
>>>>>>
>>>>>> On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson<email address hidden> wrote:
>>>>>>> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>>>>
>>>>>>> Requested reviews:
>>>>>>> Syncany Team (syncany-team)
>>>>>>>
>>>>>>> For more details, see:
>>>>>>> https:/
>>>>>>>
>>>>>>> Added the ability to change the remote checking inverval.
>>>>>>> --
>>>>>>> https:/
>>>>>>> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>>>>>>>
>>>>>>> === modified file 'syncany/
>>>>>>> --- syncany/
>>>>>>> +++ syncany/
>>>>>>> @@ -1,4 +1,4 @@
>>>>>>> -#!/usr/bin/python
>>>>>>> +#!/usr/bin/python2
>>>>>>> #
>>>>>>> # Syncany Linux Native Functions
>>>>>>> # Copyright (C) 2011 Philipp C. Heckel<email address hidden>
>>>>>>>
>>>>>>> === modified file 'syncany/
>>>>>>> --- syncany/
>>>>>>> +++ syncany/
>>>>>>> @@ -149,6 +149,8 @@
>>>>>>> // Repo
>>>>>>> repository = new Repositor...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Philipp C. Heckel (binwiederhier) wrote : | # |
changes have been merged in my newsync branch; and will be in the trunk soon.
Unmerged revisions
- 48. By isakkarlsson
-
fix resourceBundle
- 47. By isakkarlsson
-
fix native.py
- 46. By isakkarlsson
-
merge trunk
- 45. By isakkarlsson
-
moved the gui to RepositoryPanel seemed more fitting there..
- 44. By isakkarlsson
-
merge trunk
- 43. By isakkarlsson
-
Added possibility to change the remote watch check interval (to lower costs for i.e. google storage)
I'll review this tonight and then merge it :-D
On Thu, Jun 16, 2011 at 4:58 PM, isakkarlsson <email address hidden> wrote: /code.launchpad .net/~isak- karlsson/ syncany/ syncany- remote- watch-interval/ +merge/ 64850 /code.launchpad .net/~isak- karlsson/ syncany/ syncany- remote- watch-interval/ +merge/ 64850 bin/native. py' bin/native. py 2011-06-11 12:47:02 +0000 bin/native. py 2011-06-16 14:58:24 +0000 src/org/ syncany/ config/ Profile. java' src/org/ syncany/ config/ Profile. java 2011-05-23 16:50:04 +0000 src/org/ syncany/ config/ Profile. java 2011-06-16 14:58:24 +0000 load(node. findChildByName ("repository" )); load(node. findChildByName ("watcher" )); save(node. findOrCreateChi ldByXpath( "folders" , "folders")); save(node. findOrCreateChi ldByXpath( "watcher" , "watcher")); src/org/ syncany/ gui/settings/ ProfilePanel. form' src/org/ syncany/ gui/settings/ ProfilePanel. form 2011-05-23 16:50:04 +0000 src/org/ syncany/ gui/settings/ ProfilePanel. form 2011-06-16 14:58:24 +0000 src/org/ syncany/ gui/settings/ ProfilePanel. java' src/org/ syncany/ gui/settings/ ProfilePanel. java 2011-06-05 21:26:56 +0000 src/org/ syncany/ gui/settings/ ProfilePanel. java 2011-06-16 14:58:24 +0000 gs("unchecked" )
> isakkarlsson has proposed merging lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>
> Requested reviews:
> Syncany Team (syncany-team)
>
> For more details, see:
> https:/
>
> Added the ability to change the remote checking inverval.
> --
> https:/
> Your team Syncany Team is requested to review the proposed merge of lp:~isak-karlsson/syncany/syncany-remote-watch-interval into lp:syncany.
>
> === modified file 'syncany/
> --- syncany/
> +++ syncany/
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python2
> #
> # Syncany Linux Native Functions
> # Copyright (C) 2011 Philipp C. Heckel <email address hidden>
>
> === modified file 'syncany/
> --- syncany/
> +++ syncany/
> @@ -149,6 +149,8 @@
> // Repo
> repository = new Repository();
> repository.
> +
> + remoteWatcher.
>
> // Folders
> folders = new Folders(this);
> @@ -175,5 +177,8 @@
>
> // Folders
> folders.
> +
> + // Watcher
> + remoteWatcher.
> }
> }
>
> === modified file 'syncany/
> --- syncany/
> +++ syncany/
> @@ -28,8 +28,8 @@
> <Component id="cbActive" alignment="0" min="-2" max="-2" attributes="0"/>
> <Group type="102" alignment="0" attributes="0">
> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
> - <EmptySpace max="-2" attributes="0"/>
> - <Component id="txtProfileName" pref="344" max="32767" attributes="0"/>
> + <EmptySpace min="-2" pref="62" max="-2" attributes="0"/>
> + <Component id="txtProfileName" pref="294" max="32767" attributes="0"/>
> </Group>
> </Group>
> <EmptySpace max="-2" attributes="0"/>
>
> === modified file 'syncany/
> --- syncany/
> +++ syncany/
> @@ -69,65 +69,65 @@
> * always regenerated by the Form Editor.
> */
> @SuppressWarnin
> - // <editor-fold def...