/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/dir.py

  • Committer: Breezy landing bot
  • Author(s): Vincent Ladeuil
  • Date: 2019-06-18 17:47:33 UTC
  • mfrom: (7350.1.3 trunk)
  • Revision ID: breezy.the.bot@gmail.com-20190618174733-da1lo1e8a10ap9db
Merge 3.0 into trunk resolving conflicts

Merged from https://code.launchpad.net/~vila/brz/trunk/+merge/368964

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/dir.py
182
182
        result_branch = source_branch.sprout(
183
183
            result, revision_id=revision_id, repository=result_repo)
184
184
        if (create_tree_if_local and
 
185
            result.open_branch(name="").name == result_branch.name and
185
186
            isinstance(target_transport, LocalTransport) and
186
187
                (result_repo is None or result_repo.make_working_trees())):
187
188
            result.create_workingtree(
302
303
            lossy=lossy)
303
304
        push_result.new_revid = push_result.branch_push_result.new_revid
304
305
        push_result.old_revid = push_result.branch_push_result.old_revid
 
306
        try:
 
307
            wt = self.open_workingtree()
 
308
        except brz_errors.NoWorkingTree:
 
309
            push_result.workingtree_updated = None
 
310
        else:
 
311
            if self.open_branch(name="").name == target.name:
 
312
                wt._update_git_tree(
 
313
                    old_revision=push_result.old_revid,
 
314
                    new_revision=push_result.new_revid)
 
315
                push_result.workingtree_updated = True
 
316
            else:
 
317
                push_result.workingtree_updated = False
305
318
        push_result.target_branch = target
306
319
        if source.get_push_location() is None or remember:
307
320
            source.set_push_location(push_result.target_branch.base)