~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

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

Show diffs side-by-side

added

removed

bzrlib/push.py

16

16

 

17

17

"""UI helper for the push command."""

18

18

 

19

 

from bzrlib import (builtins, bzrdir, errors, revision as _mod_revision,

20

 

                    transport)

21

 

from bzrlib.trace import note, warning

 

19

from bzrlib import (

 

20

    builtins,

 

21

    branch,

 

22

    bzrdir,

 

23

    errors,

 

24

    revision as _mod_revision,

 

25

    transport,

 

26

    )

 

27

from bzrlib.trace import (

 

28

    note,

 

29

    warning,

 

30

    )

22

31

 

23

32

 

24

33

class PushResult(object):

25

34

    """Result of a push operation.

26

35

 

27

36

    :ivar branch_push_result: Result of a push between branches

 

37

    :ivar target_branch: The target branch

28

38

    :ivar stacked_on: URL of the branch on which the result is stacked

 

39

    :ivar workingtree_updated: Whether or not the target workingtree was updated.

29

40

    """

30

41

 

31

42

    def __init__(self):

32

43

        self.branch_push_result = None

33

44

        self.stacked_on = None

 

45

        self.workingtree_updated = None

 

46

        self.target_branch = None

34

47

 

35

48

    def report(self, to_file):

36

49

        """Write a human-readable description of the result."""

71

84

        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)

72

85

    except errors.NotBranchError:

73

86

        pass # Didn't find anything

74

 

    else:

75

 

        # If we can open a branch, use its direct repository, otherwise see

76

 

        # if there is a repository without a branch.

77

 

        try:

78

 

            br_to = dir_to.open_branch()

79

 

        except errors.NotBranchError:

80

 

            # Didn't find a branch, can we find a repository?

81

 

            try:

82

 

                repository_to = dir_to.find_repository()

83

 

            except errors.NoRepositoryPresent:

84

 

                pass

85

 

        else:

86

 

            # Found a branch, so we must have found a repository

87

 

            repository_to = br_to.repository

88

87

 

89

88

    push_result = PushResult()

90

89

    if dir_to is None:

133

132

                errors.UnstackableRepositoryFormat,

134

133

                errors.NotStacked):

135

134

            push_result.stacked_on = None

136

 

        # We successfully created the target, remember it

 

135

        push_result.target_branch = br_to

 

136

        push_result.old_revid = _mod_revision.NULL_REVISION

 

137

        push_result.old_revno = 0

137

138

        if br_from.get_push_location() is None or remember:

138

139

            br_from.set_push_location(br_to.base)

139

 

    elif repository_to is None:

140

 

        # we have a bzrdir but no branch or repository

141

 

        # XXX: Figure out what to do other than complain.

142

 

        raise errors.BzrCommandError("At %s you have a valid .bzr control"

143

 

            " directory, but not a branch or repository. This is an"

144

 

            " unsupported configuration. Please move the target directory"

145

 

            " out of the way and try again."

146

 

            % location)

147

 

    elif br_to is None:

148

 

        # We have a repository but no branch, copy the revisions, and then

149

 

        # create a branch.

 

140

    else:

150

141

        if stacked_on is not None:

151

142

            warning("Ignoring request for a stacked branch as repository "

152

143

                    "already exists at the destination location.")

153

 

        repository_to.fetch(br_from.repository, revision_id=revision_id)

154

 

        br_to = br_from.clone(dir_to, revision_id=revision_id)

155

 

        if br_from.get_push_location() is None or remember:

156

 

            br_from.set_push_location(br_to.base)

157

 

    else: # We have a valid to branch

158

 

        if stacked_on is not None:

159

 

            warning("Ignoring request for a stacked branch as branch "

160

 

                    "already exists at the destination location.")

161

 

        # We were able to connect to the remote location, so remember it.

162

 

        # (We don't need to successfully push because of possible divergence.)

163

 

        if br_from.get_push_location() is None or remember:

164

 

            br_from.set_push_location(br_to.base)

165

144

        try:

166

 

            try:

167

 

                tree_to = dir_to.open_workingtree()

168

 

            except errors.NotLocalUrl:

169

 

                note("This transport does not update the working "

170

 

                        "tree of: %s. See 'bzr help working-trees' for "

171

 

                        "more information." % br_to.base)

172

 

                push_result.branch_push_result = br_from.push(br_to, overwrite,

173

 

                                                   stop_revision=revision_id)

174

 

            except errors.NoWorkingTree:

175

 

                push_result.branch_push_result = br_from.push(br_to, overwrite,

176

 

                                                   stop_revision=revision_id)

177

 

            else:

178

 

                tree_to.lock_write()

179

 

                try:

180

 

                    push_result.branch_push_result = br_from.push(tree_to.branch,

181

 

                        overwrite, stop_revision=revision_id)

182

 

                    tree_to.update()

183

 

                finally:

184

 

                    tree_to.unlock()

 

145

            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 

 

146

                remember)

185

147

        except errors.DivergedBranches:

186

148

            raise errors.BzrCommandError('These branches have diverged.'

187

149

                                    '  Try using "merge" and then "push".')

 

150

        except errors.NoRepositoryPresent:

 

151

            # we have a bzrdir but no branch or repository

 

152

            # XXX: Figure out what to do other than complain.

 

153

            raise errors.BzrCommandError("At %s you have a valid .bzr"

 

154

                " control directory, but not a branch or repository. This"

 

155

                " is an unsupported configuration. Please move the target"

 

156

                " directory out of the way and try again." % location)

 

157

        if push_result.workingtree_updated == False:

 

158

            warning("This transport does not update the working " 

 

159

                    "tree of: %s. See 'bzr help working-trees' for "

 

160

                    "more information." % push_result.target_branch.base)

188

161

    push_result.report(to_file)

189

 

    if push_result.branch_push_result is not None:

190

 

        old_revid = push_result.branch_push_result.old_revid

191

 

        old_revno = push_result.branch_push_result.old_revno

192

 

    else:

193

 

        old_revid = _mod_revision.NULL_REVISION

194

 

        old_revno = 0

195

162

    if verbose:

 

163

        br_to = push_result.target_branch

196

164

        br_to.lock_read()

197

165

        try:

198

166

            from bzrlib.log import show_branch_change

199

 

            show_branch_change(br_to, to_file, old_revno, old_revid)

 

167

            show_branch_change(br_to, to_file, push_result.old_revno, 

 

168

                               push_result.old_revid)

200

169

        finally:

201

170

            br_to.unlock()

 

171

 

 

172

 

• Older »

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