Rev 3856: (vila) Fix bug #300055 by handling revision ranges starting with a in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Nov 26 09:40:18 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3856
revision-id: pqm at pqm.ubuntu.com-20081126094014-rr61dd2gkl53qthl
parent: pqm at pqm.ubuntu.com-20081126060051-cwcyil3w3ek8llsh
parent: v.ladeuil+lp at free.fr-20081126090522-2xq9407nstw4ty6e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-11-26 09:40:14 +0000
message:
(vila) Fix bug #300055 by handling revision ranges starting with a
dotted revno for bzr log while --forward is used for a specific file
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3855.1.1
revision-id: v.ladeuil+lp at free.fr-20081126090522-2xq9407nstw4ty6e
parent: pqm at pqm.ubuntu.com-20081126060051-cwcyil3w3ek8llsh
parent: v.ladeuil+lp at free.fr-20081126082322-e52storkneyr2cfb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Wed 2008-11-26 10:05:22 +0100
message:
(vila) Fix bug #300055 by handling revision ranges starting with a dotted revno for bzr log while --forward is used for a specific file
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3842.2.7
revision-id: v.ladeuil+lp at free.fr-20081126082322-e52storkneyr2cfb
parent: v.ladeuil+lp at free.fr-20081125082520-lz0wmaa3xsjvpdz0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Wed 2008-11-26 09:23:22 +0100
message:
Fixed as per Jonh's review.
* NEWS:
Add entry.
* bzrlib/tests/test_log.py:
Edit some more incorrect asserts and various stylistic issues.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3842.2.6
revision-id: v.ladeuil+lp at free.fr-20081125082520-lz0wmaa3xsjvpdz0
parent: v.ladeuil+lp at free.fr-20081121164353-8d07go33ycibzbwl
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Tue 2008-11-25 09:25:20 +0100
message:
Fix typo.
* bzrlib/log.py:
(reverse_by_depth): Fix typo in comment.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3842.2.5
revision-id: v.ladeuil+lp at free.fr-20081121164353-8d07go33ycibzbwl
parent: v.ladeuil+lp at free.fr-20081121114918-lekth2kvpncyiaqz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Fri 2008-11-21 17:43:53 +0100
message:
Better fix for bug #300055.
* bzrlib/tests/test_log.py:
(TestGetViewRevisions.make_tree_with_many_merges): Hijack the
helper to test for revisions touching file on a more significant
tree.
(TestGetViewRevisions.test_file_id_for_range): Better test to
highlight bug #300055: starting revision is a dotted revno and the
log should start right there, not at the mainline revision where
merging occured. But that uncovers yet another bug...
(TestGetRevisionsTouchingFileID.assertAllRevisionsForFileID):
_filter_revisions_touching_file_id doesn't have a 'direction'
parameter anymore.
* bzrlib/tests/blackbox/test_log.py:
(TestCaseWithoutPropsHandler): Fix line too long.
(TestLog.test_log_with_tags,
TestLogMerges.test_merges_partial_range): Fix whitespaces.
* bzrlib/log.py:
(calculate_view_revisions): Delete gratuitous split line. Push
direction handling closer to the needed point. Delete 'direction'
parameter when calling _filter_revisions_touching_file_id.
(_filter_revisions_touching_file_id): Delete 'direction'
parameter. This was used for calling reverse_by_depth which can't
handle an already reversed list.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3842.2.4
revision-id: v.ladeuil+lp at free.fr-20081121114918-lekth2kvpncyiaqz
parent: v.ladeuil+lp at free.fr-20081121113943-j8kn351jm04k9qfq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Fri 2008-11-21 12:49:18 +0100
message:
Superficial fix for bug #300055.
* bzrlib/log.py:
(calculate_view_revisions): Reformat condition.
(_get_mainline_revs, _filter_revision_range): Fix whitespaces.
(reverse_by_depth): Add comments and a superficial fix for bug
#300055. The bug is deeper though, reverse_by_depth can be used on
revision list in reverse chronological order *only* since they add
dotted revnos *after* their children mainline revision.
(LineLogFormatter.date_string): Fix whitespace.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3842.2.3
revision-id: v.ladeuil+lp at free.fr-20081121113943-j8kn351jm04k9qfq
parent: v.ladeuil+lp at free.fr-20081120105333-fgitmj50y2ceuchr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Fri 2008-11-21 12:39:43 +0100
message:
Yet more cleanup and fix test_file_id_f3 bogus test.
* bzrlib/tests/test_log.py:
(TestCaseWithoutPropsHandler.setUp,
TestCaseWithoutPropsHandler._cleanup): Delete gratuitous split
lines.
(TestShowLog.checkDelta): Give more explnations.
(TestShowLog.test_cur_revno): Simplified.
(TestShowLog.test_empty_branch, TestShowLog.test_empty_commit,
TestShowLog.test_simple_commit,
TestShowLog.test_commit_message_with_control_chars,
TestShowLog.test_commit_message_without_control_chars): Split
test_simple_log.
(TestShowLog.test_merges_nonsupporting_formatter,
TestShortLogFormatter.test_short_log_with_merges,
TestShortLogFormatter.test_short_log_single_merge_revision,
TestLineLogFormatter.test_line_log_single_merge_revision): Replace
try/finally clauses by addCleanup.
(TestGetRevisionsTouchingFileID.check_delta): Duplicate helper to
simplify tests.
(TestGetRevisionsTouchingFileID.test_tree_with_single_merge):
Simplified.
(TestGetRevisionsTouchingFileID.test_file_id_f3): Wow, align test
with comment, the real test was duplicated from test_file_id_f2
but only the comment was updated.
(TestReverseByDepth.test_shifted_merged_revisions): New test.
modified:
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3842.2.2
revision-id: v.ladeuil+lp at free.fr-20081120105333-fgitmj50y2ceuchr
parent: v.ladeuil+lp at free.fr-20081120095527-imjiaptw3w5m2vbv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Thu 2008-11-20 11:53:33 +0100
message:
Reproduce bug #300055.
* bzrlib/tests/test_log.py:
(TestGetViewRevisions.test_get_view_revisions_forward,
TestGetViewRevisions.test_get_view_revisions_reverse,
TestGetViewRevisions.test_get_view_revisions_merge,
TestGetViewRevisions.test_get_view_revisions_merge_reverse,
TestGetViewRevisions.test_get_view_revisions_merge2): More
cosmetic changes.
(TestReverseByDepth): New tests to reprpduce bug #300055.
modified:
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3842.2.1
revision-id: v.ladeuil+lp at free.fr-20081120095527-imjiaptw3w5m2vbv
parent: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 300055-log-forward
timestamp: Thu 2008-11-20 10:55:27 +0100
message:
Cosmetic changes.
* bzrlib/tests/test_log.py:
Rewrite import clauses, fix spaces.
modified:
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
Diff too large for email (1392 lines, the limit is 1000).
More information about the bazaar-commits
mailing list