/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transform.py

• browse files at revision 7143.15.5
• compare with another revision
• compare with revision 7490.22.1
• download diff
• download tarball
• view history from revision 7143.15.5

Show diffs side-by-side

added

removed

breezy/transform.py

425

425

        changed_ids.update(changed_kind)

426

426

        # To find entries with changed parent_ids, find parents which existed,

427

427

        # but changed file_id.

428

 

        changed_file_id = set(t for t in new_file_id if t in self._removed_id)

429

428

        # Now add all their children to the set.

430

429

        for parent_trans_id in new_file_id:

431

430

            changed_ids.update(self.iter_tree_children(parent_trans_id))

1161

1160

                          for k, v in viewitems(attribs[b'_new_name'])}

1162

1161

        self._new_parent = {k.decode('utf-8'): v.decode('utf-8')

1163

1162

                            for k, v in viewitems(attribs[b'_new_parent'])}

1164

 

        self._new_executability = {k.decode('utf-8'): bool(v)

1165

 

                                   for k, v in viewitems(attribs[b'_new_executability'])}

 

1163

        self._new_executability = {

 

1164

            k.decode('utf-8'): bool(v)

 

1165

            for k, v in viewitems(attribs[b'_new_executability'])}

1166

1166

        self._new_id = {k.decode('utf-8'): v

1167

1167

                        for k, v in viewitems(attribs[b'_new_id'])}

1168

1168

        self._r_new_id = {v: k for k, v in viewitems(self._new_id)}

1175

1175

            self._tree_id_paths[trans_id] = path

1176

1176

        self._removed_id = {trans_id.decode('utf-8')

1177

1177

                            for trans_id in attribs[b'_removed_id']}

1178

 

        self._removed_contents = set(trans_id.decode('utf-8')

1179

 

                                     for trans_id in attribs[b'_removed_contents'])

1180

 

        self._non_present_ids = {k: v.decode('utf-8')

1181

 

                                 for k, v in viewitems(attribs[b'_non_present_ids'])}

 

1178

        self._removed_contents = set(

 

1179

            trans_id.decode('utf-8')

 

1180

            for trans_id in attribs[b'_removed_contents'])

 

1181

        self._non_present_ids = {

 

1182

            k: v.decode('utf-8')

 

1183

            for k, v in viewitems(attribs[b'_non_present_ids'])}

1182

1184

        for ((trans_id, kind),), content in records:

1183

1185

            trans_id = trans_id.decode('utf-8')

1184

1186

            kind = kind.decode('ascii')

1370

1372

            raise errors.HardLinkNotSupported(path)

1371

1373

        try:

1372

1374

            unique_add(self._new_contents, trans_id, 'file')

1373

 

        except:

 

1375

        except BaseException:

1374

1376

            # Clean up the file, it never got registered so

1375

1377

            # TreeTransform.finalize() won't clean it up.

1376

1378

            os.unlink(name)

1575

1577

            osutils.ensure_empty_directory_exists(

1576

1578

                deletiondir,

1577

1579

                errors.ExistingPendingDeletion)

1578

 

        except:

 

1580

        except BaseException:

1579

1581

            tree.unlock()

1580

1582

            raise

1581

1583

 

1747

1749

                self._apply_removals(mover)

1748

1750

                child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)

1749

1751

                modified_paths = self._apply_insertions(mover)

1750

 

            except:

 

1752

            except BaseException:

1751

1753

                mover.rollback()

1752

1754

                raise

1753

1755

            else:

1781

1783

                inventory_delta.append((path, None, file_id, None))

1782

1784

            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in

1783

1785

                                     new_paths)

1784

 

            final_kinds = {}

1785

1786

            for num, (path, trans_id) in enumerate(new_paths):

1786

1787

                if (num % 10) == 0:

1787

1788

                    child_pb.update(gettext('adding file'),

1789

1790

                file_id = new_path_file_ids[trans_id]

1790

1791

                if file_id is None:

1791

1792

                    continue

1792

 

                needs_entry = False

1793

1793

                kind = self.final_kind(trans_id)

1794

1794

                if kind is None:

1795

1795

                    kind = self._tree.stored_kind(

1861

1861

        """

1862

1862

        new_paths = self.new_paths(filesystem_only=True)

1863

1863

        modified_paths = []

1864

 

        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in

1865

 

                                 new_paths)

1866

1864

        with ui.ui_factory.nested_progress_bar() as child_pb:

1867

1865

            for num, (path, trans_id) in enumerate(new_paths):

1868

1866

                if (num % 10) == 0:

2655

2653

        pp.next_phase()

2656

2654

        divert_trans = set(file_trans_id[f] for f in divert)

2657

2655

 

2658

 

        def resolver(t, c): return resolve_checkout(t, c, divert_trans)

 

2656

        def resolver(t, c):

 

2657

            return resolve_checkout(t, c, divert_trans)

2659

2658

        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)

2660

2659

        if len(raw_conflicts) > 0:

2661

2660

            precomputed_delta = None

2821

2820

            wt = tt._tree

2822

2821

            if wt.supports_content_filtering() and filter_tree_path is not None:

2823

2822

                filters = wt._content_filter_stack(filter_tree_path)

2824

 

                chunks = filtered_output_bytes(chunks, filters,

2825

 

                                               ContentFilterContext(filter_tree_path, tree))

 

2823

                chunks = filtered_output_bytes(

 

2824

                    chunks, filters,

 

2825

                    ContentFilterContext(filter_tree_path, tree))

2826

2826

            tt.create_file(chunks, trans_id)

2827

2827

        finally:

2828

2828

            if f is not None:

2873

2873

                                      child_pb, filenames, backups,

2874

2874

                                      merge_modified, basis_tree)

2875

2875

    with ui.ui_factory.nested_progress_bar() as child_pb:

2876

 

        raw_conflicts = resolve_conflicts(tt, child_pb,

2877

 

                                          lambda t, c: conflict_pass(t, c, target_tree))

 

2876

        raw_conflicts = resolve_conflicts(

 

2877

            tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))

2878

2878

    conflicts = cook_conflicts(raw_conflicts, tt)

2879

2879

    return conflicts, merge_modified

2880

2880

 

2887

2887

    # than the target changes relative to the working tree. Because WT4 has an

2888

2888

    # optimizer to compare itself to a target, but no optimizer for the

2889

2889

    # reverse.

2890

 

    change_list = working_tree.iter_changes(target_tree,

2891

 

                                            specific_files=specific_files, pb=pb)

 

2890

    change_list = working_tree.iter_changes(

 

2891

        target_tree, specific_files=specific_files, pb=pb)

2892

2892

    if not target_tree.is_versioned(u''):

2893

2893

        skip_root = True

2894

2894

    else:

2996

2996

                # here IMO - Ian C 27/Oct/2009

2997

2997

                filter_tree_path = target_tree.id2path(file_id)

2998

2998

                filters = working_tree._content_filter_stack(filter_tree_path)

2999

 

                bytes = filtered_output_bytes(bytes, filters,

3000

 

                                              ContentFilterContext(filter_tree_path, working_tree))

 

2999

                bytes = filtered_output_bytes(

 

3000

                    bytes, filters,

 

3001

                    ContentFilterContext(filter_tree_path, working_tree))

3001

3002

                tt.create_file(bytes, trans_id, mode_id)

3002

3003

        else:

3003

3004

            for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(

3199

3200

            except OSError as e:

3200

3201

                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)

3201

3202

        # after rollback, don't reuse _FileMover

3202

 

        past_renames = None

3203

 

        pending_deletions = None

 

3203

        self.past_renames = None

 

3204

        self.pending_deletions = None

3204

3205

 

3205

3206

    def apply_deletions(self):

3206

3207

        """Apply all marked deletions"""

3207

3208

        for path in self.pending_deletions:

3208

3209

            delete_any(path)

3209

3210

        # after apply_deletions, don't reuse _FileMover

3210

 

        past_renames = None

3211

 

        pending_deletions = None

 

3211

        self.past_renames = None

 

3212

        self.pending_deletions = None

3212

3213

 

3213

3214

 

3214

3215

def link_tree(target_tree, source_tree):

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0