Rev 3947: Merge bzr.dev into emacs-ui-fixes in file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/pb-http/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Jan 26 08:13:00 GMT 2009
At file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/pb-http/
------------------------------------------------------------
revno: 3947
revision-id: v.ladeuil+lp at free.fr-20090126081250-m310ky1gjotwcw37
parent: v.ladeuil+lp at free.fr-20090119130947-1ldks301mpsymf8r
parent: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: emacs-ui-fixes
timestamp: Mon 2009-01-26 09:12:50 +0100
message:
Merge bzr.dev into emacs-ui-fixes
added:
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3945.1.13
revision-id: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
parent: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
parent: john at arbash-meinel.com-20090123212239-kbt36lwczrha6q67
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-01-24 18:50:51 +0000
message:
(jam) Add Transport._report_activity support to HTTP transports.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3945.15.2
revision-id: john at arbash-meinel.com-20090123212239-kbt36lwczrha6q67
parent: john at arbash-meinel.com-20090123212055-qsa1szqtrrxtwgdl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-network-io
timestamp: Fri 2009-01-23 15:22:39 -0600
message:
Start using report_activity for HTTP (pycurl + urllib)
modified:
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3945.15.1
revision-id: john at arbash-meinel.com-20090123212055-qsa1szqtrrxtwgdl
parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-network-io
timestamp: Fri 2009-01-23 15:20:55 -0600
message:
Add report_activity to osutils.pumpfile
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3945.1.12
revision-id: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
parent: ian.clatworthy at canonical.com-20090124040308-m6u33ditaksvwrrq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-01-24 04:49:40 +0000
message:
Branch.iter_merge_sorted_revisions API (Ian Clatworthy)
added:
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.14.1
revision-id: ian.clatworthy at canonical.com-20090124040308-m6u33ditaksvwrrq
parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
parent: ian.clatworthy at canonical.com-20090124035735-r7joe4qxqj0wsp9r
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Sat 2009-01-24 14:03:08 +1000
message:
Branch.iter_merge_sorted_revisions API (Ian Clatworthy)
added:
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.13.8
revision-id: ian.clatworthy at canonical.com-20090124035735-r7joe4qxqj0wsp9r
parent: ian.clatworthy at canonical.com-20090124014858-t8snms0c708b22cj
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Sat 2009-01-24 13:57:35 +1000
message:
feedback from poolie
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3945.13.7
revision-id: ian.clatworthy at canonical.com-20090124014858-t8snms0c708b22cj
parent: ian.clatworthy at canonical.com-20090124001510-1zy4ycf7et22tq5d
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Sat 2009-01-24 11:48:58 +1000
message:
drop seqnum from in-memory cache
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3945.13.6
revision-id: ian.clatworthy at canonical.com-20090124001510-1zy4ycf7et22tq5d
parent: ian.clatworthy at canonical.com-20090123212235-e9rkelh590rcdmbb
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Sat 2009-01-24 10:15:10 +1000
message:
feedback from beuno
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3945.13.5
revision-id: ian.clatworthy at canonical.com-20090123212235-e9rkelh590rcdmbb
parent: ian.clatworthy at canonical.com-20090123211924-am3uaq95d1ebsfcq
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Sat 2009-01-24 07:22:35 +1000
message:
NEWS tweak
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3945.13.4
revision-id: ian.clatworthy at canonical.com-20090123211924-am3uaq95d1ebsfcq
parent: ian.clatworthy at canonical.com-20090122123241-bv173v5plq0f3s4k
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Sat 2009-01-24 07:19:24 +1000
message:
jam feedback: start & stop limits; simple caching
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
------------------------------------------------------------
revno: 3945.13.3
revision-id: ian.clatworthy at canonical.com-20090122123241-bv173v5plq0f3s4k
parent: ian.clatworthy at canonical.com-20090121030800-q0epxz7r2wq9wklb
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Thu 2009-01-22 22:32:41 +1000
message:
simplify the meaning of forward to be appropriate to this layer
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
------------------------------------------------------------
revno: 3945.13.2
revision-id: ian.clatworthy at canonical.com-20090121030800-q0epxz7r2wq9wklb
parent: ian.clatworthy at canonical.com-20090121005320-o96d2epcbtd6z331
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Wed 2009-01-21 13:08:00 +1000
message:
feedback from jam
renamed:
bzrlib/tests/branch_implementations/test_merge_sorted_revisions.py => bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
------------------------------------------------------------
revno: 3945.13.1
revision-id: ian.clatworthy at canonical.com-20090121005320-o96d2epcbtd6z331
parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.merge_sorted_revisions
timestamp: Wed 2009-01-21 10:53:20 +1000
message:
introduce Branch.merge_sorted_revisions API
added:
bzrlib/tests/branch_implementations/test_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.1.11
revision-id: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
parent: mbp at sourcefrog.net-20090123172552-uu2eh59t0azzvcq9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-01-23 18:14:16 +0000
message:
(mbp) further progress bar fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3945.12.8
revision-id: mbp at sourcefrog.net-20090123172552-uu2eh59t0azzvcq9
parent: mbp at sourcefrog.net-20090122214649-awlvm833pao0t1wp
parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2009-01-23 15:25:52 -0200
message:
merge trunk
added:
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3945.12.7
revision-id: mbp at sourcefrog.net-20090122214649-awlvm833pao0t1wp
parent: mbp at sourcefrog.net-20090121060117-4c3xrje8jahq70uu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Thu 2009-01-22 19:46:49 -0200
message:
pep8
modified:
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3945.12.6
revision-id: mbp at sourcefrog.net-20090121060117-4c3xrje8jahq70uu
parent: mbp at sourcefrog.net-20090121054918-174smoskf8srdm41
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2009-01-21 04:01:17 -0200
message:
ProgressBarStack is deprecated
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
------------------------------------------------------------
revno: 3945.12.5
revision-id: mbp at sourcefrog.net-20090121054918-174smoskf8srdm41
parent: mbp at sourcefrog.net-20090121054258-cyngfg4gdv4tmqm1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2009-01-21 03:49:18 -0200
message:
rename to _progress_all_finished
modified:
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3945.12.4
revision-id: mbp at sourcefrog.net-20090121054258-cyngfg4gdv4tmqm1
parent: mbp at sourcefrog.net-20090121053816-b2eua3hvawjhguzk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2009-01-21 03:42:58 -0200
message:
Remove some obsolete progress docstring
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
------------------------------------------------------------
revno: 3945.12.3
revision-id: mbp at sourcefrog.net-20090121053816-b2eua3hvawjhguzk
parent: mbp at sourcefrog.net-20090121053044-mhynfsubozjh9wol
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2009-01-21 03:38:16 -0200
message:
Make the interface from ProgressTask to ui more private
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3945.12.2
revision-id: mbp at sourcefrog.net-20090121053044-mhynfsubozjh9wol
parent: mbp at sourcefrog.net-20090121050132-8j59ox99p84hiz51
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2009-01-21 03:30:44 -0200
message:
Corrections to finishing progress bars
modified:
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3945.12.1
revision-id: mbp at sourcefrog.net-20090121050132-8j59ox99p84hiz51
parent: pqm at pqm.ubuntu.com-20090120044335-pwr2rshr1yu6vzti
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2009-01-21 03:01:32 -0200
message:
Add ProgressTask repr
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
------------------------------------------------------------
revno: 3945.1.10
revision-id: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
parent: pqm at pqm.ubuntu.com-20090123042837-r1lyxrbk6nd5pp3g
parent: v.ladeuil+lp at free.fr-20090123095408-3g4i9elg0ya7je9n
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-01-23 10:31:45 +0000
message:
(jam, vila) Fix an edge case with deleted files and criss-cross merges
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3945.11.2
revision-id: v.ladeuil+lp at free.fr-20090123095408-3g4i9elg0ya7je9n
parent: v.ladeuil+lp at free.fr-20090123074235-dzu6zadxlbhwj7ww
parent: v.ladeuil+lp at free.fr-20090123095303-gvzd86p6p2ytmhxz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Fri 2009-01-23 10:54:08 +0100
message:
Fix overzealous cleanup
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3945.10.4
revision-id: v.ladeuil+lp at free.fr-20090123095303-gvzd86p6p2ytmhxz
parent: v.ladeuil+lp at free.fr-20090122133817-cerv5t33wgw2m5qj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: spurious-conflicts
timestamp: Fri 2009-01-23 10:53:03 +0100
message:
More cleanup and fix overzealous previous one.
* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCA.test_file_not_in_one_lca,
TestMergerEntriesLCA.test_only_in_one_lca,
TestMergerEntriesLCA.test_same_lca_resolution_one_side_updates_content,
TestMergerEntriesLCA.test_this_changed_kind): Delete useless vars.
(TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2):
But not there !.
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3945.11.1
revision-id: v.ladeuil+lp at free.fr-20090123074235-dzu6zadxlbhwj7ww
parent: pqm at pqm.ubuntu.com-20090123042837-r1lyxrbk6nd5pp3g
parent: v.ladeuil+lp at free.fr-20090122133817-cerv5t33wgw2m5qj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Fri 2009-01-23 08:42:35 +0100
message:
Fix an edge case with deleted files and criss-cross merges
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3945.10.3
revision-id: v.ladeuil+lp at free.fr-20090122133817-cerv5t33wgw2m5qj
parent: v.ladeuil+lp at free.fr-20090121103302-tx6xsuogm6kga9jt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: spurious-conflicts
timestamp: Thu 2009-01-22 14:38:17 +0100
message:
Cleanup.
* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCA.test_not_in_other_or_lca,
TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2):
Delete useless vars.
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3945.10.2
revision-id: v.ladeuil+lp at free.fr-20090121103302-tx6xsuogm6kga9jt
parent: john at arbash-meinel.com-20090120181350-wzl4x01ns3rly9y5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: spurious-conflicts
timestamp: Wed 2009-01-21 11:33:02 +0100
message:
* bzrlib/merge.py:
(Merger.find_base): Add some mutter calls to help debug.
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 3945.10.1
revision-id: john at arbash-meinel.com-20090120181350-wzl4x01ns3rly9y5
parent: pqm at pqm.ubuntu.com-20090120044335-pwr2rshr1yu6vzti
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-lca-deleted
timestamp: Tue 2009-01-20 12:13:50 -0600
message:
Fix an edge case with deleted files and criss-cross merges.
We wanted to be careful that if you had a criss-cross merge and both sides
resolved the conflict in a different way, that you got a conflict.
However, the original test was actually testing when one LCA dominated the
other, which is a case where we shouldn't conflict.
Test cases updated appropriately.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3945.1.9
revision-id: pqm at pqm.ubuntu.com-20090123042837-r1lyxrbk6nd5pp3g
parent: pqm at pqm.ubuntu.com-20090122221456-p57kr0fane0s4iv8
parent: ian.clatworthy at canonical.com-20090123022942-yuqntutz88zsze1v
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-01-23 04:28:37 +0000
message:
show tags in log --short/--line (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3945.9.1
revision-id: ian.clatworthy at canonical.com-20090123022942-yuqntutz88zsze1v
parent: pqm at pqm.ubuntu.com-20090122221456-p57kr0fane0s4iv8
parent: ian.clatworthy at canonical.com-20090123020302-8064ye1bqry09c30
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2009-01-23 12:29:42 +1000
message:
show tags in log --short/--line
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3945.8.4
revision-id: ian.clatworthy at canonical.com-20090123020302-8064ye1bqry09c30
parent: ian.clatworthy at canonical.com-20090123015949-rbju3vhsb33xsqba
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-tags-in-short-line
timestamp: Fri 2009-01-23 12:03:02 +1000
message:
minor cleanup
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3945.8.3
revision-id: ian.clatworthy at canonical.com-20090123015949-rbju3vhsb33xsqba
parent: ian.clatworthy at canonical.com-20090119190908-nvwsm36u03sc5tah
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-tags-in-short-line
timestamp: Fri 2009-01-23 11:59:49 +1000
message:
feedback from jelmer re position of tags in --line
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3945.8.2
revision-id: ian.clatworthy at canonical.com-20090119190908-nvwsm36u03sc5tah
parent: ian.clatworthy at canonical.com-20090119182212-pl143nxuskb2moun
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-tags-in-short-line
timestamp: Tue 2009-01-20 05:09:08 +1000
message:
add tests & NEWS item
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3945.8.1
revision-id: ian.clatworthy at canonical.com-20090119182212-pl143nxuskb2moun
parent: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-tags-in-short-line
timestamp: Tue 2009-01-20 04:22:12 +1000
message:
extend ShortLogFormatter & LineLogFormatter to support tags
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3945.1.8
revision-id: pqm at pqm.ubuntu.com-20090122221456-p57kr0fane0s4iv8
parent: pqm at pqm.ubuntu.com-20090122151628-iw1va4nlci8v2afw
parent: jelmer at samba.org-20090122213215-60hjko1v79a8o2pw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-22 22:14:56 +0000
message:
(Jelmer) Don't require the present compression base in knits to be
the same when adding records in knits.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3945.7.2
revision-id: jelmer at samba.org-20090122213215-60hjko1v79a8o2pw
parent: jelmer at samba.org-20090119202717-c20zb5d1jlxrk3g0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: add-rec
timestamp: Thu 2009-01-22 22:32:15 +0100
message:
Remove matching test, fix handling of parentless indexes.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3945.7.1
revision-id: jelmer at samba.org-20090119202717-c20zb5d1jlxrk3g0
parent: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2009-01-19 21:27:17 +0100
message:
Don't require the present compression base in knits to be the same when adding records in knits.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3945.1.7
revision-id: pqm at pqm.ubuntu.com-20090122151628-iw1va4nlci8v2afw
parent: pqm at pqm.ubuntu.com-20090122115937-y54v6rziznwn10yu
parent: ian.clatworthy at canonical.com-20090122143647-55dpxsjay6c8izj2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-22 15:16:28 +0000
message:
Branch methods for fast revno <=> revision_id mapping (Ian Clatworthy)
added:
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.6.2
revision-id: ian.clatworthy at canonical.com-20090122143647-55dpxsjay6c8izj2
parent: ian.clatworthy at canonical.com-20090122140219-ho1fs4kx9k0tzskz
parent: ian.clatworthy at canonical.com-20090122142434-4i60r8rwujkom5t2
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2009-01-23 00:36:47 +1000
message:
fix accidental needs_read_lock removal
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3945.5.7
revision-id: ian.clatworthy at canonical.com-20090122142434-4i60r8rwujkom5t2
parent: ian.clatworthy at canonical.com-20090122135818-twftjodatp3cm7xm
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Fri 2009-01-23 00:24:34 +1000
message:
fix accidental needs_read_lock removal
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3945.6.1
revision-id: ian.clatworthy at canonical.com-20090122140219-ho1fs4kx9k0tzskz
parent: pqm at pqm.ubuntu.com-20090122115937-y54v6rziznwn10yu
parent: ian.clatworthy at canonical.com-20090122135818-twftjodatp3cm7xm
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2009-01-23 00:02:19 +1000
message:
Branch methods for fast revno <=> revision_id mapping (Ian Clatworthy)
added:
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.5.6
revision-id: ian.clatworthy at canonical.com-20090122135818-twftjodatp3cm7xm
parent: ian.clatworthy at canonical.com-20090122053359-0ozol6xxjiyv2p4q
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Thu 2009-01-22 23:58:18 +1000
message:
review feedback from jam
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
------------------------------------------------------------
revno: 3945.5.5
revision-id: ian.clatworthy at canonical.com-20090122053359-0ozol6xxjiyv2p4q
parent: ian.clatworthy at canonical.com-20090122051710-gqka9rzkxc93p20m
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Thu 2009-01-22 15:33:59 +1000
message:
add missing test module
added:
bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
------------------------------------------------------------
revno: 3945.5.4
revision-id: ian.clatworthy at canonical.com-20090122051710-gqka9rzkxc93p20m
parent: ian.clatworthy at canonical.com-20090122044330-mhe4tkrgbzwuepju
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Thu 2009-01-22 15:17:10 +1000
message:
add top level revno cache
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
------------------------------------------------------------
revno: 3945.5.3
revision-id: ian.clatworthy at canonical.com-20090122044330-mhe4tkrgbzwuepju
parent: ian.clatworthy at canonical.com-20090121015117-xhiiodxp5meqen0w
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Thu 2009-01-22 14:43:30 +1000
message:
add Branch.revision_id_to_dotted_revno()
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.5.2
revision-id: ian.clatworthy at canonical.com-20090121015117-xhiiodxp5meqen0w
parent: ian.clatworthy at canonical.com-20090121014010-a40vzg1x44d2d6oe
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Wed 2009-01-21 11:51:17 +1000
message:
add interface test and NEWS item
added:
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
------------------------------------------------------------
revno: 3945.5.1
revision-id: ian.clatworthy at canonical.com-20090121014010-a40vzg1x44d2d6oe
parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dotted-revno-to-revision-id
timestamp: Wed 2009-01-21 11:40:10 +1000
message:
Branch.dotted_revno_to_revision_id API
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
------------------------------------------------------------
revno: 3945.1.6
revision-id: pqm at pqm.ubuntu.com-20090122115937-y54v6rziznwn10yu
parent: pqm at pqm.ubuntu.com-20090122102151-lgk6zciks1s3ju9s
parent: v.ladeuil+lp at free.fr-20090122112052-vhd1wpr296okxxj1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-22 11:59:37 +0000
message:
(vila) One-line fix for previous commit
modified:
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3945.4.1
revision-id: v.ladeuil+lp at free.fr-20090122112052-vhd1wpr296okxxj1
parent: pqm at pqm.ubuntu.com-20090122102151-lgk6zciks1s3ju9s
parent: v.ladeuil+lp at free.fr-20090122112003-pcp5bu8pfc41u7iz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Thu 2009-01-22 12:20:52 +0100
message:
One-line fix for previous commit
modified:
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3946.1.2
revision-id: v.ladeuil+lp at free.fr-20090122112003-pcp5bu8pfc41u7iz
parent: v.ladeuil+lp at free.fr-20090122094050-8vg3u0pks9uy6wsd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pb-http
timestamp: Thu 2009-01-22 12:20:03 +0100
message:
Restore line eaten by a gremlin.
* bzrlib/ui/__init__.py:
(make_ui_for_terminal): Add lost 'cls' initialization.
modified:
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3945.1.5
revision-id: pqm at pqm.ubuntu.com-20090122102151-lgk6zciks1s3ju9s
parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
parent: v.ladeuil+lp at free.fr-20090122094303-9259yxt3v7fzccy9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-22 10:21:51 +0000
message:
(vila) Restore a working UI implementation suitable for emacs shells.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3945.3.1
revision-id: v.ladeuil+lp at free.fr-20090122094303-9259yxt3v7fzccy9
parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
parent: v.ladeuil+lp at free.fr-20090122094050-8vg3u0pks9uy6wsd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Thu 2009-01-22 10:43:03 +0100
message:
Restore a working UI implementation suitable for emacs shells.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3946.1.1
revision-id: v.ladeuil+lp at free.fr-20090122094050-8vg3u0pks9uy6wsd
parent: v.ladeuil+lp at free.fr-20090119130947-1ldks301mpsymf8r
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pb-http
timestamp: Thu 2009-01-22 10:40:50 +0100
message:
* NEWS:
Fix missing closing paren.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3945.1.4
revision-id: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
parent: pqm at pqm.ubuntu.com-20090120044335-pwr2rshr1yu6vzti
parent: john at arbash-meinel.com-20090120201745-gkvsfuhc9tf7m1bm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-01-20 21:03:00 +0000
message:
(jam) Include the tests for log --short
modified:
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3943.4.5
revision-id: john at arbash-meinel.com-20090120201745-gkvsfuhc9tf7m1bm
parent: john at arbash-meinel.com-20090116223613-sywet9fbx0589a3z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-fix-short-log
timestamp: Tue 2009-01-20 14:17:45 -0600
message:
Restore _linear_view_revisions.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3943.4.4
revision-id: john at arbash-meinel.com-20090116223613-sywet9fbx0589a3z
parent: john at arbash-meinel.com-20090116223224-hspiby4drt1ng7uy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-fix-short-log
timestamp: Fri 2009-01-16 16:36:13 -0600
message:
Remove _linear_view_revisions.
It isn't actually faster than the other code anymore, and it means
we don't have to worry about maintaining multiple code paths.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3943.4.3
revision-id: john at arbash-meinel.com-20090116223224-hspiby4drt1ng7uy
parent: john at arbash-meinel.com-20090116222734-9mgzsmtcvv9qr2mt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-fix-short-log
timestamp: Fri 2009-01-16 16:32:24 -0600
message:
Revert one test change, and the special case of logging all-of-mainline.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3943.4.2
revision-id: john at arbash-meinel.com-20090116222734-9mgzsmtcvv9qr2mt
parent: john at arbash-meinel.com-20090116221614-k8su03l5d22tq6iv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-fix-short-log
timestamp: Fri 2009-01-16 16:27:34 -0600
message:
Add a test case which exercises this code path.
It turns out that you need --short *and* a revision range.
modified:
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3943.4.1
revision-id: john at arbash-meinel.com-20090116221614-k8su03l5d22tq6iv
parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-fix-short-log
timestamp: Fri 2009-01-16 16:16:14 -0600
message:
When testing if we should show merges, use 'not' rather than 'is False'
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3945.1.3
revision-id: pqm at pqm.ubuntu.com-20090120044335-pwr2rshr1yu6vzti
parent: pqm at pqm.ubuntu.com-20090120032136-alahvfk4g7y8iczn
parent: ian.clatworthy at canonical.com-20090120040338-yxg0r2ab45lqtks9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-01-20 04:43:35 +0000
message:
Correct incorrect wording in revisionspec help (Matthew Fuller)
modified:
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3945.2.2
revision-id: ian.clatworthy at canonical.com-20090120040338-yxg0r2ab45lqtks9
parent: ian.clatworthy at canonical.com-20090120021235-n8bd5kzz3s624aq5
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-01-20 14:03:38 +1000
message:
Correct incorrect wording in revisionspec help (Matthew Fuller)
modified:
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3945.1.2
revision-id: pqm at pqm.ubuntu.com-20090120032136-alahvfk4g7y8iczn
parent: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
parent: ian.clatworthy at canonical.com-20090120021235-n8bd5kzz3s624aq5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-01-20 03:21:36 +0000
message:
Multi-glob rules (Marius Kruger)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3945.2.1
revision-id: ian.clatworthy at canonical.com-20090120021235-n8bd5kzz3s624aq5
parent: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
parent: amanic at gmail.com-20090118014815-hmowk5wx102lwquz
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-01-20 12:12:35 +1000
message:
Multi-glob rules (Marius Kruger)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3943.3.4
revision-id: amanic at gmail.com-20090118014815-hmowk5wx102lwquz
parent: amanic at gmail.com-20090118011839-qanqndkfqrkek7e1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.multi-glob-rules
timestamp: Sun 2009-01-18 03:48:15 +0200
message:
add NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3943.3.3
revision-id: amanic at gmail.com-20090118011839-qanqndkfqrkek7e1
parent: amanic at gmail.com-20090118010721-2s62eobbgk51qqn9
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.multi-glob-rules
timestamp: Sun 2009-01-18 03:18:39 +0200
message:
update rules topic
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
------------------------------------------------------------
revno: 3943.3.2
revision-id: amanic at gmail.com-20090118010721-2s62eobbgk51qqn9
parent: amanic at gmail.com-20090118004202-nh1b5bpr91ty2rxq
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.multi-glob-rules
timestamp: Sun 2009-01-18 03:07:21 +0200
message:
actually support quoting the patterns as the docs suggest
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3943.3.1
revision-id: amanic at gmail.com-20090118004202-nh1b5bpr91ty2rxq
parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.multi-glob-rules
timestamp: Sun 2009-01-18 02:42:02 +0200
message:
add test and support for multi-glob rules
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3945.1.1
revision-id: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
parent: pqm at pqm.ubuntu.com-20090119102507-0ue83url4iguuol1
parent: mbp at sourcefrog.net-20090119115911-vvw50isohfzy2u05
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-01-19 13:09:16 +0000
message:
(mbp) Fix strange default parameter to _sftp_readv
modified:
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 3882.9.2
revision-id: mbp at sourcefrog.net-20090119115911-vvw50isohfzy2u05
parent: mbp at sourcefrog.net-20090119094321-o0vnc2ak54nqpnw2
parent: pqm at pqm.ubuntu.com-20090119102507-0ue83url4iguuol1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2009-01-19 22:59:11 +1100
message:
Merge trunk
added:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/https_server.py https_server.py-20071121173708-aj8zczi0ziwbwz21-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/ssl_certs/ ssl_certs-20071124141654-dc9za9nho2gmzbri-1
bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
bzrlib/tests/ssl_certs/ca.crt ca.crt-20071124141703-j5hr254lm287lyut-7
bzrlib/tests/ssl_certs/ca.key ca.key-20071124141703-j5hr254lm287lyut-6
bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
doc/news-template.txt newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patiencediff.py patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
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_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
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_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml7.py xml7.py-20061029182747-d5tiiny21bvrd2jj-1
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3882.9.1
revision-id: mbp at sourcefrog.net-20090119094321-o0vnc2ak54nqpnw2
parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2009-01-19 20:43:21 +1100
message:
Fix strange default parameter to _sftp_readv
modified:
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
-------------- next part --------------
Diff too large for email (1636 lines, the limit is 1000).
More information about the bazaar-commits
mailing list