Rev 2204: (bialix) Bugfix #55276: on win32 cat, bundle and diff commands provide in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2204
revision-id: pqm at pqm.ubuntu.com-20061220110444-a991704cfe50d2b3
parent: pqm at pqm.ubuntu.com-20061220084118-9f2373cfa6e057fc
parent: bialix at ukr.net-20061220095052-8v7nfgc6x9yjzpbh
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-20 11:04:44 +0000
message:
  (bialix) Bugfix #55276: on win32 cat, bundle and diff commands provide
   binary output without mangling line-endings
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
    ------------------------------------------------------------
    merged: bialix at ukr.net-20061220095052-8v7nfgc6x9yjzpbh
    parent: bialix at ukr.net-20061219173738-4pd3h25j5ozjmf5e
    parent: pqm at pqm.ubuntu.com-20061220084118-9f2373cfa6e057fc
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32.binary-stdout
    timestamp: Wed 2006-12-20 11:50:52 +0200
    message:
      merge bzr.dev; fix NEWS
    ------------------------------------------------------------
    merged: bialix at ukr.net-20061219173738-4pd3h25j5ozjmf5e
    parent: bialix at ukr.net-20061219084503-m4szifvnbo8nq0qm
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32.binary-stdout
    timestamp: Tue 2006-12-19 19:37:38 +0200
    message:
      Spell-checking (thanks to Aaron)
    ------------------------------------------------------------
    merged: bialix at ukr.net-20061219084503-m4szifvnbo8nq0qm
    parent: bialix at ukr.net-20061219082636-xbb55np3wnamva8t
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32.binary-stdout
    timestamp: Tue 2006-12-19 10:45:03 +0200
    message:
      encoding_type = 'exact' force sys.stdout to be binary stream on win32
      (get rid of binary_stdout attribute)
    ------------------------------------------------------------
    merged: bialix at ukr.net-20061219082636-xbb55np3wnamva8t
    parent: bialix at ukr.net-20061213081949-ec6sqdiwr3uh8ly4
    parent: pqm at pqm.ubuntu.com-20061219074019-bbed16c7ec3baf17
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32.binary-stdout
    timestamp: Tue 2006-12-19 10:26:36 +0200
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: bialix at ukr.net-20061213081949-ec6sqdiwr3uh8ly4
    parent: bialix at ukr.net-20061213081554-hglev5j0rzv0xhon
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32.binary-stdout
    timestamp: Wed 2006-12-13 10:19:49 +0200
    message:
      Bugfix #55276: on win32 cat, bundle and diff commands provide binary output without mangling line-endings
    ------------------------------------------------------------
    merged: bialix at ukr.net-20061213081554-hglev5j0rzv0xhon
    parent: pqm at pqm.ubuntu.com-20061212123432-6640bfa4477523fc
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32.binary-stdout
    timestamp: Wed 2006-12-13 10:15:54 +0200
    message:
      Provide tests to illustrate bug #55276 on win32.
      
      Change blackbox tests for cat and bundle commands
      to use run_bzr_subprocess and therefore grab
      real output (windows mangle line-endings LF -> CRLF).
      Also provide new blackbox tests for diff command.
      
      To check that tests failed you need to run on win32:
      
      python bzr selftest blackbox.test_cat
      python bzr selftest blackbox.test_bundle
      python bzr selftest blackbox.test_diff