Rev 2582: Merge more runbzr cleanups in http://sourcefrog.net/bzr/cleanup-runbzr

Martin Pool mbp at sourcefrog.net
Wed Jul 4 09:46:24 BST 2007


At http://sourcefrog.net/bzr/cleanup-runbzr

------------------------------------------------------------
revno: 2582
revision-id: mbp at sourcefrog.net-20070704084622-6b8enfv9o71s7ung
parent: pqm at pqm.ubuntu.com-20070704080808-0ptk5p5yiwxjgnt7
parent: v.ladeuil+lp at free.fr-20070628122611-0suhzl7o6aep1ibz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Wed 2007-07-04 18:46:22 +1000
message:
  Merge more runbzr cleanups
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
  bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
  bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
  bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
  bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
  bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
  bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
  bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
  bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
  bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
  bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
  bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
  bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
  bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
  bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
  bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
  bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
  bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
  bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
  bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
  bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
    ------------------------------------------------------------
    revno: 2552.2.5
    merged: v.ladeuil+lp at free.fr-20070628122611-0suhzl7o6aep1ibz
    parent: v.ladeuil+lp at free.fr-20070627191350-8ktbl3ac9gdi6hpr
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: run_bzr
    timestamp: Thu 2007-06-28 14:26:11 +0200
    message:
      Revert the intrusive run_bzr('commit') rewritings.
      
      * bzrlib/tests/test_smart_add.py:
      (TestSmartAdd.test_add_dry_run,
      TestSmartAdd.test_returns_and_ignores):  Delete useless import.
    ------------------------------------------------------------
    revno: 2552.2.4
    merged: v.ladeuil+lp at free.fr-20070627191350-8ktbl3ac9gdi6hpr
    parent: v.ladeuil+lp at free.fr-20070626203249-sqm4afiai5dxofum
    parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: run_bzr
    timestamp: Wed 2007-06-27 21:13:50 +0200
    message:
      Merge bzr.dev and resolve conflits. (good use case for an enhanced merge
      algorithm, many conflits should at least be presented in a better way).
    ------------------------------------------------------------
    revno: 2552.2.3
    merged: v.ladeuil+lp at free.fr-20070626203249-sqm4afiai5dxofum
    parent: v.ladeuil+lp at free.fr-20070626134944-snlh5i0zsa30mysx
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: run_bzr
    timestamp: Tue 2007-06-26 22:32:49 +0200
    message:
      Deprecate the varargs syntax and fix the tests.
      
      * bzrlib/tests/__init__.py:
      (TestCase.run_bzr): Activate the deprecation warning.
      (TestCase.run_bzr_error): Add error_regexes to kwargs or run_bzr
      get confused.
      
      * bzrlib/tests/blackbox/test_selftest.py:
      (TestRunBzr.test_args): Activate.
      
      * bzrlib/tests/blackbox/test_inventory.py:
      (TestInventory.assertInventoryEqual): Build the command from args
      if not None.
      
      * bzrlib/tests/blackbox/test_ls.py:
      (TestLS.ls_equals): Build the command from args if not None.
      
      * bzrlib/tests/blackbox/test_remove_tree.py:
      (TestRemoveTree.test_remove_tree_lightweight_checkout_explicit):
      Nice catch, we were calling run_bzr instead of run_bzr_error. This
      went unnoticed for some time...
    ------------------------------------------------------------
    revno: 2552.2.2
    merged: v.ladeuil+lp at free.fr-20070626134944-snlh5i0zsa30mysx
    parent: v.ladeuil+lp at free.fr-20070626130511-8nq29o58q8zm08a0
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: run_bzr
    timestamp: Tue 2007-06-26 15:49:44 +0200
    message:
      Enforce run_bzr(string) where possible.
    ------------------------------------------------------------
    revno: 2552.2.1
    merged: v.ladeuil+lp at free.fr-20070626130511-8nq29o58q8zm08a0
    parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: run_bzr
    timestamp: Tue 2007-06-26 15:05:11 +0200
    message:
      apply martin patch

Diff too large for email (5350 lines, the limit is 1000).



More information about the bazaar-commits mailing list