/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
62
62
from .errors import (
63
63
    NoPushSupport,
64
64
    )
 
65
from .mapping import (
 
66
    encode_git_path,
 
67
    decode_git_path,
 
68
    )
65
69
from .push import (
66
70
    remote_divergence,
67
71
    )
494
498
            cs = self.repository._git.get_config_stack()
495
499
            try:
496
500
                return cs.get((b"branch", self.name.encode('utf-8')),
497
 
                              b"nick").decode("utf-8")
 
501
                        b"nick").decode("utf-8")
498
502
            except KeyError:
499
503
                pass
500
504
        return self.name or u"HEAD"
1039
1043
                for path, url, section in parse_submodules(
1040
1044
                        GitConfigFile.from_file(f)):
1041
1045
                    self.target.set_reference_info(
1042
 
                        tree.path2id(path.decode('utf-8')), url.decode('utf-8'),
1043
 
                        path.decode('utf-8'))
 
1046
                        tree.path2id(decode_git_path(path)), url.decode('utf-8'),
 
1047
                        decode_git_path(path))
1044
1048
        except errors.NoSuchFile:
1045
1049
            pass
1046
1050
 
1171
1175
                isinstance(target, RemoteGitBranch))
1172
1176
 
1173
1177
    def _basic_push(self, overwrite, stop_revision, tag_selector=None):
1174
 
        from .remote import RemoteGitError
 
1178
        from .remote import parse_git_error
1175
1179
        result = GitBranchPushResult()
1176
1180
        result.source_branch = self.source
1177
1181
        result.target_branch = self.target
1209
1213
        if dw_result is not None and not isinstance(dw_result, dict):
1210
1214
            error = dw_result.ref_status.get(self.target.ref)
1211
1215
            if error:
1212
 
                raise RemoteGitError(error)
 
1216
                raise parse_git_error(self.target.user_url, error)
1213
1217
            for ref, error in dw_result.ref_status.items():
1214
1218
                if error:
1215
 
                    trace.warning('unable to open ref %s: %s',
1216
 
                                  ref, error)
 
1219
                    trace.warning('unable to open ref %s: %s', ref, error)
1217
1220
        return result
1218
1221
 
1219
1222
 
1385
1388
               old_refs, new_refs)
1386
1389
        result.tag_updates = {}
1387
1390
        result.tag_conflicts = []
1388
 
        ret = dict(old_refs)
 
1391
        ret = {}
1389
1392
 
1390
1393
        def ref_equals(refs, ref, git_sha, revid):
1391
1394
            try: