Rev 2073: (James Henstridge) Allow config entries to cascade in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2073
revision-id: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 02:18:08 +0100
message:
  (James Henstridge) Allow config entries to cascade
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
    parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
    parent: james at jamesh.id.au-20061004071239-bb32b93e159b7899
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-10-11 20:07:42 -0500
    message:
      (James Henstridge) Allow config entries to cascade
    ------------------------------------------------------------
    merged: james at jamesh.id.au-20061004071239-bb32b93e159b7899
    parent: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr.locationconfig
    timestamp: Wed 2006-10-04 15:12:39 +0800
    message:
      get rid of the recurse argument to get_user_option()
    ------------------------------------------------------------
    merged: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
    parent: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr.locationconfig
    timestamp: Mon 2006-10-02 21:36:02 +0800
    message:
      add back recurse=False option to config file
    ------------------------------------------------------------
    merged: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
    parent: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
    parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr.locationconfig
    timestamp: Mon 2006-10-02 19:10:54 +0800
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
    parent: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr.locationconfig
    timestamp: Mon 2006-09-18 10:59:05 +0800
    message:
      make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
    ------------------------------------------------------------
    merged: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
    parent: james at jamesh.id.au-20060908031106-1b304673906dcf8f
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr.locationconfig
    timestamp: Fri 2006-09-08 12:30:02 +0800
    message:
      make test break again
    ------------------------------------------------------------
    merged: james at jamesh.id.au-20060908031106-1b304673906dcf8f
    parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
    committer: James Henstridge <james at jamesh.id.au>
    branch nick: bzr.locationconfig
    timestamp: Fri 2006-09-08 11:11:06 +0800
    message:
      first go at making location config lookup recursive