Rev 2274: (robertc) 4 new branch hooks: post_push, post_pull, post_commit, post_uncommit, and fix the inability to do a bzr pull --overwrite of a heavyweight checkout. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2274
revision-id: pqm at pqm.ubuntu.com-20070208070647-fa39bee48393a769
parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
parent: robertc at robertcollins.net-20070206235330-2sy67ccuq0ksubqa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-08 07:06:47 +0000
message:
  (robertc) 4 new branch hooks: post_push, post_pull, post_commit, post_uncommit, and fix the inability to do a bzr pull --overwrite of a heavyweight checkout.
added:
  bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
  bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
  bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
  bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20070206235330-2sy67ccuq0ksubqa
    parent: robertc at robertcollins.net-20070206023342-hv5o5qh6pdktiwbc
    parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-hooks
    timestamp: Wed 2007-02-07 10:53:30 +1100
    message:
      Merge HEAD.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20070206023342-hv5o5qh6pdktiwbc
    parent: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-hooks
    timestamp: Tue 2007-02-06 13:33:42 +1100
    message:
      New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
      complement the set_rh hook by allowing different actions, and awareness of
      the prior state of the branch, for operations where this matters.
      
      Fix the inability to do a bzr pull --overwrite of a heavyweight checkout.
      
      Add branch implementation tests for uncommit and commit.
      
      (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
    parent: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
    parent: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-hooks
    timestamp: Tue 2007-02-06 04:52:21 +1100
    message:
      Update from HEAD.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
    parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
    parent: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-hooks
    timestamp: Wed 2007-01-31 10:13:33 +1100
    message:
      Merge splitting of branch.pull.