Rev 1674: (mbp, olaf) lockdir and diff improvements in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1674
revision-id: pqm at pqm.ubuntu.com-20060505081949-c953c4dd61f52b81
parent: pqm at pqm.ubuntu.com-20060505081528-8c0368b718fd7933
parent: mbp at sourcefrog.net-20060505012934-1043f68323f15f88
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-05-05 09:19:49 +0100
message:
  (mbp,olaf) lockdir and diff improvements
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  tutorial.txt                   tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060505012934-1043f68323f15f88
    parent: mbp at sourcefrog.net-20060505012749-94b6adfce7285eca
    parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.lockdir
    timestamp: Fri 2006-05-05 11:29:34 +1000
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060505012749-94b6adfce7285eca
    parent: mbp at sourcefrog.net-20060505005541-7ad07e37a4508ea8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.lockdir
    timestamp: Fri 2006-05-05 11:27:49 +1000
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060505005541-7ad07e37a4508ea8
    parent: mbp at sourcefrog.net-20060504060743-cdcb40c14eb62d10
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.lockdir
    timestamp: Fri 2006-05-05 10:55:41 +1000
    message:
      Create lockdir info files using transport.append
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060504060743-cdcb40c14eb62d10
    parent: mbp at sourcefrog.net-20060504060300-eed0e79351fd6182
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.diff
    timestamp: Thu 2006-05-04 16:07:43 +1000
    message:
      When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060504060300-eed0e79351fd6182
    parent: mbp at sourcefrog.net-20060504050917-dd7516977826b788
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.diff
    timestamp: Thu 2006-05-04 16:03:00 +1000
    message:
      Add -p0, -p1 options for diff.
      
      Change --diff-prefix to just --prefix.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060504050917-dd7516977826b788
    parent: mbp at sourcefrog.net-20060504050255-d0c0573ef8849c59
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.diff
    timestamp: Thu 2006-05-04 15:09:17 +1000
    message:
      Add test for diff --diff-prefix, which was previously untested.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060504050255-d0c0573ef8849c59
    parent: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.diff
    timestamp: Thu 2006-05-04 15:02:55 +1000
    message:
      Remove 'a/', 'b/' default prefixes on diff output.  
      (You can still get them with --diff-prefix)