Rev 1979: (jam) improve revision spec errors in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Aug 31 19:27:05 BST 2006


------------------------------------------------------------
revno: 1979
revision-id: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
parent: pqm at pqm.ubuntu.com-20060831173444-37bf2e287f47beab
parent: john at arbash-meinel.com-20060831181809-0097f4d21cb944fd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-08-31 19:27:04 +0100
message:
  (jam) improve revision spec errors
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
  bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060831181809-0097f4d21cb944fd
    parent: john at arbash-meinel.com-20060828162810-74ae198f053d2a4b
    parent: pqm at pqm.ubuntu.com-20060831173444-37bf2e287f47beab
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Thu 2006-08-31 13:18:09 -0500
    message:
      [merge] bzr.dev 1978
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060828162810-74ae198f053d2a4b
    parent: john at arbash-meinel.com-20060828162318-5c5e987b4b4252ee
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-28 11:28:10 -0500
    message:
      Move the _revno_regex to a more logical location
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060828162318-5c5e987b4b4252ee
    parent: john at arbash-meinel.com-20060828161947-5986ffb6cf082f59
    parent: pqm at pqm.ubuntu.com-20060828152314-9bd2bb284d84fab2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-28 11:23:18 -0500
    message:
      [merge] bzr.dev 1963
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060828161947-5986ffb6cf082f59
    parent: john at arbash-meinel.com-20060824002818-01e99e564cd68550
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-28 11:19:47 -0500
    message:
      Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824002818-01e99e564cd68550
    parent: john at arbash-meinel.com-20060824002144-9f1b5f5e791b4c7f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 19:28:18 -0500
    message:
      Clean up __repr__, as well as add tests that we can handle -r12:branch/
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824002144-9f1b5f5e791b4c7f
    parent: john at arbash-meinel.com-20060824000833-f32d5cbef4fa4f78
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 19:21:44 -0500
    message:
      fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824000833-f32d5cbef4fa4f78
    parent: john at arbash-meinel.com-20060824000715-142aafd575a94f1a
    parent: pqm at pqm.ubuntu.com-20060824000004-01ec89ae326683b0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 19:08:33 -0500
    message:
      [merge] bzr.dev 1954
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824000715-142aafd575a94f1a
    parent: john at arbash-meinel.com-20060823235519-4067e5c4191832ea
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 19:07:15 -0500
    message:
      Remove a few more direct references to RevisionSpec
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823235519-4067e5c4191832ea
    parent: john at arbash-meinel.com-20060823234954-5153c0f043a564b8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 18:55:19 -0500
    message:
      Remove some places that were directly instantiating a RevisionSpec object. Also get rid of support for --revision 1:2, it has been deprecated for a long time
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823234954-5153c0f043a564b8
    parent: john at arbash-meinel.com-20060823230101-94b533ae885a196a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 18:49:54 -0500
    message:
      Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823230101-94b533ae885a196a
    parent: john at arbash-meinel.com-20060823225834-d688aa3c26b927e2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 18:01:01 -0500
    message:
      Get rid of direct imports of exceptions
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823225834-d688aa3c26b927e2
    parent: john at arbash-meinel.com-20060823224751-ac8bd5651a2435a4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 17:58:34 -0500
    message:
      Check that invalid specs are properly handled
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823224751-ac8bd5651a2435a4
    parent: john at arbash-meinel.com-20060823201433-c08a339a7ed5e61b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 17:47:51 -0500
    message:
      Change inheritence of InvalidRevisionSpec
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823201433-c08a339a7ed5e61b
    parent: john at arbash-meinel.com-20060823200940-cc4d69c61466ef4f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 15:14:33 -0500
    message:
      Change the handling of negative numbers, to be trapped at revno 1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823200940-cc4d69c61466ef4f
    parent: john at arbash-meinel.com-20060823194809-4311444c2c3f6bd9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 15:09:40 -0500
    message:
      Refactor common code from integer revno handlers
      test and fix a bug with revno:-1:branch, which would use the original
      branch to determine the real revno, rather than the new one
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823194809-4311444c2c3f6bd9
    parent: john at arbash-meinel.com-20060823194300-ae560bc9518dd091
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 14:48:09 -0500
    message:
      Update NEWS about fixing bug #55420
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823194300-ae560bc9518dd091
    parent: john at arbash-meinel.com-20060823193908-9c9605d7785655e0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 14:43:00 -0500
    message:
      Make NoCommits a BzrNewError
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823193908-9c9605d7785655e0
    parent: john at arbash-meinel.com-20060823193519-fdbbfb03a8399a67
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 14:39:08 -0500
    message:
      All old tests are covered elsewhere
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823193519-fdbbfb03a8399a67
    parent: john at arbash-meinel.com-20060823191701-81d7f958882ce61d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 14:35:19 -0500
    message:
      Update branch: spec and tests
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823191701-81d7f958882ce61d
    parent: john at arbash-meinel.com-20060823190754-428ec4668c32ad62
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 14:17:01 -0500
    message:
      Update tests for ancestor: spec
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823190754-428ec4668c32ad62
    parent: john at arbash-meinel.com-20060821235513-d73d7754ad4629d1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Wed 2006-08-23 14:07:54 -0500
    message:
      Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821235513-d73d7754ad4629d1
    parent: john at arbash-meinel.com-20060821235226-3c3bd94105e402ff
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:55:13 -0500
    message:
      Change the InvalidRevisionSpec formatting to be more readable
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821235226-3c3bd94105e402ff
    parent: john at arbash-meinel.com-20060821235008-6730d6958c745fe9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:52:26 -0500
    message:
      Test the code path for a no-parent alternate history
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821235008-6730d6958c745fe9
    parent: john at arbash-meinel.com-20060821234043-f47d2b2ea7d45b73
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:50:08 -0500
    message:
      Going before:0 is an error, and if you are on another history, use the leftmost parent
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821234043-f47d2b2ea7d45b73
    parent: john at arbash-meinel.com-20060821231613-3b941103e547ad8c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:40:43 -0500
    message:
      Some tests for the date: spec
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821231613-3b941103e547ad8c
    parent: john at arbash-meinel.com-20060821231326-ff4c180fb1ca4bca
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:16:13 -0500
    message:
      Update and test the tag: spec
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821231326-ff4c180fb1ca4bca
    parent: john at arbash-meinel.com-20060821230303-deea7a8c292cd33f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:13:26 -0500
    message:
      test the before: spec, currently asserting what seems to be buggy behavior
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821230303-deea7a8c292cd33f
    parent: john at arbash-meinel.com-20060821224232-672360273373b07a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 18:03:03 -0500
    message:
      Cleanup and test last:
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821224232-672360273373b07a
    parent: john at arbash-meinel.com-20060821223449-7fa2156e1976a836
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 17:42:32 -0500
    message:
      Testing the revid: spec
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821223449-7fa2156e1976a836
    parent: john at arbash-meinel.com-20060821222548-ba891368103b7bf5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 17:34:49 -0500
    message:
      More revno: tests, now testing the branch/url parameter
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821222548-ba891368103b7bf5
    parent: john at arbash-meinel.com-20060821222225-8314bca0d302203f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 17:25:48 -0500
    message:
      A small bugfix, and more tests for revno:
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821222225-8314bca0d302203f
    parent: john at arbash-meinel.com-20060821221158-62141f86a07757a5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 17:22:25 -0500
    message:
      Fix tests for negative entries, and add tests for revno:
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821221158-62141f86a07757a5
    parent: john at arbash-meinel.com-20060821220847-95ca3099d7b7729c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 17:11:58 -0500
    message:
      Update the test tree to include a non-mainline revision
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821220847-95ca3099d7b7729c
    parent: john at arbash-meinel.com-20060821215326-e9548eaf148d2377
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 17:08:47 -0500
    message:
      Create direct tests for RevisionSpec_int
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821215326-e9548eaf148d2377
    parent: john at arbash-meinel.com-20060821214516-03cdcfb040501b72
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 16:53:26 -0500
    message:
      Update _match_on_and_check to raise the right error
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060821214516-03cdcfb040501b72
    parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: revspec-errors-55420
    timestamp: Mon 2006-08-21 16:45:16 -0500
    message:
      Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers



More information about the bazaar-commits mailing list