Rev 2229: restore Option.short_name() to being callable (mbp, r=john, r=alexander) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2229
revision-id: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
parent: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-01-11 01:43:09 +0000
message:
  restore Option.short_name() to being callable (mbp, r=john, r=alexander)
modified:
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
    parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
    committer: mbp at sourcefrog.net
    branch nick: options
    timestamp: Wed 2007-01-10 18:28:57 +1100
    message:
      Back out previous incompatible change: Option.short_name is now again
      a method that returns the short name, if any.