Rev 216: merge from ab-trunk. in /home/robertc/source/baz/plugins/bzrtools/trunk/

Robert Collins robertc at robertcollins.net
Mon Apr 17 12:01:40 BST 2006


------------------------------------------------------------
revno: 216
revision-id: robertc at robertcollins.net-20060417110138-8b47d227583b5b28
parent: robertc at robertcollins.net-20060307233714-79a35108099f3766
parent: abentley at panoramicfeedback.com-20060412181333-de8c5c460e75696f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Mon 2006-04-17 21:01:38 +1000
message:
  merge from ab-trunk.
removed:
  diffstat.py                    diffstat.py-20051024151608-a54f0687ba271711
  errors.py                      errors.py-20050809125241-fdfa00da24e88399
added:
  .be/bugs/1e6d3356-5668-47f3-b451-5285bcc0ec3b/ 1e6d3356566847f3b4515285bcc0ec3b-20060313001218-fa97807ed6f6ef51
  .be/bugs/1e6d3356-5668-47f3-b451-5285bcc0ec3b/values values-20060313001218-68dbf2985cf69606
  .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/ 9312b4cf379e490bbfb5dfb81357ee25-20060331154443-c4b65f66869ef8a2
  .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/ comments-20060331154726-d5a7f8077bc1041c
  .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/ 906938f4be684d659b75def07743b043-20060331154727-54344ef870ea3efb
  .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/body body-20060331154727-9c9d4add689311bb
  .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/values values-20060331154727-1ffbeeb566335a6a
  .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/values values-20060331154444-651bb548c2675ceb
  .be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93/ bad9a00f50f547829da6722fb0a58c93-20060323163813-9a55c43ab0dba3b5
  .be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93/values values-20060323163813-90ee8a42d2cdfc01
  .be/bugs/da0f16ce-1ee0-4f9e-bf1a-9a78c4a7e765/ da0f16ce1ee04f9ebf1a9a78c4a7e765-20060313001230-0a4ccf20ba2cf489
  .be/bugs/da0f16ce-1ee0-4f9e-bf1a-9a78c4a7e765/values values-20060313001230-83e9abd28aa44913
  .be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/ dbd1014551f84bda96d906b5d3ef80b8-20060323164253-8397ea341b737423
  .be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/values values-20060323164253-5a729eb6b3402a8f
  .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/ fdc2b62a96224f08ac78bd2603a4e0af-20060331154855-67455c67c3693d43
  .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/ comments-20060331155254-724bbea7fa09fe6b
  .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/ f13e33581a654a459472781548bc3fc3-20060331155254-4883028145835936
  .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/body body-20060331155255-a944fec10e3ae2f1
  .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/values values-20060331155254-6d3e2502a9d1a680
  .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/values values-20060331154855-b6c904a54a913ce8
  NEWS.Shelf                     NEWS-20051128063024-146609999a3b0743
  README.Shelf                   README-20051128090941-ec5c604014d801e6
  TODO.Shelf                     TODO-20051129074256-8b57a5d6e4c8ceab
  branches.py                    branches.py-20060324162111-0e2fdcd74c6cfc7d
  cbranch.py                     cbranch.py-20060324052025-85cf804fcab8b431
  errors.py                      errors.py-20060206140356-25a88c48fffc08bc
  patchsource.py                 patchsource.py-20060206124210-c55d6f6752718485
  switch.py                      switch.py-20060412002645-591f54267880ac10
  userinteractor.py              userinteractor.py-20051128084351-09a0351a07ce67f1
  zap.py                         zap.py-20060322221756-d1c9422fb299ab7c
renamed:
  blackbox.py => tests/blackbox.py blackbox.py-20051024040435-607c5e197ca2b9d8
  reweave_inventory.py => obsolete/reweave_inventory.py reweave_inventory.py-20051108164726-1e5e0934febac06e
  shelf_tests.py => tests/shelf_tests.py tests.py-20051019130958-0edcded95321bddd
modified:
  .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/values values-20051203235200-f1c02ce806c1f22b
  .bzrignore                     bzrignore-20051019101153-5d5eb01b764a7ab3
  INSTALL                        INSTALL-20050507104657-93be314e40bb52a9
  NEWS                           NEWS-20050607185005-1d99ddda6117a97e
  README                         README-20050503015107-238050d346fcbb08
  __init__.py                    __init__.py-20051019101947-f758f1a696725014
  baz_import.py                  baz_import.py-20050614155149-bd6a5b1bff67db25
  branchhistory.py               ancestry.py-20051129154454-419cfcc7ab46eb80
  bzrtools.py                    scriptlib.py-20050501073634-776a13caa8838cf4
  clean_tree.py                  clean_tree.py-20050827022328-5ba46e22d074695c
  fetch_ghosts.py                fetch_missing.py-20050903220502-5529ef03979a5b29
  hunk_selector.py               hunk_selector.py-20051019101124-6aee8064c0395326
  patch.py                       patch.py-20050911032635-0e10233a9e39ef63
  patches.py                     patches.py-20050525150501-f0e1e86635748af1
  shelf.py                       shelf.py-20050525150501-c9479ac0bac3d0f6
  shell.py                       shell.py-20051027040441-2911d8e8e5673742
  tests/__init__.py              __init__.py-20050907130235-e51cb61888e9e4f5
  tests/test_baz_import.py       test_baz_import.py-20050907130235-b4060b7dfae6a3e6
  tests/blackbox.py              blackbox.py-20051024040435-607c5e197ca2b9d8
  tests/shelf_tests.py           tests.py-20051019130958-0edcded95321bddd
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060412181333-de8c5c460e75696f
    parent: abentley at panoramicfeedback.com-20060331155306-99d10c60c8bf0bff
    parent: aaron.bentley at utoronto.ca-20060412012715-b8e33bae91b660a0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-04-12 14:13:33 -0400
    message:
      Merge switch command
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060412012715-b8e33bae91b660a0
        parent: aaron.bentley at utoronto.ca-20060412002848-c5f973774ee7ac76
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzrtools
        timestamp: Tue 2006-04-11 21:27:15 -0400
        message:
          Tweak switch command
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060412002848-c5f973774ee7ac76
        parent: aaron.bentley at utoronto.ca-20060331014715-127c9cda9bbc1e6f
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzrtools
        timestamp: Tue 2006-04-11 20:28:48 -0400
        message:
          Add switch command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060331155306-99d10c60c8bf0bff
    parent: aaron.bentley at utoronto.ca-20060331014715-127c9cda9bbc1e6f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-31 10:53:06 -0500
    message:
      Updated some bugs
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060331014715-127c9cda9bbc1e6f
    parent: abentley at panoramicfeedback.com-20060329135914-43b75df29af22b14
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2006-03-30 20:47:15 -0500
    message:
      Strip trailing / from input location
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060329135914-43b75df29af22b14
    parent: aaron.bentley at utoronto.ca-20060329064334-62e56b84dedf3f8d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-29 08:59:14 -0500
    message:
      Fixed thinko determining to_location
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060329064334-62e56b84dedf3f8d
    parent: aaron.bentley at utoronto.ca-20060325060801-eb4909f92e6e9adc
    parent: abentley at panoramicfeedback.com-20060328224627-f2bcd8f16f917e4a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Wed 2006-03-29 01:43:34 -0500
    message:
      Merge combined work
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060328224627-f2bcd8f16f917e4a
        parent: abentley at panoramicfeedback.com-20060328221646-d36c46c772bdcaa5
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Tue 2006-03-28 17:46:27 -0500
        message:
          Fixed cbranch with empty to_location
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060328221646-d36c46c772bdcaa5
        parent: abentley at panoramicfeedback.com-20060327170331-1b8ef9a9429cd920
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Tue 2006-03-28 17:16:46 -0500
        message:
          cbranch mimics checkout wrt --lightweight
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060327170331-1b8ef9a9429cd920
        parent: abentley at panoramicfeedback.com-20060324195154-e183244265faeb50
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Mon 2006-03-27 12:03:31 -0500
        message:
          Provided --branch option to for zapping branches
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060325060801-eb4909f92e6e9adc
    parent: aaron.bentley at utoronto.ca-20060325053745-6b17a7909866abcb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-25 01:08:01 -0500
    message:
      Tweakage of the apache scraper
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060325053745-6b17a7909866abcb
    parent: abentley at panoramicfeedback.com-20060324195154-e183244265faeb50
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-25 00:37:45 -0500
    message:
      Fixed robustness issues in branches command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060324195154-e183244265faeb50
    parent: abentley at panoramicfeedback.com-20060324190130-2208c693486a8b33
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 14:51:54 -0500
    message:
      Handled more hrefs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060324190130-2208c693486a8b33
    parent: abentley at panoramicfeedback.com-20060324172421-c1acc18c1a4075a6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 14:01:30 -0500
    message:
      Added apache index scraping to the branches command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060324172421-c1acc18c1a4075a6
    parent: abentley at panoramicfeedback.com-20060324162211-587ea2d2e6386e63
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 12:24:21 -0500
    message:
      Added multi-pull, working on branches and checkouts
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060324162211-587ea2d2e6386e63
    parent: abentley at panoramicfeedback.com-20060324140654-cc9a6b0e8bd1f60a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 11:22:11 -0500
    message:
      Added branches subcommand
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060324140654-cc9a6b0e8bd1f60a
    parent: aaron.bentley at utoronto.ca-20060324131301-6a6d76314c9e9b98
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 09:06:54 -0500
    message:
      Improved cbranch docs
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060324131301-6a6d76314c9e9b98
    parent: aaron.bentley at utoronto.ca-20060324052043-8ca956b39b27ad42
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 08:13:01 -0500
    message:
      Removed docs for resolve and conflicts, now that they're in the mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060324052043-8ca956b39b27ad42
    parent: abentley at panoramicfeedback.com-20060323164309-311253fb9546a7ff
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2006-03-24 00:20:43 -0500
    message:
      Added cbranch command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060323164309-311253fb9546a7ff
    parent: abentley at panoramicfeedback.com-20060322223754-7863d474a9969f9b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Thu 2006-03-23 11:43:09 -0500
    message:
      Updated bugs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060322223754-7863d474a9969f9b
    parent: abentley at panoramicfeedback.com-20060322222530-56b616e026dc6ac3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-22 17:37:54 -0500
    message:
      Added zap to docs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060322222530-56b616e026dc6ac3
    parent: abentley at panoramicfeedback.com-20060322221819-0e627e73d1232926
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-22 17:25:30 -0500
    message:
      Text updates
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060322221819-0e627e73d1232926
    parent: abentley at panoramicfeedback.com-20060322154411-a748af8ce631695b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-22 17:18:19 -0500
    message:
      Added zap command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060322154411-a748af8ce631695b
    parent: abentley at panoramicfeedback.com-20060322152138-532543d08f4eb8db
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-22 10:44:11 -0500
    message:
      Updated to run all tests from test.py
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060322152138-532543d08f4eb8db
    parent: abentley at panoramicfeedback.com-20060322151916-75711de1522d1f68
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-22 10:21:38 -0500
    message:
      Removed obsolete reweave_inventory
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060322151916-75711de1522d1f68
    parent: abentley at panoramicfeedback.com-20060320221912-b0d7e1bcd50c9973
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Wed 2006-03-22 10:19:16 -0500
    message:
      Tagged BZRTOOLS commands to reduce confusion
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060320221912-b0d7e1bcd50c9973
    parent: aaron.bentley at utoronto.ca-20060318232932-4981a8efa6e028c9
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Mon 2006-03-20 17:19:12 -0500
    message:
      Switch fetch-ghosts from running "fix" to "reconcile"
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060318232932-4981a8efa6e028c9
    parent: aaron.bentley at utoronto.ca-20060318172201-61c998268c79f378
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-18 18:29:32 -0500
    message:
      Fixed patch on checkouts
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060318172201-61c998268c79f378
    parent: aaron.bentley at utoronto.ca-20060318171952-ddd8719266b904c8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-18 12:22:01 -0500
    message:
      Moved tests into a subdir
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060318171952-ddd8719266b904c8
    parent: aaron.bentley at utoronto.ca-20060318171451-2b15a9bcf7b77d69
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-18 12:19:52 -0500
    message:
      Fixed shelf test case
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060318171451-2b15a9bcf7b77d69
    parent: aaron.bentley at utoronto.ca-20060318170037-6e2b7eeba66a92f7
    parent: michael at ellerman.id.au-20060318012051-a870fc03c094ea10
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-18 12:14:51 -0500
    message:
      Merge from shelf
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060318012051-a870fc03c094ea10
        parent: michael at ellerman.id.au-20060317150041-dcf220b1573967f6
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sat 2006-03-18 12:20:51 +1100
        message:
          Add a test for shelving in a subdirectory
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060317150041-dcf220b1573967f6
        parent: michael at ellerman.id.au-20060314085239-47db02c515fb04dd
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sat 2006-03-18 02:00:41 +1100
        message:
          Update TODO
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060318170037-6e2b7eeba66a92f7
    parent: abentley at panoramicfeedback.com-20060316150654-9eabd1c1d7ea804e
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-18 12:00:37 -0500
    message:
      Lock repo for branch-history
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060316150654-9eabd1c1d7ea804e
    parent: abentley at panoramicfeedback.com-20060316145904-c004cd0222a1f1c8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Thu 2006-03-16 10:06:54 -0500
    message:
      Fixed checkout handling in Shelve
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060316145904-c004cd0222a1f1c8
    parent: aaron.bentley at utoronto.ca-20060316055911-07e6ec61b7630727
    parent: abentley at panoramicfeedback.com-20060316145704-6ba1c2649f54a201
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Thu 2006-03-16 09:59:04 -0500
    message:
      Merge shelf v2 again
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060316145704-6ba1c2649f54a201
        parent: abentley at panoramicfeedback.com-20060316145300-836889d55437eb15
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Thu 2006-03-16 09:57:04 -0500
        message:
          Fixed NEWS
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060316145300-836889d55437eb15
        parent: abentley at panoramicfeedback.com-20060314181004-ea3edbc59ddc8ae3
        parent: michael at ellerman.id.au-20060314085239-47db02c515fb04dd
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Thu 2006-03-16 09:53:00 -0500
        message:
          Merge shelf v2
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060314085239-47db02c515fb04dd
        parent: michael at ellerman.id.au-20060314085103-6d42468bf54d3ef2
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Tue 2006-03-14 19:52:39 +1100
        message:
          Support for bzr 0.7 and 0.8 in BzrPatchSource. Big thanks to marienz
          for help with testing.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060314085103-6d42468bf54d3ef2
        parent: michael at ellerman.id.au-20060314085040-31beef00eeae7e32
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Tue 2006-03-14 19:51:03 +1100
        message:
          Using the wrong exception names in __init__.py
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060314085040-31beef00eeae7e32
        parent: michael at ellerman.id.au-20060313005959-58b150f57d97dbb4
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Tue 2006-03-14 19:50:40 +1100
        message:
          Support for 0.7 format diffs when shelving, and better error handling
          in general when running patch at shelve time.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060313005959-58b150f57d97dbb4
        parent: michael at ellerman.id.au-20060313003733-c4c63c176cbaa856
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 11:59:59 +1100
        message:
          Keep ignoring .bzr-shelf* so as not to suprise people
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060313003733-c4c63c176cbaa856
        parent: michael at ellerman.id.au-20060312143048-6514b74ba2faead3
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 11:37:33 +1100
        message:
          Update TODO
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312143048-6514b74ba2faead3
        parent: michael at ellerman.id.au-20060312141803-c5091172f7c1592c
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 01:30:48 +1100
        message:
          Add --force option to unshelve, which runs the shelved changes through
          patch eventhough they don't apply. This can be useful if some or most of
          the changes apply, or in order to use wiggle or something else on the
          reject files. Handle with care.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312141803-c5091172f7c1592c
        parent: michael at ellerman.id.au-20060312141200-0e20055c572dfc23
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 01:18:03 +1100
        message:
          Update help text to try and be clearer, some stolen from bzrtools.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312141200-0e20055c572dfc23
        parent: michael at ellerman.id.au-20060312135703-ebe82bc8d395e47f
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 01:12:00 +1100
        message:
          Add support for unshelving -p0 patches, for backward compatibility.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312135703-ebe82bc8d395e47f
        parent: michael at ellerman.id.au-20060312135553-151b108c9d215d85
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 00:57:03 +1100
        message:
          Discard errors from patch if we're dry-running. It lies anyway.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312135553-151b108c9d215d85
        parent: michael at ellerman.id.au-20060312134040-d710f54c0478c72c
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 00:55:53 +1100
        message:
          Add support for detecting and upgrading from old format shelves.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312134040-d710f54c0478c72c
        parent: michael at ellerman.id.au-20060312012408-ba463e64ca4fd47e
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Mon 2006-03-13 00:40:40 +1100
        message:
          Add a test to make sure we can cope with gaps in the patch numbering.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312012408-ba463e64ca4fd47e
        parent: michael at ellerman.id.au-20060312010546-466c32126f9475e1
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 12:24:08 +1100
        message:
          Add a test for delete
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312010546-466c32126f9475e1
        parent: michael at ellerman.id.au-20060312010454-f03a25fc6d4fef16
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 12:05:46 +1100
        message:
          Backup the patch when we unshelve. Suggested by Christian Reis.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312010454-f03a25fc6d4fef16
        parent: michael at ellerman.id.au-20060312003917-fb4473843b40c44a
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 12:04:54 +1100
        message:
          Cope if there's bogus files in the shelf directory.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312003917-fb4473843b40c44a
        parent: michael at ellerman.id.au-20060312003619-4463e5e484eb0b5b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 11:39:17 +1100
        message:
          Update NEWS
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312003619-4463e5e484eb0b5b
        parent: michael at ellerman.id.au-20060312003510-4244ca233f07b93a
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 11:36:19 +1100
        message:
          can_live_update() bollocks not needed now we don't do diffstat.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060312003510-4244ca233f07b93a
        parent: michael at ellerman.id.au-20060311132545-7dbe20aa94c0bfd2
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 11:35:10 +1100
        message:
          After extensive user testing, ie. me using it, I've decided --pick should be
          the default, not --all. So switch back to prompting by default, and --all gets
          the shelve all behaviour.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060311132545-7dbe20aa94c0bfd2
        parent: michael at ellerman.id.au-20060311131921-8565bcc3ac4a10b6
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 00:25:45 +1100
        message:
          Note diffstat change in NEWS.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060311131921-8565bcc3ac4a10b6
        parent: michael at ellerman.id.au-20060311130906-387167043c79797b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 00:19:21 +1100
        message:
          I'm sure someone will complain about this, but remove the diffstat after
          shelve/unshelve. If you want diffstat after shelve/unshelve then run diffstat!
          Make the shelve and unshelve messages symmetrical, and make sure if there's
          no message in the patch we print something when unshelving.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060311130906-387167043c79797b
        parent: michael at ellerman.id.au-20060311125348-7a2b246f343db243
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sun 2006-03-12 00:09:06 +1100
        message:
          When unshelving, try to patch with --dry-run first, if that fails bail out.
          This should prevent the working tree getting half of the shelved patch, but
          not the rest, which seems cleaner.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060311125348-7a2b246f343db243
        parent: michael at ellerman.id.au-20060310043056-c3059be9260bf58a
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Sat 2006-03-11 23:53:48 +1100
        message:
          Add a test to make sure we don't delete the shelved patch if unshelving
          fails. And make the error a little nicer.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060310043056-c3059be9260bf58a
        parent: michael at ellerman.id.au-20060228090759-3fb20f080ffab71b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Fri 2006-03-10 15:30:56 +1100
        message:
          Update for -p1 format diffs, steal some of Aaron's run_patch() from bzrtools.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060228090759-3fb20f080ffab71b
        parent: michael at ellerman.id.au-20060221065651-a041c817cade09f7
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf
        timestamp: Tue 2006-02-28 20:07:59 +1100
        message:
          Adapt to BzrDir changes and deprecation of show_diff().
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060221065651-a041c817cade09f7
        parent: michael at ellerman.id.au-20051212173326-44a01d94f544228a
        parent: michael at ellerman.id.au-20060221050926-a135277612b73609
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf-tmp
        timestamp: Tue 2006-02-21 17:56:51 +1100
        message:
          Merge most of the standalone shelf branch. This brings in a few changes which
          make it easier to write a standalone shelf, although not all of them.
          There's also a bunch of new features, tests, etc.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221050926-a135277612b73609
            parent: michael at ellerman.id.au-20060221050527-7cbe0b8db290339b
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 16:09:26 +1100
            message:
              Test for shelf show with no patch to show.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221050527-7cbe0b8db290339b
            parent: michael at ellerman.id.au-20060221050235-1cd9e46177de8b92
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 16:05:27 +1100
            message:
              Better error message when trying to show an non-existant patch
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221050235-1cd9e46177de8b92
            parent: michael at ellerman.id.au-20060221045227-387f2698220d484c
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 16:02:35 +1100
            message:
              More tests of shelf show
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221045227-387f2698220d484c
            parent: michael at ellerman.id.au-20060221044250-2a03e617e42b4862
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 15:52:27 +1100
            message:
              Add basic test for shelf show
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221044250-2a03e617e42b4862
            parent: michael at ellerman.id.au-20060221034125-ac3cf5f09e38c19a
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 15:42:50 +1100
            message:
              Update tests for BzrDir changes, use test helpers to save future pain.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221034125-ac3cf5f09e38c19a
            parent: michael at ellerman.id.au-20060221034111-04574f50042ef6bf
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 14:41:25 +1100
            message:
              Fixup shelving message
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060221034111-04574f50042ef6bf
            parent: michael at ellerman.id.au-20060212034823-e06b80c1e5e3c505
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-21 14:41:11 +1100
            message:
              Add switch command to switch between multiple shelves.
              Add show command to show the content of a patch on the current shelf.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060212034823-e06b80c1e5e3c505
            parent: michael at ellerman.id.au-20060212034720-1482cf30017f2ec7
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sun 2006-02-12 14:48:23 +1100
            message:
              Should be ignoring .shelf, not .shelf*
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060212034720-1482cf30017f2ec7
            parent: michael at ellerman.id.au-20060212032243-f77edc5a7e5ba5bb
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sun 2006-02-12 14:47:20 +1100
            message:
              Infrastructure to allow for multiple interchangeable shelves.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060212032243-f77edc5a7e5ba5bb
            parent: michael at ellerman.id.au-20060212032147-75cd63ab02e72837
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sun 2006-02-12 14:22:43 +1100
            message:
              Update NEWS
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060212032147-75cd63ab02e72837
            parent: michael at ellerman.id.au-20060212031128-68809856272ab855
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sun 2006-02-12 14:21:47 +1100
            message:
              Make list output look nicer when the shelf is empty.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060212031128-68809856272ab855
            parent: michael at ellerman.id.au-20060212024642-f4819a6b321464e4
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sun 2006-02-12 14:11:28 +1100
            message:
              Add shelf delete subcommand, make list barf if it gets an arg.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060212024642-f4819a6b321464e4
            parent: michael at ellerman.id.au-20060211053333-024447ac2310c283
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sun 2006-02-12 13:46:42 +1100
            message:
              Make next_patch() cope with holes, eg. 00, 02 etc.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211053333-024447ac2310c283
            parent: michael at ellerman.id.au-20060211053315-85b039d2596754f8
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 16:33:33 +1100
            message:
              Update NEWS.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211053315-85b039d2596754f8
            parent: michael at ellerman.id.au-20060211053254-7555b8387c38465f
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 16:33:15 +1100
            message:
              Add '.shelf' to DEFAULT_IGNORE.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211053254-7555b8387c38465f
            parent: michael at ellerman.id.au-20060211040107-a1e72b972ad30dda
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 16:32:54 +1100
            message:
              Add help for shelf command, rename action to subcommand.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211040107-a1e72b972ad30dda
            parent: michael at ellerman.id.au-20060211035856-90f2c7c3784f4998
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 15:01:07 +1100
            message:
              Use new log function.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211035856-90f2c7c3784f4998
            parent: michael at ellerman.id.au-20060211034805-81d3e60a97472000
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:58:56 +1100
            message:
              Add shelf command with subcommand "list" which lists the shelf contents.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211034805-81d3e60a97472000
            parent: michael at ellerman.id.au-20060211034334-bb98844557509512
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:48:05 +1100
            message:
              Try to clear up terminology confusion. A shelf contains multiple patches, each
              of which consists of one or more hunks.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211034334-bb98844557509512
            parent: michael at ellerman.id.au-20060211032902-647f3c35d97ce24a
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:43:34 +1100
            message:
              Fix test now that we have a message always.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211032902-647f3c35d97ce24a
            parent: michael at ellerman.id.au-20060211032821-6ddd36c064b92a4e
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:29:02 +1100
            message:
              Don't mention reverting shelved patches.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211032821-6ddd36c064b92a4e
            parent: michael at ellerman.id.au-20060211032804-4a7b7bb620d47d72
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:28:21 +1100
            message:
              Don't print an extra spance when unshelving with a message.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211032804-4a7b7bb620d47d72
            parent: michael at ellerman.id.au-20060211032701-43996d6a9e744b1a
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:28:04 +1100
            message:
              Always set shelf message and print it when shelving.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060211032701-43996d6a9e744b1a
            parent: michael at ellerman.id.au-20060208012405-6afb0a532526594d
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Sat 2006-02-11 14:27:01 +1100
            message:
              Make patch parsing cope with shelf messages, starting with '#'.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060208012405-6afb0a532526594d
            parent: michael at ellerman.id.au-20060206141402-7cb3e6917f8e517e
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Wed 2006-02-08 12:24:05 +1100
            message:
              Make tests work with new bzr API, we can't use _transport anymore.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060206141402-7cb3e6917f8e517e
            parent: michael at ellerman.id.au-20060206140432-416e0232a1804e06
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-07 01:14:02 +1100
            message:
              Make some of the messages a bit more readable.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060206140432-416e0232a1804e06
            parent: michael at ellerman.id.au-20060206140414-11c89c99a0ec59b0
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-07 01:04:32 +1100
            message:
              Add .shelf to .bzrignore.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060206140414-11c89c99a0ec59b0
            parent: michael at ellerman.id.au-20060206135253-46d07a6db0239dbb
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-07 01:04:14 +1100
            message:
              Factor out bzrisms.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060206135253-46d07a6db0239dbb
            parent: michael at ellerman.id.au-20060206134153-189a1851eb08cb35
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-07 00:52:53 +1100
            message:
              For the moment at least storing scads of stuff under .bzr isn't really
              supported by the bzr API, so move the shelf back out of .bzr into .shelf.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060206134153-189a1851eb08cb35
            parent: michael at ellerman.id.au-20051212173326-44a01d94f544228a
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: standalone_shelf
            timestamp: Tue 2006-02-07 00:41:53 +1100
            message:
              Factor out patch generation into PatchSource classes.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051212173326-44a01d94f544228a
        parent: michael at ellerman.id.au-20051205004405-703694050940ac13
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-12-12 11:33:26 -0600
        message:
          Merge Dafydd Harries' fix for long filenames in diffstat
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051205004405-703694050940ac13
        parent: michael at ellerman.id.au-20051204205127-32ba7c4c129556fb
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Sun 2005-12-04 18:44:05 -0600
        message:
          Import diffstat updates.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051204205127-32ba7c4c129556fb
        parent: michael at ellerman.id.au-20051130001436-a94d056443499f3b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Sun 2005-12-04 14:51:27 -0600
        message:
          Don't ignore .bzr-shelf anymore.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051130001436-a94d056443499f3b
        parent: michael at ellerman.id.au-20051129191641-8ef5f036343f3ae9
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 18:14:36 -0600
        message:
          Fix typo in diffstat output.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129191641-8ef5f036343f3ae9
        parent: michael at ellerman.id.au-20051129191549-1d4e5723f337c6e9
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 13:16:41 -0600
        message:
          Fix tests, now that we don't wrap exceptions we return 3 on error, not 1.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129191549-1d4e5723f337c6e9
        parent: michael at ellerman.id.au-20051129191341-ffefe5ff24e24892
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 13:15:49 -0600
        message:
          Remove hack to make errors prettier now that mainline bzr prints them in a
          nicer way.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129191341-ffefe5ff24e24892
        parent: michael at ellerman.id.au-20051129080440-956eacb2b9efbe49
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 13:13:41 -0600
        message:
          Update tests for cleaner exceptions
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129080440-956eacb2b9efbe49
        parent: michael at ellerman.id.au-20051129074626-c81ea31f879596e4
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 02:04:40 -0600
        message:
          More TODOs, sheesh.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129074626-c81ea31f879596e4
        parent: michael at ellerman.id.au-20051129074557-7ac99d8eb37fb71b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:46:26 -0600
        message:
          Add another TODO.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129074557-7ac99d8eb37fb71b
        parent: michael at ellerman.id.au-20051129074232-20834022c63c9cf2
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:45:57 -0600
        message:
          Create TODO with some random stuff.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129074232-20834022c63c9cf2
        parent: michael at ellerman.id.au-20051129074220-dd202dfa7dc8ba82
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:42:32 -0600
        message:
          Update tests for new return codes from error commands.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129074220-dd202dfa7dc8ba82
        parent: michael at ellerman.id.au-20051129074158-ae00afb20c9dcbee
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:42:20 -0600
        message:
          Hack __init__.py to make the exceptions look nicer for users, this should be
          fixed in bzr IMHO.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129074158-ae00afb20c9dcbee
        parent: michael at ellerman.id.au-20051129071613-968560d23c9eb91b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:41:58 -0600
        message:
          Cleanup exceptions/status in shelf.py. Raise exceptions for errors, otherwise
          things work. Remove unused QuitException.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129071613-968560d23c9eb91b
        parent: michael at ellerman.id.au-20051129071226-a04b3f827880025d
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:16:13 -0600
        message:
          Remove unneeded imports.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129071226-a04b3f827880025d
        parent: michael at ellerman.id.au-20051129014152-f5ede8888bcebc48
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Tue 2005-11-29 01:12:26 -0600
        message:
          Unshelve --pick was broken, because we deleted the whole patch, even when only
          part of it was unshelved. So now if we unshelve part of a patch, the patch is
          replaced with a new patch that has just the unshelved parts. That's a long way
          of saying it does what you'd expect.
          
          Implementing this required changing HunkSelector to return both the selected,
          and unselected hunks (ie. patches to shelve, and patches to keep).
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129014152-f5ede8888bcebc48
        parent: michael at ellerman.id.au-20051129014115-eff5eb80bc51e0f5
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 19:41:52 -0600
        message:
          HunkSelector was broken if you did a "done" followed by "status/invert" etc.
          Fixup to make pychecker happy.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051129014115-eff5eb80bc51e0f5
        parent: michael at ellerman.id.au-20051128183214-abade6823cc5ff40
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 19:41:15 -0600
        message:
          Make HunkSelector agnostic as to whether it's selecting for shelving or
          unshelving. Create ShelveHunkSelector() and UnshelveHunkSelector() to
          encapsulate this, a bit ugly, but reasonable.
          
          Rename callbacks to be private, ie. beginning with _.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128183214-abade6823cc5ff40
        parent: michael at ellerman.id.au-20051128091104-9aea7c3b4ff89eb1
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 12:32:14 -0600
        message:
          Add support for 'unshelve --pick'. This works but the UI is broken, as the
          hunk selector prompts are all still related to shelving, not unshelving.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128091104-9aea7c3b4ff89eb1
        parent: michael at ellerman.id.au-20051128090947-5d49420cab5d656d
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 03:11:04 -0600
        message:
          Add a version, inline with bzr version
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128090947-5d49420cab5d656d
        parent: michael at ellerman.id.au-20051128090406-173d2e0c53ed0c66
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 03:09:47 -0600
        message:
          Add a basic README
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128090406-173d2e0c53ed0c66
        parent: michael at ellerman.id.au-20051128085954-ce1fa812eeeab31d
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 03:04:06 -0600
        message:
          Update NEWS for prompt changes
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128085954-ce1fa812eeeab31d
        parent: michael at ellerman.id.au-20051128085648-3b805ab0af53fdd1
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 02:59:54 -0600
        message:
          Restart after a done was broken, and we weren't resetting the print logic at
          the end of the loop either, so we wouldn't print the hunk after a 'dr'.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128085648-3b805ab0af53fdd1
        parent: michael at ellerman.id.au-20051128085315-a955739cb6304e9b
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 02:56:48 -0600
        message:
          The UserInteractor refactoring changed the order in which we print options,
          fix it so we print them in the order we get them.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128085315-a955739cb6304e9b
        parent: michael at ellerman.id.au-20051128084546-372d14c519162bbd
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 02:53:15 -0600
        message:
          Ask "shelve this change" instead of "keep this change", which is hopefully
          more intuitive. Change the wording of some prompts for clarity.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128084546-372d14c519162bbd
        parent: michael at ellerman.id.au-20051128084320-2e79db08986817c4
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 02:45:46 -0600
        message:
          Move UserInteractor into a seperate file.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128084320-2e79db08986817c4
        parent: michael at ellerman.id.au-20051128065801-85aa3456f2b8e496
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 02:43:20 -0600
        message:
          Refactored HunkSelector heavily to split out a UserInteractor class.
          
          The UserInteractor knows nothing about hunks, or shelves, it just does an
          interaction loop based on certain options through a list of items. For each
          item it prompts and then calls a callback based on the user's choice.
          
          This pretty much makes no user-visible change, but I haven't tested that
          thoroughly - I really need to write tests for the interaction code.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128065801-85aa3456f2b8e496
        parent: michael at ellerman.id.au-20051128064039-c970560719335ebc
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 00:58:01 -0600
        message:
          Shelve everything by default, use --pick to select hunks individually.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128064039-c970560719335ebc
        parent: michael at ellerman.id.au-20051128063033-fa513e6613c04916
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 00:40:39 -0600
        message:
          Update command documentation to hopefully be a little clearer.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128063033-fa513e6613c04916
        parent: michael at ellerman.id.au-20051128062538-a641c1279063c5fc
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 00:30:33 -0600
        message:
          Add NEWS to mention that shelves have moved.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128062538-a641c1279063c5fc
        parent: michael at ellerman.id.au-20051128062455-9da2ff70dd70e65c
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 00:25:38 -0600
        message:
          New shelf layout. Shelves now sit under .bzr/x-shelf/default/
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051128062455-9da2ff70dd70e65c
        parent: michael at ellerman.id.au-20051127005141-3f22bf8da12129a0
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Mon 2005-11-28 00:24:55 -0600
        message:
          Add tests for new shelf layout.
          
          Shelves are now named .bzr/x-shelf/default/0x where x increases.
          
          Also add a test for doing shelve/unshelve multiple times.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20051127005141-3f22bf8da12129a0
        parent: michael at ellerman.id.au-20051026104538-845c51008fecc9d1
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: shelf_v2
        timestamp: Sat 2005-11-26 18:51:41 -0600
        message:
          Update tests for changes in bzr:
           - add() and commit() now sit in working_tree, not branch.
           - diff returns 1 if there are changes in the tree.
           - diff filenames have \t appended to them for some reason.
           - Exceptions look a little different on stderr.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060316055911-07e6ec61b7630727
    parent: aaron.bentley at utoronto.ca-20060316055549-ae57a2c56a2a9925
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2006-03-16 00:59:11 -0500
    message:
      Only error on dirty wt if we are pushing the wt
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060316055549-ae57a2c56a2a9925
    parent: aaron.bentley at utoronto.ca-20060316055249-8f3042421e2ca912
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2006-03-16 00:55:49 -0500
    message:
      Added exclusions for x-push and parent in format6 branches
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060316055249-8f3042421e2ca912
    parent: aaron.bentley at utoronto.ca-20060316054838-a59dfe944c17b493
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2006-03-16 00:52:49 -0500
    message:
      Get/set control push locations per branch
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060316054838-a59dfe944c17b493
    parent: aaron.bentley at utoronto.ca-20060315040123-0a433b3a5cfbe403
    parent: ghigo at venice-20060314212149-174e9a109f343f26
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2006-03-16 00:48:38 -0500
    message:
      Got push working with new-format branches
        ------------------------------------------------------------
        merged: ghigo at venice-20060314212149-174e9a109f343f26
        parent: ghigo at venice-20060313201941-1322dc5ba24517d6
        committer: ghigo <ghigo at venice>
        branch nick: bzrtools
        timestamp: Tue 2006-03-14 22:21:49 +0100
        message:
          Now the patch command work.
        ------------------------------------------------------------
        merged: ghigo at venice-20060313201941-1322dc5ba24517d6
        parent: ghigo at venice-20060313183429-5b0cb1426d53eb3e
        committer: ghigo <ghigo at venice>
        branch nick: bzrtools
        timestamp: Mon 2006-03-13 21:19:41 +0100
        message:
          Use the TreeTransform class, on the basis of the suggest of
          Aaron Bentley 
          
          ---------------------------------------
          
          Goffredo Baroncelli wrote:
          | On Monday 13 March 2006 01:36, Aaron Bentley wrote:
          |
          |>Hi Goffredo,
          |
          |
          | Hi Aaron,
          |
          |
          |>I'm still waiting for your thoughts on this.  As I said, I'm willing to
          |>merge it, given that it's optional.  On the other hand, there are
          |>situations where it will lead to data loss, so using TreeTransform may
          |>be a better approach.
          |
          |
          | I updated the patch in order to solve some concerns. But you are right, I
          | have to use the TreeTransform class. My big problem is the lack of
          | documentation on how use the class: could you answer to some my question ?
          
          Sure.  Any failings in the documentation are my fault.
          
          | The TreeTransform class is instantiated on the working tree: but how we
          | inform the class that a file is:
          | - changed ( updated )
          
          Get the trans_id with trans_id_tree_file_id
          Delete the current contents with delete_contents
          Add new contents with create_file (or symlink, directory)
          
          | - created
          
          Call new_file
          
          | - deleted
          
          Get the trans_id with trans_id_tree_file_id
          Delete the current contents with delete_versioned
          
          | - renamed/moved ( is it the same ? )
          
          Get the trans_id with trans_id_tree_file_id
          Call adjust_path
          
          | Then how we can manage the conflict ?
          
          If you create a filesystem conflict, the transform won't apply.  If you
          call resolve_conflicts, it will fix filesystem conflicts, so the
          transform will apply.
          
          Text conflicts are up to you to manage.
          
          | Reading the code, what I understood is that:
          | - for every file touched, It must assign a trans_id using the function
          create_path( )
          
          create_path is only for new files.  For existing files, you should get
          them from trans_id_tree_file_id, trans_id_tree_path, or trans_id_file_id.
          
          | - the creation of a file/directory/symlink is perfomed via the
          create_{directory,symlink,file)
          | function
          
          You can, but there are also the new_file, new_directory, new_symlink
          convenience methods.
          
          | - the deletion of a file ( directory, symlink ? ) is scheduled by the
          | unversion_file/delete_contents depending if a file is versioned.
          
          For a versioned file, you'd have to do both.  Or, you can use
          delete_versioned_file.
          
          | - the renaming of a directory/file/symlink is perfomed by the
          adjust_path function
          
          Right.
          
          | - I dont understood how we manage the content change
          
          Content changes are content deletion and content creation.
          
          Aaron
        ------------------------------------------------------------
        merged: ghigo at venice-20060313183429-5b0cb1426d53eb3e
        parent: ghigo at venice-20060303211743-d5768bfda9978094
        committer: ghigo <ghigo at venice>
        branch nick: bzrtools
        timestamp: Mon 2006-03-13 19:34:29 +0100
        message:
          Inform bzr of a renaming
        ------------------------------------------------------------
        merged: ghigo at venice-20060303211743-d5768bfda9978094
        parent: ghigo at venice-20060303204043-a0355f76fb8f6b1a
        committer: ghigo <ghigo at venice>
        branch nick: bzrtools
        timestamp: Fri 2006-03-03 22:17:43 +0100
        message:
          Initializate r before the use
        ------------------------------------------------------------
        merged: ghigo at venice-20060303204043-a0355f76fb8f6b1a
        parent: abentley at panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
        committer: ghigo <ghigo at venice>
        branch nick: bzrtools
        timestamp: Fri 2006-03-03 21:40:43 +0100
        message:
          add support for bazaar diff
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060315040123-0a433b3a5cfbe403
    parent: aaron.bentley at utoronto.ca-20060315040036-8e8302e75241ac9a
    parent: abentley at panoramicfeedback.com-20060314181004-ea3edbc59ddc8ae3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Tue 2006-03-14 23:01:23 -0500
    message:
      Merged shell fix
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060314181004-ea3edbc59ddc8ae3
        parent: abentley at panoramicfeedback.com-20060310205835-08dc7d4cedbc64c1
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Tue 2006-03-14 13:10:04 -0500
        message:
          Handle aliases in bzr shell
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060315040036-8e8302e75241ac9a
    parent: aaron.bentley at utoronto.ca-20060313001356-6aadd11700e1ac1f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Tue 2006-03-14 23:00:36 -0500
    message:
      Adjust number in bzr selftest
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060313001356-6aadd11700e1ac1f
    parent: aaron.bentley at utoronto.ca-20060311154215-cd9599aa4e996ccf
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sun 2006-03-12 19:13:56 -0500
    message:
      Marked deprecation bugs
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060311154215-cd9599aa4e996ccf
    parent: abentley at panoramicfeedback.com-20060310205835-08dc7d4cedbc64c1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2006-03-11 10:42:15 -0500
    message:
      Initial nested progressbar work.  (Need console fix)
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060310205835-08dc7d4cedbc64c1
    parent: abentley at panoramicfeedback.com-20060310201517-958f8d9307a49b2e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-10 15:58:35 -0500
    message:
      Updated docs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060310201517-958f8d9307a49b2e
    parent: aaron.bentley at utoronto.ca-20060309130304-d5f7097d1389e641
    parent: abentley at panoramicfeedback.com-20060310201032-157695f6569b4536
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Fri 2006-03-10 15:15:17 -0500
    message:
      Merged the Arch-1 bzrtools import
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060310201032-157695f6569b4536
        parent: abentley at panoramicfeedback.com-20060310200005-59e51d3e9187e677
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Fri 2006-03-10 15:10:32 -0500
        message:
          Updated number of files expected by test_two_branches
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060310200005-59e51d3e9187e677
        parent: abentley at panoramicfeedback.com-20060307172508-5e790d4de816d62f
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bzrtools
        timestamp: Fri 2006-03-10 15:00:05 -0500
        message:
          Handle missing pybaz properly
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060309130304-d5f7097d1389e641
    parent: aaron.bentley at utoronto.ca-20060308071128-496c1e37012717c7
    parent: abentley at panoramicfeedback.com-20060307172304-81a37ded2450ce99
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2006-03-09 08:03:04 -0500
    message:
      Merged other changes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060308071128-496c1e37012717c7
    parent: abentley at panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Wed 2006-03-08 02:11:28 -0500
    message:
      Tweaked the ignore list slightly



More information about the bazaar-commits mailing list