Rev 2787: (dmwatkins) When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2787
revision-id: pqm at pqm.ubuntu.com-20070903094621-g97i8i5qwal4x0er
parent: pqm at pqm.ubuntu.com-20070903091305-sz9xkqi13fr6cve0
parent: d.m.watkins at warwick.ac.uk-20070825160625-txoybrl7wji18ipw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-03 10:46:21 +0100
message:
  (dmwatkins) When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
    ------------------------------------------------------------
    revno: 2747.4.1
    merged: d.m.watkins at warwick.ac.uk-20070825160625-txoybrl7wji18ipw
    parent: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: 5454
    timestamp: Sat 2007-08-25 18:06:25 +0200
    message:
      When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454.
=== modified file 'NEWS'
--- a/NEWS	2007-09-03 07:34:25 +0000
+++ b/NEWS	2007-09-03 09:46:21 +0000
@@ -113,6 +113,9 @@
       Unknown ignored files will be deleted without needing ``--force``.
       (Marius Kruger, #111665)
 
+    * When two plugins conflict, the source of both the losing and now the
+      winning definition is shown.  (Konstantin Mikhaylov, #5454)
+
   IMPROVEMENTS:
 
    * Add the option "--show-diff" to the commit command in order to display

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2007-08-31 00:35:08 +0000
+++ b/bzrlib/commands.py	2007-09-03 09:46:21 +0000
@@ -85,6 +85,8 @@
     else:
         trace.log_error('Two plugins defined the same command: %r' % k)
         trace.log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
+        trace.log_error('Previously this command was registered from %r' %
+                        sys.modules[plugin_cmds[k_unsquished].__module__])
 
 
 def _squish_command_name(cmd):