~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Committer: Aaron Bentley
Date: 2006-09-29 00:08:31 UTC
mfrom: (1731.1.58 unique-root)
mto: (2100.3.5 by-reference-trees)
mto: This revision was merged to the branch mainline in revision 2322.
Revision ID: aaron.bentley@utoronto.ca-20060929000831-4c2597019907aa80

Merge from unique-root

Show diffs side-by-side

added added

removed removed

bzrlib/transform.py

1237

pp.next_phase()

1238

wt_interesting = [i for i in working_tree.inventory if interesting(i)]

1239

child_pb = bzrlib.ui.ui_factory.nested_progress_bar()

1240

basis_tree = None

1240

1241

try:

1241

1242

for id_num, file_id in enumerate(wt_interesting):

1242

1243

if (working_tree.inventory.is_root(file_id) and

1251

1252

file_kind = working_tree.kind(file_id)

1252

1253

except NoSuchFile:

1253

1254

file_kind = None

1255

delete_merge_modified = (file_id in merge_modified)

1254

1256

if file_kind != 'file' and file_kind is not None:

1255

1257

keep_contents = False

1256

delete_merge_modified = False

1257

1258

else:

1259

if basis_tree is None:

1260

basis_tree = working_tree.basis_tree()

1261

wt_sha1 = working_tree.get_file_sha1(file_id)

1258

1262

if (file_id in merge_modified and

1259

merge_modified[file_id] ==

1260

working_tree.get_file_sha1(file_id)):

1261

keep_contents = False

1262

delete_merge_modified = True

1263

merge_modified[file_id] == wt_sha1):

1264

keep_contents = False

1265

elif (file_id in basis_tree and

1266

basis_tree.get_file_sha1(file_id) == wt_sha1):

1267

keep_contents = False

1263

1268

else:

1264

1269

keep_contents = True

1265

delete_merge_modified = False

1266

1270

if not keep_contents:

1267

1271

tt.delete_contents(trans_id)

1268

1272

if delete_merge_modified:

Older »