/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-05 20:34:11 UTC
  • mfrom: (7490.40.87 work)
  • mto: (7490.40.103 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200805203411-cap9gp8vuwnz5lt7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
1180
1180
                isinstance(target, RemoteGitBranch))
1181
1181
 
1182
1182
    def _basic_push(self, overwrite, stop_revision, tag_selector=None):
1183
 
        from .remote import RemoteGitError
 
1183
        from .remote import parse_git_error
1184
1184
        result = GitBranchPushResult()
1185
1185
        result.source_branch = self.source
1186
1186
        result.target_branch = self.target
1218
1218
        if dw_result is not None and not isinstance(dw_result, dict):
1219
1219
            error = dw_result.ref_status.get(self.target.ref)
1220
1220
            if error:
1221
 
                raise RemoteGitError(error)
 
1221
                raise parse_git_error(self.target.user_url, error)
1222
1222
            for ref, error in dw_result.ref_status.items():
1223
1223
                if error:
1224
 
                    trace.warning('unable to open ref %s: %s',
1225
 
                                  ref, error)
 
1224
                    trace.warning('unable to open ref %s: %s', ref, error)
1226
1225
        return result
1227
1226
 
1228
1227
 
1394
1393
               old_refs, new_refs)
1395
1394
        result.tag_updates = {}
1396
1395
        result.tag_conflicts = []
1397
 
        ret = dict(old_refs)
 
1396
        ret = {}
1398
1397
 
1399
1398
        def ref_equals(refs, ref, git_sha, revid):
1400
1399
            try: