Rev 2203: (mbp) remove global registration of short options (r=john) in /home/pqm/archives/thelove/bzr/+trunk/

Wed Dec 20 08:41:20 GMT 2006

------------------------------------------------------------
revno: 2203
revision-id: pqm at pqm.ubuntu.com-20061220084118-9f2373cfa6e057fc
parent: pqm at pqm.ubuntu.com-20061219234911-ef24c2a4ae550a02
parent: mbp at sourcefrog.net-20061219061628-h03p5g7lsme1rx5w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-20 08:41:18 +0000
message:
  (mbp) remove global registration of short options (r=john)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/shellcomplete.py        shellcomplete.py-20050822153127-3be115ff5e70fc39
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061219061628-h03p5g7lsme1rx5w
    parent: mbp at sourcefrog.net-20061219054750-ky6x2s0lzvikfnl8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: short-options
    timestamp: Tue 2006-12-19 17:16:28 +1100
    message:
      Fix up other short options
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061219054750-ky6x2s0lzvikfnl8
    parent: mbp at sourcefrog.net-20061219054700-eh989yuwhr6p2xxi
    parent: pqm at pqm.ubuntu.com-20061218184217-352721d83a142886
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: short-options
    timestamp: Tue 2006-12-19 16:47:50 +1100
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061219054700-eh989yuwhr6p2xxi
    parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
    parent: mbp at sourcefrog.net-20061215083650-14cbsfiijfq3kdf9
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: short-options
    timestamp: Tue 2006-12-19 16:47:00 +1100
    message:
      Finish removal of global short-option table
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061215083650-14cbsfiijfq3kdf9
    parent: pqm at pqm.ubuntu.com-20061215053913-76fa903ef526647a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 56299-dash-c
    timestamp: Fri 2006-12-15 19:36:50 +1100
    message:
      remove global registration of short options