Rev 1409: Merge Johns current integration work. in /home/robertc/source/baz/integration

------------------------------------------------------------
revno: 1409
revision-id: robertc at robertcollins.net-20051113185726-39ede10d746eee6d
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
parent: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-14 05:57:26 +1100
message:
  Merge Johns current integration work.
removed:
  testbzr                        testbzr-20050428033045-e528c9fe33219494
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/changeset.py            changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/clone.py                clone.py-20050929121333-bc726d1ddd8042bc
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/externalcommand.py      externalcommand.py-20050901092254-b4fc642a55bb815b
  bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/merge_core.py           merge_core.py-20050513021216-eda88728698d4401
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/selftest/blackbox.py    blackbox.py-20050620052131-a7370d756399f615
  bzrlib/selftest/versioning.py  versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/xml4.py                 xml4.py-20050916091259-db5ab55e7e6ca324
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
    parent: john at arbash-meinel.com-20051113164037-506b728afc8f26e8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Sun 2005-11-13 10:46:19 -0600
    message:
      Changed to printing the full path, rather than just the relative portion.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051113164037-506b728afc8f26e8
    parent: john at arbash-meinel.com-20051113163433-d2db15d58d504a46
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Sun 2005-11-13 10:40:37 -0600
    message:
      Modified mkdir functionality, to handle multiple nested trees.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051113163433-d2db15d58d504a46
    parent: john at arbash-meinel.com-20051111001255-581ed1a337aebc4e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Sun 2005-11-13 10:34:33 -0600
    message:
      Applying Alexander Belchenko's patch to handle multiple mkdir calls
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051111001255-581ed1a337aebc4e
    parent: john at arbash-meinel.com-20051111001050-619c41bb436c31af
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Thu 2005-11-10 18:12:55 -0600
    message:
      Removed testbzr, it wasn't even executable, just was cruft.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051111001050-619c41bb436c31af
    parent: john at arbash-meinel.com-20051110030353-113e2bb27f7b157f
    parent: john at arbash-meinel.com-20051027030813-9dfbcadd282e6512
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Thu 2005-11-10 18:10:50 -0600
    message:
      Merged pull --verbose changes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051027030813-9dfbcadd282e6512
    parent: john at arbash-meinel.com-20051027024110-609396a0bd1a5b3b
    parent: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Wed 2005-10-26 22:08:13 -0500
    message:
      [merge] up-to-date against bzr.dev
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051027024110-609396a0bd1a5b3b
    parent: john at arbash-meinel.com-20051027023847-a3dc4032752a2085
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Wed 2005-10-26 21:41:10 -0500
    message:
      Added NEWS entry.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051027023847-a3dc4032752a2085
    parent: john at arbash-meinel.com-20051026032219-e8eafcb931465df3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Wed 2005-10-26 21:38:47 -0500
    message:
      Refactor pull --verbose into a log.py function, add tests.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051026032219-e8eafcb931465df3
    parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Tue 2005-10-25 22:22:19 -0500
    message:
      Updated bzr pull to support a --verbose flag, which prints out what changes.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051110030353-113e2bb27f7b157f
    parent: john at arbash-meinel.com-20051109183020-9023d82766865430
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Wed 2005-11-09 21:03:53 -0600
    message:
      Fixing mutter() calls to not have to do string processing.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051109183020-9023d82766865430
    parent: john at arbash-meinel.com-20051109172418-1cf119bbf93fa44d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Wed 2005-11-09 13:30:20 -0500
    message:
      Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051109172418-1cf119bbf93fa44d
    parent: john at arbash-meinel.com-20051020052212-ab9f5c12844209cc
    parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Wed 2005-11-09 11:24:18 -0600
    message:
      [merge] robert's integration branch
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051020052212-ab9f5c12844209cc
    parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Thu 2005-10-20 00:22:12 -0500
    message:
      Made InvalidRevisionId take the revision_id as a parameter, fixed up locations where it was called.