/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/git/branch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-17 00:20:22 UTC
  • mfrom: (7446.1.2 lossy-incremental)
  • Revision ID: breezy.the.bot@gmail.com-20200117002022-vdf5mizvei4h7d6g
Fix working tree update of incremental lossy push.

Merged from https://code.launchpad.net/~jelmer/brz/lossy-incremental/+merge/377743

Show diffs side-by-side

added added

removed removed

Lines of Context:
816
816
        :return: A branch associated with the nested tree
817
817
        """
818
818
        # FIXME should provide multiple branches, based on config
819
 
        url = urlutils.split_segment_parameters_raw(self.user_url)[0]
 
819
        url = urlutils.strip_segment_parameters(self.user_url)
820
820
        url = urlutils.join(url, path)
821
 
        return branch.Branch.open(
822
 
            url,
823
 
            possible_transports=possible_transports)
 
821
        return branch.Branch.open(url, possible_transports=possible_transports)
824
822
 
825
823
 
826
824
def _quick_lookup_revno(local_branch, remote_branch, revid):
1419
1417
                raise errors.NoRoundtrippingSupport(self.source, self.target)
1420
1418
            (old_sha1, result.old_revid) = old_refs.get(
1421
1419
                main_ref, (ZERO_SHA, NULL_REVISION))
1422
 
            if result.old_revid is None:
 
1420
            if lossy or result.old_revid is None:
1423
1421
                result.old_revid = self.target.lookup_foreign_revision_id(
1424
1422
                    old_sha1)
1425
1423
            result.new_revid = new_refs[main_ref][1]