Rev 2171: (Keir Mierle) Add support for 'bzr status --short' in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2171
revision-id: pqm at pqm.ubuntu.com-20061207213919-1cc5d101c30fda65
parent: pqm at pqm.ubuntu.com-20061207174618-7064db4cb4611ab9
parent: john at arbash-meinel.com-20061207202500-cdhbw4uw9p60w21o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-12-07 21:39:19 +0000
message:
  (Keir Mierle) Add support for 'bzr status --short'
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061207202500-cdhbw4uw9p60w21o
    parent: john at arbash-meinel.com-20061207183055-h2snud1gnlgqe8x1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-12-07 14:25:00 -0600
    message:
      The logic for when to display 'C' for conflicts was inverted.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061207183055-h2snud1gnlgqe8x1
    parent: john at arbash-meinel.com-20061207171528-sf21rpho9q4eprjl
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-12-07 12:30:55 -0600
    message:
      The texts expected 2 blank spaces after P, so give it to them.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061207171528-sf21rpho9q4eprjl
    parent: pqm at pqm.ubuntu.com-20061207171034-52cf2b54efbbcb45
    parent: keir at cs.utoronto.ca-20061201103121-hm378qglop3v07w9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-12-07 11:15:28 -0600
    message:
      (Keir Mierle) Add support for 'bzr status --short'
    ------------------------------------------------------------
    merged: keir at cs.utoronto.ca-20061201103121-hm378qglop3v07w9
    parent: keir at cs.utoronto.ca-20061201102613-1k4mlkve9sducabw
    committer: Keir Mierle <keir at cs.utoronto.ca>
    branch nick: bzr.shortstatus
    timestamp: Fri 2006-12-01 05:31:21 -0500
    message:
      Make changes suggested by Aaron Bently
    ------------------------------------------------------------
    merged: keir at cs.utoronto.ca-20061201102613-1k4mlkve9sducabw
    parent: keir at cs.utoronto.ca-20061123185625-ndto53ylcb8zo1y6
    parent: pqm at pqm.ubuntu.com-20061130181753-8f59214477f99124
    committer: Keir Mierle <keir at cs.utoronto.ca>
    branch nick: bzr.shortstatus
    timestamp: Fri 2006-12-01 05:26:13 -0500
    message:
      Merge from upstream
    ------------------------------------------------------------
    merged: keir at cs.utoronto.ca-20061123185625-ndto53ylcb8zo1y6
    parent: keir at cs.utoronto.ca-20061122083620-jsqvusdnnxfmmvd3
    committer: Keir Mierle <keir at cs.utoronto.ca>
    branch nick: bzr.shortstatus
    timestamp: Thu 2006-11-23 13:56:25 -0500
    message:
      Fix spacing error and add tests for status --short command flag.
    ------------------------------------------------------------
    merged: keir at cs.utoronto.ca-20061122083620-jsqvusdnnxfmmvd3
    parent: pqm at pqm.ubuntu.com-20061121123418-3d0b2fb05cbe6b43
    committer: Keir Mierle <keir at cs.utoronto.ca>
    branch nick: bzr.shortstatus
    timestamp: Wed 2006-11-22 03:36:20 -0500
    message:
      Add a --short flag to status to get svn-style status