bzr-builddeb

Merge lp:~maxb/bzr-builddeb/disable-bad-hook into lp:bzr-builddeb

  1. disable-bad-hook
  2. Merge into trunk
Proposed by Max Bowsher
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 640
Merged at revision: 645
Proposed branch: lp:~maxb/bzr-builddeb/disable-bad-hook
Merge into: lp:bzr-builddeb
Diff against target: 16 lines (+0/-6)
1 file modified
__init__.py (+0/-6)
To merge this branch: bzr merge lp:~maxb/bzr-builddeb/disable-bad-hook
Reviewer Review Type Date Requested Status
Jonathan Riddell Disapprove
Jelmer Vernooij code Approve
Review via email: mp+80814@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote :

bug 812749

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

IIRC there was a bug asking for exactly the behaviour you're disabling now. Please check with Riddell, who added the original hook.

review: Needs Information
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

At the very least we should keep this in as something that people can enable if they want to.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Hi guys, this is in review for more than 20 days now.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Let's just land this. We can bring it back later in one form or another if we really want to.

review: Approve (code)
Revision history for this message
Jonathan Riddell (jr) wrote :

This removes a feature which is deliberately intended to make life easier for packagers. I did add a config option to disable it for those who don't want it.

review: Disapprove
Revision history for this message
Max Bowsher (maxb) wrote :

Let's take further discussion to a mailing list. In the meantime, the controversial feature has been backed out until reasonable discussion can occur.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Actually, I didn't realise there was an option. Let's just flip the default from True to False.

Revision history for this message
Max Bowsher (maxb) wrote :

There's still a case for building a better UI around this. We should discuss that on either the Bazaar or UDD ML.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2011-10-11 21:22:24 +0000
3+++ __init__.py 2011-10-31 15:34:23 +0000
4@@ -196,12 +196,6 @@
5 debian_changelog_commit_message,
6 "Use changes documented in debian/changelog to suggest "
7 "the commit message")
8- if bzrlib.version_info[0] >= 2 and bzrlib.version_info[1] >= 4:
9- install_lazy_named_hook(
10- "bzrlib.msgeditor", "hooks", "set_commit_message",
11- debian_changelog_commit,
12- "Use changes documented in debian/changelog to set "
13- "the commit message and bugs fixed")
14 install_lazy_named_hook(
15 "bzrlib.merge", "Merger.hooks",
16 'merge_file_content', changelog_merge_hook_factory,

Subscribers

People subscribed via source and target branches