~bzr-pqm/bzr/bzr.dev : revision 4216

104

def completed(self, revno, rev_id):

105

pass

106

107

def deleted(self, file_id):

107

def deleted(self, path):

108

pass

109

110

def escaped(self, escape_count, message):

130

note(format, *args)

131

132

def snapshot_change(self, change, path):

133

if change == 'unchanged':

134

return

135

if change == 'added' and path == '':

133

if path == '' and change in ('added', 'modified'):

136

134

return

137

135

self._note("%s %s", change, path)

138

136

151

149

def completed(self, revno, rev_id):

152

150

self._note('Committed revision %d.', revno)

153

151

154

def deleted(self, file_id):

155

self._note('deleted %s', file_id)

152

def deleted(self, path):

153

self._note('deleted %s', path)

156

154

157

155

def escaped(self, escape_count, message):

158

156

self._note("replaced %d control characters in message", escape_count)

275

273

minimum_path_selection(specific_files))

276

274

else:

277

275

self.specific_files = None

278

self.specific_file_ids = None

276

279

277

self.allow_pointless = allow_pointless

280

278

self.revprops = revprops

281

279

self.message_callback = message_callback

286

284

self.verbose = verbose

287

285

288

286

self.work_tree.lock_write()

287

self.parents = self.work_tree.get_parent_ids()

288

# We can use record_iter_changes IFF iter_changes is compatible with

289

# the command line parameters, and the repository has fast delta

290

# generation. See bug 347649.

291

self.use_record_iter_changes = (

292

not self.specific_files and

293

not self.exclude and

294

not self.branch.repository._format.supports_tree_reference and

295

(self.branch.repository._format.fast_deltas or

296

len(self.parents) < 2))

289

297

self.pb = bzrlib.ui.ui_factory.nested_progress_bar()

290

298

self.basis_revid = self.work_tree.last_revision()

291

299

self.basis_tree = self.work_tree.basis_tree()

309

317

if self.config is None:

310

318

self.config = self.branch.get_config()

311

319

312

# If provided, ensure the specified files are versioned

313

if self.specific_files is not None:

314

# Note: This routine is being called because it raises

315

# PathNotVersionedError as a side effect of finding the IDs. We

316

# later use the ids we found as input to the working tree

317

# inventory iterator, so we only consider those ids rather than

318

# examining the whole tree again.

319

# XXX: Dont we have filter_unversioned to do this more

320

# cheaply?

321

self.specific_file_ids = tree.find_ids_across_trees(

322

specific_files, [self.basis_tree, self.work_tree])

320

self._set_specific_file_ids()

323

321

324

322

# Setup the progress bar. As the number of files that need to be

325

323

# committed in unknown, progress is reported as stages.

336

334

self.pb.show_count = True

337

335

self.pb.show_bar = True

338

336

339

self.basis_inv = self.basis_tree.inventory

340

337

self._gather_parents()

341

338

# After a merge, a selected file commit is not supported.

342

339

# See 'bzr help merge' for an explanation as to why.

347

344

raise errors.CannotCommitSelectedFileMerge(self.exclude)

348

345

349

346

# Collect the changes

350

self._set_progress_stage("Collecting changes",

351

entries_title="Directory")

347

self._set_progress_stage("Collecting changes", counter=True)

352

348

self.builder = self.branch.get_commit_builder(self.parents,

353

349

self.config, timestamp, timezone, committer, revprops, rev_id)

354

350

364

360

self.reporter.started(new_revno, self.rev_id, master_location)

365

361

366

362

self._update_builder_with_changes()

367

self._report_and_accumulate_deletes()

368

363

self._check_pointless()

369

364

370

365

# TODO: Now the new inventory is known, check for conflicts.

430

425

# The initial commit adds a root directory, but this in itself is not

431

426

# a worthwhile commit.

432

427

if (self.basis_revid == revision.NULL_REVISION and

433

len(self.builder.new_inventory) == 1):

428

((self.builder.new_inventory is not None and

429

len(self.builder.new_inventory) == 1) or

430

len(self.builder._basis_delta) == 1)):

434

431

raise PointlessCommit()

435

# If length == 1, then we only have the root entry. Which means

436

# that there is no real difference (only the root could be different)

437

# unless deletes occured, in which case the length is irrelevant.

438

if (self.any_entries_deleted or

439

(len(self.builder.new_inventory) != 1 and

440

self.builder.any_changes())):

432

if self.builder.any_changes():

441

433

return

442

434

raise PointlessCommit()

443

435

631

623

"""Record the parents of a merge for merge detection."""

632

624

# TODO: Make sure that this list doesn't contain duplicate

633

625

# entries and the order is preserved when doing this.

634

self.parents = self.work_tree.get_parent_ids()

626

if self.use_record_iter_changes:

627

return

628

self.basis_inv = self.basis_tree.inventory

635

629

self.parent_invs = [self.basis_inv]

636

630

for revision in self.parents[1:]:

637

631

if self.branch.repository.has_revision(revision):

644

638

def _update_builder_with_changes(self):

645

639

"""Update the commit builder with the data about what has changed.

646

640

"""

647

# Build the revision inventory.

648

#

649

# This starts by creating a new empty inventory. Depending on

650

# which files are selected for commit, and what is present in the

651

# current tree, the new inventory is populated. inventory entries

652

# which are candidates for modification have their revision set to

653

# None; inventory entries that are carried over untouched have their

654

# revision set to their prior value.

655

#

656

# ESEPARATIONOFCONCERNS: this function is diffing and using the diff

657

# results to create a new inventory at the same time, which results

658

# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?

659

# ADHB 11-07-2006

660

661

641

exclude = self.exclude

662

642

specific_files = self.specific_files or []

663

643

mutter("Selecting files for commit with filter %s", specific_files)

664

644

665

# Build the new inventory

666

self._populate_from_inventory()

667

645

self._check_strict()

646

if self.use_record_iter_changes:

647

iter_changes = self.work_tree.iter_changes(self.basis_tree)

648

iter_changes = self._filter_iter_changes(iter_changes)

649

for file_id, path, fs_hash in self.builder.record_iter_changes(

650

self.work_tree, self.basis_revid, iter_changes):

651

self.work_tree._observed_sha1(file_id, path, fs_hash)

652

else:

653

# Build the new inventory

654

self._populate_from_inventory()

655

self._record_unselected()

656

self._report_and_accumulate_deletes()

657

658

def _filter_iter_changes(self, iter_changes):

659

"""Process iter_changes.

660

661

This method reports on the changes in iter_changes to the user, and

662

converts 'missing' entries in the iter_changes iterator to 'deleted'

663

entries. 'missing' entries have their

664

665

:param iter_changes: An iter_changes to process.

666

:return: A generator of changes.

667

"""

668

reporter = self.reporter

669

report_changes = reporter.is_verbose()

670

deleted_ids = []

671

for change in iter_changes:

672

if report_changes:

673

old_path = change[1][0]

674

new_path = change[1][1]

675

versioned = change[3][1]

676

kind = change[6][1]

677

versioned = change[3][1]

678

if kind is None and versioned:

679

# 'missing' path

680

if report_changes:

681

reporter.missing(new_path)

682

deleted_ids.append(change[0])

683

# Reset the new path (None) and new versioned flag (False)

684

change = (change[0], (change[1][0], None), change[2],

685

(change[3][0], False)) + change[4:]

686

elif kind == 'tree-reference':

687

if self.recursive == 'down':

688

self._commit_nested_tree(change[0], change[1][1])

689

if change[3][0] or change[3][1]:

690

yield change

691

if report_changes:

692

if new_path is None:

693

reporter.deleted(old_path)

694

elif old_path is None:

695

reporter.snapshot_change('added', new_path)

696

elif old_path != new_path:

697

reporter.renamed('renamed', old_path, new_path)

698

else:

699

if (new_path or

700

self.work_tree.branch.repository._format.rich_root_data):

701

# Don't report on changes to '' in non rich root

702

# repositories.

703

reporter.snapshot_change('modified', new_path)

704

self._next_progress_entry()

705

# Unversion IDs that were found to be deleted

706

self.work_tree.unversion(deleted_ids)

707

708

def _record_unselected(self):

668

709

# If specific files are selected, then all un-selected files must be

669

710

# recorded in their previous state. For more details, see

670

711

# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.

671

if specific_files or exclude:

712

if self.specific_files or self.exclude:

713

specific_files = self.specific_files or []

672

714

for path, old_ie in self.basis_inv.iter_entries():

673

715

if old_ie.file_id in self.builder.new_inventory:

674

716

# already added - skip.

675

717

continue

676

718

if (is_inside_any(specific_files, path)

677

and not is_inside_any(exclude, path)):

719

and not is_inside_any(self.exclude, path)):

678

720

# was inside the selected path, and not excluded - if not

679

721

# present it has been deleted so skip.

680

722

continue

681

723

# From here down it was either not selected, or was excluded:

682

if old_ie.kind == 'directory':

683

self._next_progress_entry()

684

724

# We preserve the entry unaltered.

685

725

ie = old_ie.copy()

686

726

# Note: specific file commits after a merge are currently

692

732

self.basis_tree, None)

693

733

694

734

def _report_and_accumulate_deletes(self):

695

# XXX: Could the list of deleted paths and ids be instead taken from

696

# _populate_from_inventory?

697

735

if (isinstance(self.basis_inv, Inventory)

698

736

and isinstance(self.builder.new_inventory, Inventory)):

699

737

# the older Inventory classes provide a _byid dict, and building a

717

755

self.builder.record_delete(path, file_id)

718

756

self.reporter.deleted(path)

719

757

720

def _populate_from_inventory(self):

721

"""Populate the CommitBuilder by walking the working tree inventory."""

758

def _check_strict(self):

759

# XXX: when we use iter_changes this would likely be faster if

760

# iter_changes would check for us (even in the presence of

761

# selected_files).

722

762

if self.strict:

723

763

# raise an exception as soon as we find a single unknown.

724

764

for unknown in self.work_tree.unknowns():

725

765

raise StrictCommitFailed()

726

766

767

def _populate_from_inventory(self):

768

"""Populate the CommitBuilder by walking the working tree inventory."""

769

# Build the revision inventory.

770

#

771

# This starts by creating a new empty inventory. Depending on

772

# which files are selected for commit, and what is present in the

773

# current tree, the new inventory is populated. inventory entries

774

# which are candidates for modification have their revision set to

775

# None; inventory entries that are carried over untouched have their

776

# revision set to their prior value.

777

#

778

# ESEPARATIONOFCONCERNS: this function is diffing and using the diff

779

# results to create a new inventory at the same time, which results

780

# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?

781

# ADHB 11-07-2006

782

727

783

specific_files = self.specific_files

728

784

exclude = self.exclude

729

785

report_changes = self.reporter.is_verbose()

743

799

name = existing_ie.name

744

800

parent_id = existing_ie.parent_id

745

801

kind = existing_ie.kind

746

if kind == 'directory':

747

self._next_progress_entry()

748

802

# Skip files that have been deleted from the working tree.

749

803

# The deleted path ids are also recorded so they can be explicitly

750

804

# unversioned later.

779

833

for segment in path_segments:

780

834

deleted_dict = deleted_dict.setdefault(segment, {})

781

835

self.reporter.missing(path)

836

self._next_progress_entry()

782

837

deleted_ids.append(file_id)

783

838

continue

784

839

# TODO: have the builder do the nested commit just-in-time IF and

874

929

InventoryEntry.MODIFIED_AND_RENAMED):

875

930

old_path = self.basis_inv.id2path(ie.file_id)

876

931

self.reporter.renamed(change, old_path, path)

932

self._next_progress_entry()

877

933

else:

934

if change == 'unchanged':

935

return

878

936

self.reporter.snapshot_change(change, path)

937

self._next_progress_entry()

879

938

880

def _set_progress_stage(self, name, entries_title=None):

939

def _set_progress_stage(self, name, counter=False):

881

940

"""Set the progress stage and emit an update to the progress bar."""

882

941

self.pb_stage_name = name

883

942

self.pb_stage_count += 1

884

self.pb_entries_title = entries_title

885

if entries_title is not None:

943

if counter:

886

944

self.pb_entries_count = 0

887

self.pb_entries_total = '?'

945

else:

946

self.pb_entries_count = None

888

947

self._emit_progress()

889

948

890

949

def _next_progress_entry(self):

893

952

self._emit_progress()

894

953

895

954

def _emit_progress(self):

896

if self.pb_entries_title:

897

if self.pb_entries_total == '?':

898

text = "%s [%s %d] - Stage" % (self.pb_stage_name,

899

self.pb_entries_title, self.pb_entries_count)

900

else:

901

text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,

902

self.pb_entries_title, self.pb_entries_count,

903

str(self.pb_entries_total))

955

if self.pb_entries_count is not None:

956

text = "%s [%d] - Stage" % (self.pb_stage_name,

957

self.pb_entries_count)

904

958

else:

905

text = "%s - Stage" % (self.pb_stage_name)

959

text = "%s - Stage" % (self.pb_stage_name, )

906

960

self.pb.update(text, self.pb_stage_count, self.pb_stage_total)

907

961

962

def _set_specific_file_ids(self):

963

"""populate self.specific_file_ids if we will use it."""

964

if not self.use_record_iter_changes:

965

# If provided, ensure the specified files are versioned

966

if self.specific_files is not None:

967

# Note: This routine is being called because it raises

968

# PathNotVersionedError as a side effect of finding the IDs. We

969

# later use the ids we found as input to the working tree

970

# inventory iterator, so we only consider those ids rather than

971

# examining the whole tree again.

972

# XXX: Dont we have filter_unversioned to do this more

973

# cheaply?

974

self.specific_file_ids = tree.find_ids_across_trees(

975

self.specific_files, [self.basis_tree, self.work_tree])

976

else:

977

self.specific_file_ids = None