~bzr-pqm/bzr/bzr.dev

Committer: John Arbash Meinel
Date: 2005-12-01 17:11:25 UTC
mto: (1185.50.19 bzr-jam-integration)
mto: This revision was merged to the branch mainline in revision 1532.
Revision ID: john@arbash-meinel.com-20051201171125-5e1f0970246c4925

Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \

Show diffs side-by-side

added added

removed removed

bzrlib/upgrade.py

from bzrlib.xml4 import serializer_v4

from bzrlib.xml5 import serializer_v5

from bzrlib.trace import mutter, note, warning

from bzrlib.osutils import sha_strings, sha_string

from bzrlib.osutils import sha_strings, sha_string, pathjoin

class Convert(object):

118

from bzrlib.store import hash_prefix

119

for store_name in ["weaves", "revision-store"]:

120

note("adding prefixes to %s" % store_name)

121

store_dir = os.path.join(self.base, ".bzr", store_name)

121

store_dir = pathjoin(self.base, ".bzr", store_name)

122

for filename in os.listdir(store_dir):

123

if filename.endswith(".weave") or filename.endswith(".gz"):

124

file_id = os.path.splitext(filename)[0]

125

else:

126

file_id = filename

127

prefix_dir = os.path.join(store_dir, hash_prefix(file_id))

127

prefix_dir = pathjoin(store_dir, hash_prefix(file_id))

128

if not os.path.isdir(prefix_dir):

129

os.mkdir(prefix_dir)

130

os.rename(os.path.join(store_dir, filename),

131

os.path.join(prefix_dir, filename))

130

os.rename(pathjoin(store_dir, filename),

131

pathjoin(prefix_dir, filename))

132

self._set_new_format(BZR_BRANCH_FORMAT_6)

133

134

Older »