← Back to branch summary

~xaav/wikkid/fix-path

« back to all changes in this revision

Viewing changes to wikkid/filestore/bzr.py

  • Committer: Tim Penhey
  • Date: 2011-07-01 15:36:31 UTC
  • mfrom: (64.1.3 bfs)
  • Revision ID: tim@penhey.net-20110701153631-129utr1iu2c0qe0b
Fix the file id generation - Aaron Bentley

Show diffs side-by-side

added added

removed removed

Lines of Context:
wikkid/filestore/bzr.py
12
12
from zope.interface import implements
13
13
 
14
14
from bzrlib.errors import BinaryFile, MalformedTransform
 
15
from bzrlib.generate_ids import gen_file_id
15
16
from bzrlib.merge3 import Merge3
16
17
from bzrlib.osutils import splitpath, split_lines
17
18
from bzrlib.revision import NULL_REVISION
69
70
    prev_trans_id = trans_id
70
71
    for parent_path, tail in iter_paths(path):
71
72
        trans_id = tt.trans_id_tree_path(parent_path)
72
 
        tt.adjust_path(tail, trans_id, prev_trans_id)
73
73
        if tt.tree_kind(trans_id) is not None:
74
74
            break
 
75
        tt.adjust_path(tail, trans_id, prev_trans_id)
75
76
        tt.create_directory(trans_id)
76
 
        tt.version_file(trans_id, trans_id)
77
 
        prev_name = tail
 
77
        tt.version_file(gen_file_id(tail), trans_id)
78
78
        prev_trans_id = trans_id
79
79
 
80
80
 
348
348
                if tt.tree_kind(trans_id) is not None:
349
349
                    tt.delete_contents(trans_id)
350
350
                else:
351
 
                    tt.version_file(trans_id, trans_id)
 
351
                    name = splitpath(path)[-1]
 
352
                    tt.version_file(gen_file_id(name), trans_id)
352
353
                    create_parents(tt, path, trans_id)
353
354
                tt.create_file(content, trans_id)
354
355
                try: