~bzr-pqm/bzr/bzr.dev

Committer: mbp at sourcefrog
Date: 2005-04-06 03:38:35 UTC
Revision ID: mbp@sourcefrog.net-20050406033835-0a8142f2ed51db26f3a3681c

- Use a non-null file_id for the branch root directory.  At the moment
  this is fixed; in the future it should be stored in the directory
  and perhaps be randomized at each branch init.  It is not written
  out to the inventory at all as yet.

- Various branch code cleanups to support this.

- If an exception occurs, log traceback into .bzr.log and print a
  message saying it's there.

- New file-id-path command and more help.

- Some pychecker fixups.

- InventoryEntry constructor parameters now require an entry kind and
  a parent_id.

- Fix up cat command when reading a file from a previous revision.

files modified:
bzrlib/branch.py

bzrlib/commands.py

bzrlib/diff.py

bzrlib/inventory.py

bzrlib/osutils.py

bzrlib/tree.py

Show diffs side-by-side

added added

removed removed

bzrlib/tree.py

157

return file(self.abspath(filename), 'rb')

158

159

def _get_store_filename(self, file_id):

160

## XXX: badly named; this isn't in the store at all

160

161

return self.abspath(self.id2path(file_id))

161

162

163

def has_id(self, file_id):

194

195

"""

195

196

inv = self.inventory

196

197

def descend(from_dir, from_dir_id, dp):

198

def descend(from_dir_relpath, from_dir_id, dp):

198

199

ls = os.listdir(dp)

199

200

ls.sort()

200

201

for f in ls:

205

206

continue

206

207

208

# path within tree

208

fp = appendpath(from_dir, f)

209

fp = appendpath(from_dir_relpath, f)

209

210

211

# absolute path

211

212

fap = appendpath(dp, f)

237

238

for ff in descend(fp, f_ie.file_id, fap):

238

239

yield ff

239

240

for f in descend('', None, self.basedir):

241

for f in descend('', inv.root.file_id, self.basedir):

241

242

yield f

242

243

244

Older »