Merge lp:~jelmer/brz/remove-unused-basis into lp:brz

Proposed by Jelmer Vernooij on 2018-09-27
Status: Merged
Approved by: Jelmer Vernooij on 2018-10-13
Approved revision: 7132
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/remove-unused-basis
Merge into: lp:brz
Diff against target: 15 lines (+0/-5)
1 file modified
breezy/builtins.py (+0/-5)
To merge this branch: bzr merge lp:~jelmer/brz/remove-unused-basis
Reviewer Review Type Date Requested Status
Martin Packman 2018-09-27 Approve on 2018-10-13
Review via email: mp+355753@code.launchpad.net

Commit message

Remove unused call to get basis tree.

Description of the change

Remove unused call to get basis tree.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks! Should probably do a general lint pass at some point for unused variables and down.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/builtins.py'
2--- breezy/builtins.py 2018-09-14 22:58:47 +0000
3+++ breezy/builtins.py 2018-09-27 08:30:20 +0000
4@@ -4414,11 +4414,6 @@
5 raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
6 'https://bugs.launchpad.net/bzr/+bug/308562'))
7
8- try:
9- basis_tree = tree.revision_tree(tree.last_revision())
10- except errors.NoSuchRevision:
11- basis_tree = tree.basis_tree()
12-
13 # die as quickly as possible if there are uncommitted changes
14 if not force:
15 if tree.has_changes():

Subscribers

People subscribed via source and target branches