~bzr-pqm/bzr/bzr.dev

Use a set() for conflicts_related to stay O(1).

added added

removed removed

389

ignored = {}

390

dirs_to_add = []

391

user_dirs = set()

392

conflicts_related = []

392

conflicts_related = set()

393

# Not all mutable trees can have conflicts

394

if getattr(self, 'conflicts', None) is not None:

395

# Collect all related files without checking whether they exist or

396

# are versioned. It's cheaper to do that once for all conflicts

397

# than trying to find the relevant conflict for each added file.

398

for c in self.conflicts():

399

conflicts_related.extend(c.associated_filenames())

399

conflicts_related.update(c.associated_filenames())

400

401

# validate user file paths and convert all paths to tree

402

# relative : it's cheaper to make a tree relative path an abspath