Rev 3293: (Lukas Lalinsky) Make 'mv a b' work for already renamed directories, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 18 02:49:56 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3293
revision-id:pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
parent: pqm at pqm.ubuntu.com-20080318011718-41sghr89tjcdpzc7
parent: bialix at ukr.net-20080317215847-m36yrjhb004kgi65
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-18 02:49:45 +0000
message:
(Lukas Lalinsky) Make 'mv a b' work for already renamed directories,
like it does for files. (#107967)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3249.4.2
revision-id:bialix at ukr.net-20080317215847-m36yrjhb004kgi65
parent: bialix at ukr.net-20080305130932-3mlfwj7bqrlitxoc
parent: pqm at pqm.ubuntu.com-20080317054003-mzukdvwi1d2icd4c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mv.dir.after
timestamp: Mon 2008-03-17 23:58:47 +0200
message:
merge bzr.dev
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
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/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/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
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_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
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/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3249.4.1
revision-id:bialix at ukr.net-20080305130932-3mlfwj7bqrlitxoc
parent: pqm at pqm.ubuntu.com-20080304003709-35vh1eqa8tuuq548
parent: lalinsky at gmail.com-20080127111412-qdcn8kkknzvn5l5t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mv.dir.after
timestamp: Wed 2008-03-05 15:09:32 +0200
message:
merge Lukas' patch and update it with case-insensitive rename check.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3201.2.1
revision-id:lalinsky at gmail.com-20080127111412-qdcn8kkknzvn5l5t
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: dir-mv
timestamp: Sun 2008-01-27 12:14:12 +0100
message:
Make 'mv a b' work for already renamed directories, like it does for files
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'NEWS'
--- a/NEWS 2008-03-17 21:48:18 +0000
+++ b/NEWS 2008-03-18 02:49:45 +0000
@@ -22,6 +22,9 @@
BUGFIXES:
+ * ``bzr mv a b`` can be now used also to rename previously renamed
+ directories, not only files. (Lukáš Lalinský, #107967)
+
DOCUMENTATION:
API BREAKS:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-03-14 19:44:24 +0000
+++ b/bzrlib/builtins.py 2008-03-17 21:58:47 +0000
@@ -534,13 +534,31 @@
if len(names_list) < 2:
raise errors.BzrCommandError("missing file argument")
tree, rel_names = tree_files(names_list)
+ tree.lock_write()
+ try:
+ self._run(tree, names_list, rel_names, after)
+ finally:
+ tree.unlock()
- dest = names_list[-1]
- isdir = os.path.isdir(dest)
- if (isdir and not tree.case_sensitive and len(rel_names) == 2
- and rel_names[0].lower() == rel_names[1].lower()):
- isdir = False
- if isdir:
+ def _run(self, tree, names_list, rel_names, after):
+ into_existing = osutils.isdir(names_list[-1])
+ if into_existing and len(names_list) == 2:
+ # special cases:
+ # a. case-insensitive filesystem and change case of dir
+ # b. move directory after the fact (if the source used to be
+ # a directory, but now doesn't exist in the working tree
+ # and the target is an existing directory, just rename it)
+ if (not tree.case_sensitive
+ and rel_names[0].lower() == rel_names[1].lower()):
+ into_existing = False
+ else:
+ inv = tree.inventory
+ from_id = tree.path2id(rel_names[0])
+ if (not osutils.lexists(names_list[0]) and
+ from_id and inv.get_file_kind(from_id) == "directory"):
+ into_existing = False
+ # move/rename
+ if into_existing:
# move into existing directory
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
self.outf.write("%s => %s\n" % pair)
=== modified file 'bzrlib/tests/blackbox/test_mv.py'
--- a/bzrlib/tests/blackbox/test_mv.py 2008-03-03 23:04:47 +0000
+++ b/bzrlib/tests/blackbox/test_mv.py 2008-03-05 13:09:32 +0000
@@ -407,3 +407,26 @@
self.failUnlessExists('sub/a2')
self.assertInWorkingTree('sub/a1')
self.assertInWorkingTree('sub/a2')
+
+ def test_mv_already_moved_directory(self):
+ """Use `bzr mv a b` to mark a directory as renamed.
+
+ https://bugs.launchpad.net/bzr/+bug/107967/
+ """
+ self.build_tree(['a/', 'c/'])
+ tree = self.make_branch_and_tree('.')
+ tree.add(['a', 'c'])
+ osutils.rename('a', 'b')
+ osutils.rename('c', 'd')
+ # mv a b should work just like it does for already renamed files
+ self.run_bzr('mv a b')
+ self.failIfExists('a')
+ self.assertNotInWorkingTree('a')
+ self.failUnlessExists('b')
+ self.assertInWorkingTree('b')
+ # and --after should work, too (technically it's ignored)
+ self.run_bzr('mv --after c d')
+ self.failIfExists('c')
+ self.assertNotInWorkingTree('c')
+ self.failUnlessExists('d')
+ self.assertInWorkingTree('d')
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2008-03-07 14:15:10 +0000
+++ b/bzrlib/workingtree_4.py 2008-03-17 21:58:47 +0000
@@ -662,8 +662,8 @@
if self._inventory is not None:
update_inventory = True
inv = self.inventory
+ to_dir_id = to_entry[0][2]
to_dir_ie = inv[to_dir_id]
- to_dir_id = to_entry[0][2]
else:
update_inventory = False
More information about the bazaar-commits
mailing list