Breezy

Merge lp:~jelmer/brz/no-branch-nick into lp:brz

  1. no-branch-nick
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 6830
Proposed branch: lp:~jelmer/brz/no-branch-nick
Merge into: lp:brz
Diff against target: 13 lines (+2/-1)
1 file modified
breezy/commit.py (+2/-1)
To merge this branch: bzr merge lp:~jelmer/brz/no-branch-nick
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+334636@code.launchpad.net

Description of the change

Don't attempt to set branch nick property unless the format supports it.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Seems reasonable.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/commit.py'
2--- breezy/commit.py 2017-11-17 03:06:50 +0000
3+++ breezy/commit.py 2017-12-03 00:49:36 +0000
4@@ -212,7 +212,8 @@
5 revprops = {}
6 if possible_master_transports is None:
7 possible_master_transports = []
8- if not 'branch-nick' in revprops:
9+ if (not 'branch-nick' in revprops and
10+ branch.repository._format.supports_storing_branch_nick):
11 revprops['branch-nick'] = branch._get_nick(
12 local,
13 possible_master_transports)

Subscribers

People subscribed via source and target branches