← Back to branch summary

~dobey/ubuntuone-client/update-2-0

« back to all changes in this revision

Viewing changes to ubuntuone/u1sync/sync.py

  • Committer: Rodney Dawes
  • Date: 2009-06-26 17:01:42 UTC
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: rodney.dawes@canonical.com-20090626170142-a738504rgnarizuw
        Remove the canonical namespace, and just use ubuntuone as the toplevel
        Move storage/syncdaemon and storage/u1sync up a level

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/u1sync/sync.py
1
 
# canonical.ubuntuone.storage.u1sync.sync
 
1
# ubuntuone.u1sync.sync
2
2
#
3
3
# State update
4
4
#
31
31
CONFLICT_SYMBOL = "!"
32
32
DELETE_SYMBOL = "X"
33
33
 
34
 
from canonical.ubuntuone.storage.protocol import request
35
 
from canonical.ubuntuone.storage.protocol.dircontent_pb2 import (
 
34
from ubuntuone.storageprotocol import request
 
35
from ubuntuone.storageprotocol.dircontent_pb2 import (
36
36
    DIRECTORY, SYMLINK)
37
 
from canonical.ubuntuone.storage.u1sync.genericmerge import (
 
37
from ubuntuone.u1sync.genericmerge import (
38
38
    MergeNode, generic_merge)
39
 
from canonical.ubuntuone.storage.u1sync.utils import safe_mkdir
40
 
from canonical.ubuntuone.storage.u1sync.client import UnsupportedOperationError
 
39
from ubuntuone.u1sync.utils import safe_mkdir
 
40
from ubuntuone.u1sync.client import UnsupportedOperationError
41
41
 
42
42
def get_conflict_path(path, conflict_info):
43
43
    """Returns path for conflict file corresponding to path."""