~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

• browse files at revision 5222.2.6
• compare with another revision
• compare with revision 5200.1.2
• download diff
• download tarball
• view history from revision 5222.2.6

Show diffs side-by-side

added

removed

bzrlib/transform.py

1657

1657

                      or trans_id in self._new_parent):

1658

1658

                    try:

1659

1659

                        mover.rename(full_path, self._limbo_name(trans_id))

1660

 

                    except OSError, e:

 

1660

                    except errors.TransformRenameFailed, e:

1661

1661

                        if e.errno != errno.ENOENT:

1662

1662

                            raise

1663

1663

                    else:

1688

1688

                if trans_id in self._needs_rename:

1689

1689

                    try:

1690

1690

                        mover.rename(self._limbo_name(trans_id), full_path)

1691

 

                    except OSError, e:

 

1691

                    except errors.TransformRenameFailed, e:

1692

1692

                        # We may be renaming a dangling inventory id

1693

1693

                        if e.errno != errno.ENOENT:

1694

1694

                            raise

1792

1792

        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in

1793

1793

                       self._iter_parent_trees()]

1794

1794

        vf.add_lines((file_id, tree_revision), parent_keys,

1795

 

                     self.get_file(file_id).readlines())

 

1795

                     self.get_file_lines(file_id))

1796

1796

        repo = self._get_repository()

1797

1797

        base_vf = repo.texts

1798

1798

        if base_vf not in vf.fallback_versionedfiles:

1820

1820

            executable = self.is_executable(file_id, path)

1821

1821

        return kind, executable, None

1822

1822

 

 

1823

    def is_locked(self):

 

1824

        return False

 

1825

 

1823

1826

    def lock_read(self):

1824

1827

        # Perhaps in theory, this should lock the TreeTransform?

1825

 

        pass

 

1828

        return self

1826

1829

 

1827

1830

    def unlock(self):

1828

1831

        pass

2288

2291

    for num, _unused in enumerate(wt.all_file_ids()):

2289

2292

        if num > 0:  # more than just a root

2290

2293

            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)

2291

 

    existing_files = set()

2292

 

    for dir, files in wt.walkdirs():

2293

 

        existing_files.update(f[0] for f in files)

2294

2294

    file_trans_id = {}

2295

2295

    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()

2296

2296

    pp = ProgressPhase("Build phase", 2, top_pb)

2320

2320

                precomputed_delta = []

2321

2321

            else:

2322

2322

                precomputed_delta = None

 

2323

            # Check if tree inventory has content. If so, we populate

 

2324

            # existing_files with the directory content. If there are no

 

2325

            # entries we skip populating existing_files as its not used.

 

2326

            # This improves performance and unncessary work on large

 

2327

            # directory trees. (#501307)

 

2328

            if total > 0:

 

2329

                existing_files = set()

 

2330

                for dir, files in wt.walkdirs():

 

2331

                    existing_files.update(f[0] for f in files)

2323

2332

            for num, (tree_path, entry) in \

2324

2333

                enumerate(tree.inventory.iter_entries_by_dir()):

2325

2334

                pb.update("Building tree", num - len(deferred_contents), total)

2457

2466

    if entry.kind == "directory":

2458

2467

        return True

2459

2468

    if entry.kind == "file":

2460

 

        if tree.get_file(file_id).read() == file(target_path, 'rb').read():

2461

 

            return True

 

2469

        f = file(target_path, 'rb')

 

2470

        try:

 

2471

            if tree.get_file_text(file_id) == f.read():

 

2472

                return True

 

2473

        finally:

 

2474

            f.close()

2462

2475

    elif entry.kind == "symlink":

2463

2476

        if tree.get_symlink_target(file_id) == os.readlink(target_path):

2464

2477

            return True

2923

2936

        """Rename a file from one path to another."""

2924

2937

        try:

2925

2938

            osutils.rename(from_, to)

2926

 

        except OSError, e:

 

2939

        except (IOError, OSError), e:

2927

2940

            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):

2928

2941

                raise errors.FileExists(to, str(e))

2929

 

            raise

 

2942

            # normal OSError doesn't include filenames so it's hard to see where

 

2943

            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763

 

2944

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

2930

2945

        self.past_renames.append((from_, to))

2931

2946

 

2932

2947

    def pre_delete(self, from_, to):

2942

2957

    def rollback(self):

2943

2958

        """Reverse all renames that have been performed"""

2944

2959

        for from_, to in reversed(self.past_renames):

2945

 

            osutils.rename(to, from_)

 

2960

            try:

 

2961

                osutils.rename(to, from_)

 

2962

            except (OSError, IOError), e:

 

2963

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

2946

2964

        # after rollback, don't reuse _FileMover

2947

2965

        past_renames = None

2948

2966

        pending_deletions = None

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1