~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

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

• reverse the comparison (5258.1.6 to 5053.1.1)
• stop comparing with revision 5053.1.1

Show diffs side-by-side

added

removed

bzrlib/transform.py

25

25

    annotate,

26

26

    bencode,

27

27

    bzrdir,

 

28

    commit,

28

29

    delta,

29

30

    errors,

30

31

    inventory,

35

36

    )

36

37

""")

37

38

from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,

38

 

                           ReusingTransform, NotVersionedError, CantMoveRoot,

 

39

                           ReusingTransform, CantMoveRoot,

39

40

                           ExistingLimbo, ImmortalLimbo, NoFinalPath,

40

41

                           UnableCreateSymlink)

41

42

from bzrlib.filters import filtered_output_bytes, ContentFilterContext

927

928

        """

928

929

        return _PreviewTree(self)

929

930

 

930

 

    def commit(self, branch, message, merge_parents=None, strict=False):

 

931

    def commit(self, branch, message, merge_parents=None, strict=False,

 

932

               timestamp=None, timezone=None, committer=None, authors=None,

 

933

               revprops=None, revision_id=None):

931

934

        """Commit the result of this TreeTransform to a branch.

932

935

 

933

936

        :param branch: The branch to commit to.

934

937

        :param message: The message to attach to the commit.

935

 

        :param merge_parents: Additional parents specified by pending merges.

 

938

        :param merge_parents: Additional parent revision-ids specified by

 

939

            pending merges.

 

940

        :param strict: If True, abort the commit if there are unversioned

 

941

            files.

 

942

        :param timestamp: if not None, seconds-since-epoch for the time and

 

943

            date.  (May be a float.)

 

944

        :param timezone: Optional timezone for timestamp, as an offset in

 

945

            seconds.

 

946

        :param committer: Optional committer in email-id format.

 

947

            (e.g. "J Random Hacker <jrandom@example.com>")

 

948

        :param authors: Optional list of authors in email-id format.

 

949

        :param revprops: Optional dictionary of revision properties.

 

950

        :param revision_id: Optional revision id.  (Specifying a revision-id

 

951

            may reduce performance for some non-native formats.)

936

952

        :return: The revision_id of the revision committed.

937

953

        """

938

954

        self._check_malformed()

955

971

        if self._tree.get_revision_id() != last_rev_id:

956

972

            raise ValueError('TreeTransform not based on branch basis: %s' %

957

973

                             self._tree.get_revision_id())

958

 

        builder = branch.get_commit_builder(parent_ids)

 

974

        revprops = commit.Commit.update_revprops(revprops, branch, authors)

 

975

        builder = branch.get_commit_builder(parent_ids,

 

976

                                            timestamp=timestamp,

 

977

                                            timezone=timezone,

 

978

                                            committer=committer,

 

979

                                            revprops=revprops,

 

980

                                            revision_id=revision_id)

959

981

        preview = self.get_preview_tree()

960

982

        list(builder.record_iter_changes(preview, last_rev_id,

961

983

                                         self.iter_changes()))

1160

1182

            if trans_id not in self._new_contents:

1161

1183

                continue

1162

1184

            new_path = self._limbo_name(trans_id)

1163

 

            os.rename(old_path, new_path)

 

1185

            osutils.rename(old_path, new_path)

1164

1186

            for descendant in self._limbo_descendants(trans_id):

1165

1187

                desc_path = self._limbo_files[descendant]

1166

1188

                desc_path = new_path + desc_path[len(old_path):]

1635

1657

                      or trans_id in self._new_parent):

1636

1658

                    try:

1637

1659

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

1638

 

                    except OSError, e:

 

1660

                    except errors.TransformRenameFailed, e:

1639

1661

                        if e.errno != errno.ENOENT:

1640

1662

                            raise

1641

1663

                    else:

1666

1688

                if trans_id in self._needs_rename:

1667

1689

                    try:

1668

1690

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

1669

 

                    except OSError, e:

 

1691

                    except errors.TransformRenameFailed, e:

1670

1692

                        # We may be renaming a dangling inventory id

1671

1693

                        if e.errno != errno.ENOENT:

1672

1694

                            raise

1770

1792

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

1771

1793

                       self._iter_parent_trees()]

1772

1794

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

1773

 

                     self.get_file(file_id).readlines())

 

1795

                     self.get_file_lines(file_id))

1774

1796

        repo = self._get_repository()

1775

1797

        base_vf = repo.texts

1776

1798

        if base_vf not in vf.fallback_versionedfiles:

1798

1820

            executable = self.is_executable(file_id, path)

1799

1821

        return kind, executable, None

1800

1822

 

 

1823

    def is_locked(self):

 

1824

        return False

 

1825

 

1801

1826

    def lock_read(self):

1802

1827

        # Perhaps in theory, this should lock the TreeTransform?

1803

 

        pass

 

1828

        return self

1804

1829

 

1805

1830

    def unlock(self):

1806

1831

        pass

2266

2291

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

2267

2292

        if num > 0:  # more than just a root

2268

2293

            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)

2269

 

    existing_files = set()

2270

 

    for dir, files in wt.walkdirs():

2271

 

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

2272

2294

    file_trans_id = {}

2273

2295

    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()

2274

2296

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

2298

2320

                precomputed_delta = []

2299

2321

            else:

2300

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)

2301

2332

            for num, (tree_path, entry) in \

2302

2333

                enumerate(tree.inventory.iter_entries_by_dir()):

2303

2334

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

2435

2466

    if entry.kind == "directory":

2436

2467

        return True

2437

2468

    if entry.kind == "file":

2438

 

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

2439

 

            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()

2440

2475

    elif entry.kind == "symlink":

2441

2476

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

2442

2477

            return True

2824

2859

                        # special-case the other tree root (move its

2825

2860

                        # children to current root)

2826

2861

                        if entry.parent_id is None:

2827

 

                            create=False

 

2862

                            create = False

2828

2863

                            moved = _reparent_transform_children(

2829

2864

                                tt, trans_id, tt.root)

2830

2865

                            for child in moved:

2898

2933

        self.pending_deletions = []

2899

2934

 

2900

2935

    def rename(self, from_, to):

2901

 

        """Rename a file from one path to another.  Functions like os.rename"""

 

2936

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

2902

2937

        try:

2903

 

            os.rename(from_, to)

2904

 

        except OSError, e:

 

2938

            osutils.rename(from_, to)

 

2939

        except (IOError, OSError), e:

2905

2940

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

2906

2941

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

2907

 

            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)

2908

2945

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

2909

2946

 

2910

2947

    def pre_delete(self, from_, to):

2920

2957

    def rollback(self):

2921

2958

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

2922

2959

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

2923

 

            os.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)                

2924

2964

        # after rollback, don't reuse _FileMover

2925

2965

        past_renames = None

2926

2966

        pending_deletions = None

• Older »

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