Rev 1481: [merge] improved 'missing' command from aaron in
/home/mbp/work/bzr.dev
Martin Pool
mbp at sourcefrog.net
Mon Dec 12 07:06:38 GMT 2005
------------------------------------------------------------
revno: 1481
revision-id: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
parent: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:06:34 +1100
message:
[merge] improved 'missing' command from aaron
added:
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2005-12-11 19:24:14 -0500
message:
Merged the new bzr missing command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
parent: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 19:20:32 -0500
message:
Added unit tests for find_unmerged
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
parent: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 18:26:56 -0500
message:
Test every option for "bzr missing"
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
parent: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:40:07 -0500
message:
Fixed up tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
parent: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:36:21 -0500
message:
Added tests from LarstiQ
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.lq
timestamp: Sun 2005-12-11 23:05:21 +0100
message:
Add testcase for missing command, improved with feedback from Robert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:29:51 -0500
message:
All tests pass
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
parent: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:40 -0500
message:
Noted difference of opinion wrt BzrCommandError
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
parent: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:05 -0500
message:
Set status to 1 when there are missing revisions on either side.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
parent: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 16:52:48 -0500
message:
fixed location handling to match old missing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
parent: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 15:28:41 -0500
message:
Removed merge fix with no test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
parent: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:59:14 -0500
message:
Added missing revision counts.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:51:26 -0500
message:
merged the mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 16:11:34 -0500
message:
Added log formatter selection and show-ids to missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
parent: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:23:44 -0500
message:
Added no-difference message
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
parent: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:00:00 -0500
message:
Refactored shortcut
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
parent: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:54:19 -0500
message:
Added revision-history shortcuts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
parent: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:20:44 -0500
message:
Ensured progress bar is cleaned up except for lock errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
parent: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:17:19 -0500
message:
More refactoring, handled branches with no commits
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
parent: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:47:47 -0500
message:
Used more set operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
parent: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:35:00 -0500
message:
Inverted the meaning of reverse
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
parent: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:34:21 -0500
message:
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
parent: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:17:21 -0500
message:
Factored out find_unmerged
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
parent: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:59 -0500
message:
Replace missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:21 -0500
message:
Import Kinnison's plugin
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-11-29 00:02:22 -0500
message:
Fixed revert bug [NEEDS TEST CASE]
More information about the bazaar-commits
mailing list