Rev 3809: (mbp) switch and bind update the branch nick in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Oct 30 03:56:06 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3809
revision-id: pqm at pqm.ubuntu.com-20081030035600-ot66vjf0ctaw4guu
parent: pqm at pqm.ubuntu.com-20081029232846-uni2g702k01jmgvh
parent: amanic at gmail.com-20081004011751-x50szwd6ixieyy3i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-10-30 03:56:00 +0000
message:
(mbp) switch and bind update the branch nick
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
------------------------------------------------------------
revno: 3565.6.13
revision-id: amanic at gmail.com-20081004011751-x50szwd6ixieyy3i
parent: amanic at gmail.com-20081004010742-wzq8x59xoo06ebpt
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Sat 2008-10-04 03:17:51 +0200
message:
Update NEWS, had to go fetch it back from line 633!
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3565.6.12
revision-id: amanic at gmail.com-20081004010742-wzq8x59xoo06ebpt
parent: amanic at gmail.com-20081004002933-aqddmvgbde1mlwuq
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Sat 2008-10-04 03:07:42 +0200
message:
add some more blackbox tests for nick
modified:
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
------------------------------------------------------------
revno: 3565.6.11
revision-id: amanic at gmail.com-20081004002933-aqddmvgbde1mlwuq
parent: amanic at gmail.com-20081004000138-lx9l7czfmncy49g8
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Sat 2008-10-04 02:29:33 +0200
message:
Bind now updates explicit nicks
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
------------------------------------------------------------
revno: 3565.6.10
revision-id: amanic at gmail.com-20081004000138-lx9l7czfmncy49g8
parent: amanic at gmail.com-20081003234256-jucpuwwgak728l3z
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Sat 2008-10-04 02:01:38 +0200
message:
Silently fall back to local implicit nick if the master is unavailable
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3565.6.9
revision-id: amanic at gmail.com-20081003234256-jucpuwwgak728l3z
parent: amanic at gmail.com-20081003213100-q4rv2l9pn8qto9o0
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Sat 2008-10-04 01:42:56 +0200
message:
Jump through hoops not to open multiple connections when committing to a bound branch.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
------------------------------------------------------------
revno: 3565.6.8
revision-id: amanic at gmail.com-20081003213100-q4rv2l9pn8qto9o0
parent: amanic at gmail.com-20081003205744-o0cdopyj7mum2dkw
parent: pqm at pqm.ubuntu.com-20081002172844-d6df1l8dzpsqzyup
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Fri 2008-10-03 23:31:00 +0200
message:
merge with bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3565.6.7
revision-id: amanic at gmail.com-20081003205744-o0cdopyj7mum2dkw
parent: amanic at gmail.com-20081001001739-65kpo9asl0q8pdcz
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Fri 2008-10-03 22:57:44 +0200
message:
* checkouts now use master nick when no explicit nick is set.
* switch updates only explicit nicks.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
------------------------------------------------------------
revno: 3565.6.6
revision-id: amanic at gmail.com-20081001001739-65kpo9asl0q8pdcz
parent: amanic at gmail.com-20080723163836-sk2xx916g4a8z2xy
parent: pqm at pqm.ubuntu.com-20080930002605-dfe533l96sx35va8
committer: Marius Kruger <amanic at gmail.com>
branch nick: switch_nick
timestamp: Wed 2008-10-01 02:17:39 +0200
message:
merge with bzr.dev
removed:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
added:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/_readdir_py.py readdir.py-20060609152855-rm6v321vuaqyh9tu-3
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/readdir.h readdir.h-20060609152855-rm6v321vuaqyh9tu-2
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py test_get_file_with_s-20080922035909-lhdovrr36jpxmu0v-1
bzrlib/transport/ftp/ ftp-20080611185801-3vm145h8dmnfgh25-1
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
bzrlib/transport/log.py log.py-20080902041816-vh8x5yt5nvdzvew3-5
doc/developers/lca_tree_merging.txt lca_merge_resolution-20080731173903-8ku77uz7o6smd3jj-1
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
tools/packaging/ packaging-20080825202834-3j433iaawnt72wqa-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
renamed:
bzrlib/tests/repository_implementations => bzrlib/tests/per_repository repository_implementations-20060131092037-ec97814745cc6128
bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
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/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
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_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-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_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
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/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.6.5
revision-id: amanic at gmail.com-20080723163836-sk2xx916g4a8z2xy
parent: amanic at gmail.com-20080723052154-r3wqnvnhykfntygu
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.switch_nick
timestamp: Wed 2008-07-23 18:38:36 +0200
message:
add bug number to news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3565.6.4
revision-id: amanic at gmail.com-20080723052154-r3wqnvnhykfntygu
parent: amanic at gmail.com-20080723050823-9bqquw3r7ud7rt9l
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.switch_nick
timestamp: Wed 2008-07-23 07:21:54 +0200
message:
update news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3565.6.3
revision-id: amanic at gmail.com-20080723050823-9bqquw3r7ud7rt9l
parent: amanic at gmail.com-20080723050712-mz1hdti19x736joo
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.switch_nick
timestamp: Wed 2008-07-23 07:08:23 +0200
message:
add info about nickname to switch help.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3565.6.2
revision-id: amanic at gmail.com-20080723050712-mz1hdti19x736joo
parent: amanic at gmail.com-20080720182925-jsylihc9gjpttdhv
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.switch_nick
timestamp: Wed 2008-07-23 07:07:12 +0200
message:
remove comented out code, as per comments from Rob Weir
modified:
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
------------------------------------------------------------
revno: 3565.6.1
revision-id: amanic at gmail.com-20080720182925-jsylihc9gjpttdhv
parent: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.switch_nick
timestamp: Sun 2008-07-20 20:29:25 +0200
message:
Let 'bzr switch' update the nick too.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
=== modified file 'NEWS'
--- a/NEWS 2008-10-29 23:28:46 +0000
+++ b/NEWS 2008-10-30 03:56:00 +0000
@@ -239,6 +239,11 @@
* Trivial documentation fix.
(John Arbash Meinel, #270471)
+ * ``bzr switch`` and ``bzr bind`` will now update the branch nickname if
+ it was previously set. All checkouts will now refer to the bound branch
+ for a nickname if one was not explicitly set.
+ (Marius Kruger, #230903)
+
DOCUMENTATION:
* Explain revision/range identifiers. (Daniel Clemente)
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2008-10-22 19:07:07 +0000
+++ b/bzrlib/branch.py 2008-10-30 03:56:00 +0000
@@ -148,8 +148,20 @@
def get_config(self):
return BranchConfig(self)
- def _get_nick(self):
- return self.get_config().get_nickname()
+ def _get_nick(self, possible_transports=None):
+ config = self.get_config()
+ if not config.has_explicit_nickname(): # explicit overrides master
+ try:
+ master = self.get_master_branch(possible_transports)
+ if master is not None:
+ # return the master branch value
+ config = master.get_config()
+ except errors.BzrError, e:
+ # Silently fall back to local implicit nick if the master is
+ # unavailable
+ mutter("Could not connect to bound branch, "
+ "falling back to local nick.\n " + str(e))
+ return config.get_nickname()
def _set_nick(self, nick):
self.get_config().set_user_option('nickname', nick, warn_masked=True)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-10-17 08:32:52 +0000
+++ b/bzrlib/builtins.py 2008-10-30 03:56:00 +0000
@@ -3786,6 +3786,8 @@
except errors.DivergedBranches:
raise errors.BzrCommandError('These branches have diverged.'
' Try merging, and then bind again.')
+ if b.get_config().has_explicit_nickname():
+ b.nick = b_other.nick
class cmd_unbind(Command):
@@ -4653,7 +4655,8 @@
of the new location and binds to it.
In both cases, the working tree is updated and uncommitted changes
- are merged. The user can commit or revert these as they desire.
+ are merged. The user can commit or revert these as they desire. The branch
+ nickname is also updated to be that of the branch being switched to.
Pending merges need to be committed or reverted before using switch.
@@ -4672,6 +4675,7 @@
from bzrlib import switch
tree_location = '.'
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
+ branch = control_dir.open_branch()
try:
to_branch = Branch.open(to_location)
except errors.NotBranchError:
@@ -4684,6 +4688,9 @@
to_branch = Branch.open(
urlutils.join(this_url, '..', to_location))
switch.switch(control_dir, to_branch, force)
+ if branch.get_config().has_explicit_nickname():
+ branch = control_dir.open_branch() #get the new branch!
+ branch.nick = to_branch.nick
note('Switched to branch: %s',
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py 2008-10-01 05:40:45 +0000
+++ b/bzrlib/commit.py 2008-10-03 23:42:56 +0000
@@ -205,7 +205,8 @@
config=None,
message_callback=None,
recursive='down',
- exclude=None):
+ exclude=None,
+ possible_master_transports=None):
"""Commit working copy as a new revision.
:param message: the commit message (it or message_callback is required)
@@ -298,7 +299,7 @@
raise ConflictsInTree
# Setup the bound branch variables as needed.
- self._check_bound_branch()
+ self._check_bound_branch(possible_master_transports)
# Check that the working tree is up to date
old_revno, new_revno = self._check_out_of_date_tree()
@@ -444,7 +445,7 @@
return
raise PointlessCommit()
- def _check_bound_branch(self):
+ def _check_bound_branch(self, possible_master_transports=None):
"""Check to see if the local branch is bound.
If it is bound, then most of the commit will actually be
@@ -455,7 +456,8 @@
raise errors.LocalRequiresBoundBranch()
if not self.local:
- self.master_branch = self.branch.get_master_branch()
+ self.master_branch = self.branch.get_master_branch(
+ possible_master_transports)
if not self.master_branch:
# make this branch the reference branch for out of date checks.
=== modified file 'bzrlib/mutabletree.py'
--- a/bzrlib/mutabletree.py 2008-09-22 05:15:20 +0000
+++ b/bzrlib/mutabletree.py 2008-10-03 23:42:56 +0000
@@ -181,8 +181,10 @@
from bzrlib import commit
if revprops is None:
revprops = {}
+ possible_master_transports=[]
if not 'branch-nick' in revprops:
- revprops['branch-nick'] = self.branch.nick
+ revprops['branch-nick'] = self.branch._get_nick(
+ possible_master_transports)
author = kwargs.pop('author', None)
if author is not None:
if 'author' in revprops:
@@ -194,7 +196,9 @@
for hook in MutableTree.hooks['start_commit']:
hook(self)
committed_id = commit.Commit().commit(working_tree=self,
- revprops=revprops, *args, **kwargs)
+ revprops=revprops,
+ possible_master_transports=possible_master_transports,
+ *args, **kwargs)
return committed_id
def _gather_kinds(self, files, kinds):
=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py'
--- a/bzrlib/tests/blackbox/test_bound_branches.py 2007-12-10 19:20:41 +0000
+++ b/bzrlib/tests/blackbox/test_bound_branches.py 2008-10-04 00:29:33 +0000
@@ -317,6 +317,33 @@
working_dir='tree_1')
self.assertIs(None, tree.branch.get_bound_location())
+ def test_bind_nick(self):
+ """Bind should not update implicit nick."""
+ base = self.make_branch_and_tree('base')
+ child = self.make_branch_and_tree('child')
+ os.chdir('child')
+ self.assertEqual(child.branch.nick, 'child')
+ self.assertEqual(child.branch.get_config().has_explicit_nickname(),
+ False)
+ self.run_bzr('bind ../base')
+ self.assertEqual(child.branch.nick, base.branch.nick)
+ self.assertEqual(child.branch.get_config().has_explicit_nickname(),
+ False)
+
+ def test_bind_explicit_nick(self):
+ """Bind should update explicit nick."""
+ base = self.make_branch_and_tree('base')
+ child = self.make_branch_and_tree('child')
+ os.chdir('child')
+ child.branch.nick = "explicit_nick"
+ self.assertEqual(child.branch.nick, "explicit_nick")
+ self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
+ "explicit_nick")
+ self.run_bzr('bind ../base')
+ self.assertEqual(child.branch.nick, base.branch.nick)
+ self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
+ base.branch.nick)
+
def test_commit_after_merge(self):
base_tree, child_tree = self.create_branches()
=== modified file 'bzrlib/tests/blackbox/test_nick.py'
--- a/bzrlib/tests/blackbox/test_nick.py 2007-08-08 01:56:29 +0000
+++ b/bzrlib/tests/blackbox/test_nick.py 2008-10-04 01:07:42 +0000
@@ -19,6 +19,7 @@
import os
import bzrlib
+from bzrlib import osutils
from bzrlib.tests.blackbox import ExternalBase
@@ -42,3 +43,38 @@
os.chdir('!repo')
nick = self.run_bzr('nick')[0]
self.assertEqual(nick, '!repo\n')
+
+ def test_bound_nick(self):
+ """Check that nick works well for checkouts."""
+ base = self.make_branch_and_tree('base')
+ child = self.make_branch_and_tree('child')
+ os.chdir('child')
+ self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
+ self.assertEqual(child.branch.get_config().has_explicit_nickname(),
+ False)
+ self.run_bzr('bind ../base')
+ self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
+ self.assertEqual(child.branch.get_config().has_explicit_nickname(),
+ False)
+
+ self.run_bzr('unbind')
+ self.run_bzr("nick explicit_nick")
+ self.assertEqual(self.run_bzr('nick')[0][:-1], "explicit_nick")
+ self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
+ "explicit_nick")
+ self.run_bzr('bind ../base')
+ self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
+ self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
+ base.branch.nick)
+
+ def test_boundless_nick(self):
+ """Nick defaults to implicit local nick when bound branch is AWOL"""
+ base = self.make_branch_and_tree('base')
+ child = self.make_branch_and_tree('child')
+ os.chdir('child')
+ self.run_bzr('bind ../base')
+ self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
+ self.assertEqual(child.branch.get_config().has_explicit_nickname(),
+ False)
+ osutils.rmtree('../base')
+ self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- a/bzrlib/tests/blackbox/test_switch.py 2008-08-07 09:12:47 +0000
+++ b/bzrlib/tests/blackbox/test_switch.py 2008-10-03 20:57:44 +0000
@@ -20,6 +20,7 @@
import os
+from bzrlib.workingtree import WorkingTree
from bzrlib.tests.blackbox import ExternalBase
@@ -49,8 +50,58 @@
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
self.assertEqual('', out)
+ def _test_switch_nick(self, lightweight):
+ """Check that the nick gets switched too."""
+ tree1 = self.make_branch_and_tree('branch1')
+ tree2 = self.make_branch_and_tree('branch2')
+ tree2.pull(tree1.branch)
+ checkout = tree1.branch.create_checkout('checkout',
+ lightweight=lightweight)
+ self.assertEqual(checkout.branch.nick, tree1.branch.nick)
+ self.assertEqual(checkout.branch.get_config().has_explicit_nickname(),
+ False)
+ self.run_bzr('switch branch2', working_dir='checkout')
+
+ # we need to get the tree again, otherwise we don't get the new branch
+ checkout = WorkingTree.open('checkout')
+ self.assertEqual(checkout.branch.nick, tree2.branch.nick)
+ self.assertEqual(checkout.branch.get_config().has_explicit_nickname(),
+ False)
+
+ def test_switch_nick(self):
+ self._test_switch_nick(lightweight=False)
+
+ def test_switch_nick_lightweight(self):
+ self._test_switch_nick(lightweight=True)
+
+ def _test_switch_explicit_nick(self, lightweight):
+ """Check that the nick gets switched too."""
+ tree1 = self.make_branch_and_tree('branch1')
+ tree2 = self.make_branch_and_tree('branch2')
+ tree2.pull(tree1.branch)
+ checkout = tree1.branch.create_checkout('checkout',
+ lightweight=lightweight)
+ self.assertEqual(checkout.branch.nick, tree1.branch.nick)
+ checkout.branch.nick = "explicit_nick"
+ self.assertEqual(checkout.branch.nick, "explicit_nick")
+ self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(),
+ "explicit_nick")
+ self.run_bzr('switch branch2', working_dir='checkout')
+
+ # we need to get the tree again, otherwise we don't get the new branch
+ checkout = WorkingTree.open('checkout')
+ self.assertEqual(checkout.branch.nick, tree2.branch.nick)
+ self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(),
+ tree2.branch.nick)
+
+ def test_switch_explicit_nick(self):
+ self._test_switch_explicit_nick(lightweight=False)
+
+ def test_switch_explicit_nick_lightweight(self):
+ self._test_switch_explicit_nick(lightweight=True)
+
def test_switch_finds_relative_branch(self):
- """Switch will find 'foo' relative to the branch that the checkout is of."""
+ """Switch will find 'foo' relative to the branch the checkout is of."""
self.build_tree(['repo/'])
tree1 = self.make_branch_and_tree('repo/brancha')
tree1.commit('foo')
More information about the bazaar-commits
mailing list