Rev 2534: Better merge base selection and graph API in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jun 18 22:07:28 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2534
revision-id: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
parent: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 22:07:10 +0100
message:
Better merge base selection and graph API
added:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
renamed:
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
------------------------------------------------------------
revno: 2490.2.27
merged: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
parent: abentley at panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:10:35 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2490.2.26
merged: abentley at panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
parent: abentley at panoramicfeedback.com-20070618200218-pviwju0zlq1xgfq3
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:04:16 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.25
merged: abentley at panoramicfeedback.com-20070618200218-pviwju0zlq1xgfq3
parent: aaron.bentley at utoronto.ca-20070613062425-hm2h2cj4u7bvz1zb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:02:18 -0400
message:
Update from review
------------------------------------------------------------
revno: 2490.2.24
merged: aaron.bentley at utoronto.ca-20070613062425-hm2h2cj4u7bvz1zb
parent: aaron.bentley at utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-13 02:24:25 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.23
merged: aaron.bentley at utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
parent: abentley at panoramicfeedback.com-20070609011331-nn6z6fkpmobp7we1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-06-09 01:19:15 -0400
message:
Adapt find_borders to produce a graph difference
------------------------------------------------------------
revno: 2490.2.22
merged: abentley at panoramicfeedback.com-20070609011331-nn6z6fkpmobp7we1
parent: abentley at panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 21:13:31 -0400
message:
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
------------------------------------------------------------
revno: 2490.2.21
merged: abentley at panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
parent: abentley at panoramicfeedback.com-20070608191331-ip308bfe0axs3oh2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 17:48:42 -0400
message:
Rename graph to deprecated_graph
------------------------------------------------------------
revno: 2490.2.20
merged: abentley at panoramicfeedback.com-20070608191331-ip308bfe0axs3oh2
parent: abentley at panoramicfeedback.com-20070608190814-a0dmj97o5osew1q8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 15:13:31 -0400
message:
Fix get_graph_walker for remote repositories
------------------------------------------------------------
revno: 2490.2.19
merged: abentley at panoramicfeedback.com-20070608190814-a0dmj97o5osew1q8
parent: abentley at panoramicfeedback.com-20070608170825-bg4vk6bg3t67oe6k
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 15:08:14 -0400
message:
Implement common-ancestor-based culling
------------------------------------------------------------
revno: 2490.2.18
merged: abentley at panoramicfeedback.com-20070608170825-bg4vk6bg3t67oe6k
parent: abentley at panoramicfeedback.com-20070608170537-4xj0m5c9ebcz8jgn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 13:08:25 -0400
message:
Change AncestryWalker to take a set of ancestors
------------------------------------------------------------
revno: 2490.2.17
merged: abentley at panoramicfeedback.com-20070608170537-4xj0m5c9ebcz8jgn
parent: abentley at panoramicfeedback.com-20070608163729-bixvzevlbg4p9rfv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 13:05:37 -0400
message:
Add start_searching, tweak stop_searching_any
------------------------------------------------------------
revno: 2490.2.16
merged: abentley at panoramicfeedback.com-20070608163729-bixvzevlbg4p9rfv
parent: abentley at panoramicfeedback.com-20070608154228-l1p3jz64h9901lap
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 12:37:29 -0400
message:
Tweak search
------------------------------------------------------------
revno: 2490.2.15
merged: abentley at panoramicfeedback.com-20070608154228-l1p3jz64h9901lap
parent: abentley at panoramicfeedback.com-20070608151814-0a716w37jzx3qv99
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:42:28 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.14
merged: abentley at panoramicfeedback.com-20070608151814-0a716w37jzx3qv99
parent: abentley at panoramicfeedback.com-20070608150332-jxt1yx9hy7dmhxhv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:18:14 -0400
message:
Avoid StackedParentsProvider when underlying repos match
------------------------------------------------------------
revno: 2490.2.13
merged: abentley at panoramicfeedback.com-20070608150332-jxt1yx9hy7dmhxhv
parent: abentley at panoramicfeedback.com-20070530151812-brau3xwf2568qqsb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:03:32 -0400
message:
Update distinct -> lowest, refactor, add ParentsProvider concept
------------------------------------------------------------
revno: 2490.2.12
merged: abentley at panoramicfeedback.com-20070530151812-brau3xwf2568qqsb
parent: aaron.bentley at utoronto.ca-20070530014615-bgq3ci6pxoj9luj6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Wed 2007-05-30 11:18:12 -0400
message:
Improve documentation
------------------------------------------------------------
revno: 2490.2.11
merged: aaron.bentley at utoronto.ca-20070530014615-bgq3ci6pxoj9luj6
parent: aaron.bentley at utoronto.ca-20070530011703-tgvzbyonqsol27e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Tue 2007-05-29 21:46:15 -0400
message:
Rename minimal common ancestor to distinct common ancestor
------------------------------------------------------------
revno: 2490.2.10
merged: aaron.bentley at utoronto.ca-20070530011703-tgvzbyonqsol27e5
parent: aaron.bentley at utoronto.ca-20070527161519-noiyd4kly31xxclc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Tue 2007-05-29 21:17:03 -0400
message:
Clarify text, remove unused _get_ancestry method
------------------------------------------------------------
revno: 2490.2.9
merged: aaron.bentley at utoronto.ca-20070527161519-noiyd4kly31xxclc
parent: aaron.bentley at utoronto.ca-20070526172851-k9vmpi5eerfaocg3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sun 2007-05-27 12:15:19 -0400
message:
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
------------------------------------------------------------
revno: 2490.2.8
merged: aaron.bentley at utoronto.ca-20070526172851-k9vmpi5eerfaocg3
parent: aaron.bentley at utoronto.ca-20070526172421-16cyxl6ttbmsdfco
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 13:28:51 -0400
message:
fix iteration stuff
------------------------------------------------------------
revno: 2490.2.7
merged: aaron.bentley at utoronto.ca-20070526172421-16cyxl6ttbmsdfco
parent: aaron.bentley at utoronto.ca-20070526061115-tml5fdh1rij2o0g9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 13:24:21 -0400
message:
Start implementing mca that scales with number of uncommon ancestors
------------------------------------------------------------
revno: 2490.2.6
merged: aaron.bentley at utoronto.ca-20070526061115-tml5fdh1rij2o0g9
parent: aaron.bentley at utoronto.ca-20070526042739-0o2yva7r05fslgqm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 02:11:15 -0400
message:
Use new common-ancestor code everywhere
------------------------------------------------------------
revno: 2490.2.5
merged: aaron.bentley at utoronto.ca-20070526042739-0o2yva7r05fslgqm
parent: aaron.bentley at utoronto.ca-20070526003301-dd583nsr8qr5limk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 00:27:39 -0400
message:
Use GraphWalker.unique_ancestor to determine merge base
------------------------------------------------------------
revno: 2490.2.4
merged: aaron.bentley at utoronto.ca-20070526003301-dd583nsr8qr5limk
parent: aaron.bentley at utoronto.ca-20070526002009-8wekbvf32o7rufn2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 20:33:01 -0400
message:
More tests for unique common ancestor
------------------------------------------------------------
revno: 2490.2.3
merged: aaron.bentley at utoronto.ca-20070526002009-8wekbvf32o7rufn2
parent: aaron.bentley at utoronto.ca-20070525044429-xleriyljmuaw4kxz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 20:20:09 -0400
message:
Implement new merge base picker
------------------------------------------------------------
revno: 2490.2.2
merged: aaron.bentley at utoronto.ca-20070525044429-xleriyljmuaw4kxz
parent: aaron.bentley at utoronto.ca-20070525031726-tey81wph8x3hg4po
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 00:44:29 -0400
message:
add minimal-common-ancestor calculation
------------------------------------------------------------
revno: 2490.2.1
merged: aaron.bentley at utoronto.ca-20070525031726-tey81wph8x3hg4po
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-05-24 23:17:26 -0400
message:
Start work on GraphWalker
Diff too large for email (1014 lines, the limit is 1000).
More information about the bazaar-commits
mailing list