Rev 2241: mv can also work on just inventory entry (Eichenberg, Kruger) in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Jan 20 02:01:06 GMT 2007
------------------------------------------------------------
revno: 2241
revision-id: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
parent: aaron.bentley at utoronto.ca-20070120014446-2znre037lrj823cd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-01-20 02:01:04 +0000
message:
mv can also work on just inventory entry (Eichenberg, Kruger)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20070120014446-2znre037lrj823cd
parent: amanic at gmail.com-20070119194219-mlzsauq30x2az9sq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-01-19 20:44:46 -0500
message:
Cleanup formatting and error handling
------------------------------------------------------------
merged: amanic at gmail.com-20070119194219-mlzsauq30x2az9sq
parent: amanic at gmail.com-20070119192353-i96mfa4bsya9thdu
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2007-01-19 21:42:19 +0200
message:
Remove assertNone
------------------------------------------------------------
merged: amanic at gmail.com-20070119192353-i96mfa4bsya9thdu
parent: amanic at gmail.com-20070119094738-zzjsna2p0lupx92a
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2007-01-19 21:23:53 +0200
message:
* Fix errors.py import order
* Atemt to handle exceptions better in WorkingTree._move
------------------------------------------------------------
merged: amanic at gmail.com-20070119094738-zzjsna2p0lupx92a
parent: amanic at gmail.com-20070118041151-m5kjsutaymhy8yoy
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2007-01-19 11:47:38 +0200
message:
* bzrlib/errors.py
Changed "FilesExist" to more specific "RenameFailedFilesExist"
------------------------------------------------------------
merged: amanic at gmail.com-20070118041151-m5kjsutaymhy8yoy
parent: amanic at gmail.com-20070111180203-nu4s7rbxemd3l50u
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-18 06:11:51 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: amanic at gmail.com-20070111180203-nu4s7rbxemd3l50u
parent: amanic at gmail.com-20070111173532-5v3z2qfi35f9cd44
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move2
timestamp: Thu 2007-01-11 20:02:03 +0200
message:
Remove all trailing white space this bundle would have
added. Fix wrong Bazaar version reference.
------------------------------------------------------------
merged: amanic at gmail.com-20070111173532-5v3z2qfi35f9cd44
parent: amanic at gmail.com-20070111165531-ai82lgbvb8wy5bwq
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move2
timestamp: Thu 2007-01-11 19:35:32 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: amanic at gmail.com-20070111165531-ai82lgbvb8wy5bwq
parent: amanic at gmail.com-20070111124417-34qobd08gvz0vo0n
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 18:55:31 +0200
message:
update NEWS
------------------------------------------------------------
merged: amanic at gmail.com-20070111124417-34qobd08gvz0vo0n
parent: amanic at gmail.com-20070111062048-e0hcas0zqt1hmrd8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 14:44:17 +0200
message:
* change error message telling user about --after option sightly
* change long line to rather use temp variable
* change expected version this will be introduced to 0.15
* remove comma again
* remove comment which we don't understand
------------------------------------------------------------
merged: amanic at gmail.com-20070111062048-e0hcas0zqt1hmrd8
parent: amanic at gmail.com-20070111061415-waq22luaja5czdry
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 08:20:48 +0200
message:
* bzrlib/tests/blackbox/test_mv.py
- add utility methods and use them where appropriate:
assertInWorkingTree, assertNotInWorkingTree and assertMoved
- fix each doc string to have a one-liner and a longer description
- remove commits
- update tests to follow the use case being tested more closely.
------------------------------------------------------------
merged: amanic at gmail.com-20070111061415-waq22luaja5czdry
parent: amanic at gmail.com-20070104033937-6ba6mnsnl8d4ja4f
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-11 08:14:15 +0200
message:
* bzrlib/tests/__init__
- add utility assert methods: assertNone and assertNotNone
- failUnlessExists and failIfExists give beter messages when failing
------------------------------------------------------------
merged: amanic at gmail.com-20070104033937-6ba6mnsnl8d4ja4f
parent: amanic at gmail.com-20070103062231-f67a7q1hyahha84m
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Thu 2007-01-04 05:39:37 +0200
message:
* errors.py
- fix copy paste err.
- make DirectoryNotEmpty constructor parameters optional.
------------------------------------------------------------
merged: amanic at gmail.com-20070103062231-f67a7q1hyahha84m
parent: amanic at gmail.com-20070103061443-i6kogbeqb54148p9
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Wed 2007-01-03 08:22:31 +0200
message:
Undo accidental changes: some files were made executable.
------------------------------------------------------------
merged: amanic at gmail.com-20070103061443-i6kogbeqb54148p9
parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
parent: amanic at gmail.com-20061222184022-8td58r6xtt9jodnn
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Wed 2007-01-03 08:14:43 +0200
message:
merge enhancedmv3.patch with bzr.dev
------------------------------------------------------------
merged: amanic at gmail.com-20061222184022-8td58r6xtt9jodnn
parent: amanic at gmail.com-20061222182250-mq33oq8fs45fx4sb
parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 20:40:22 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: amanic at gmail.com-20061222182250-mq33oq8fs45fx4sb
parent: amanic at gmail.com-20061222164938-rbjxiq858d78k5lw
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 20:22:50 +0200
message:
* Change move/rename errors yet again
- added new exception classes BzrMoveFailedError and BzrRenameFailedError
- convert the move/rename methods to raise these new exceptions,
and pass more specefic exceptions as extra.
------------------------------------------------------------
merged: amanic at gmail.com-20061222164938-rbjxiq858d78k5lw
parent: amanic at gmail.com-20061222060404-49pvclo8t1v8eiyx
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 18:49:38 +0200
message:
Converted move/rename error messages to show source => target.
------------------------------------------------------------
merged: amanic at gmail.com-20061222060404-49pvclo8t1v8eiyx
parent: marius.kruger at enerweb.co.za-20061221191535-wtl0drt01e8uv1v1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.enhanced_move
timestamp: Fri 2006-12-22 08:04:04 +0200
message:
* errors
- change comments to doc-strings
- Make FilesExist handle plurals properly for 1 or more files
- change contextInfo to context_info
* test_mv
- apply error message suggestions
* workingtree
- remov old style error imports
- fix some long lines
------------------------------------------------------------
merged: marius.kruger at enerweb.co.za-20061221191535-wtl0drt01e8uv1v1
parent: marius.kruger at enerweb.co.za-20061221191435-3y22jy8raa6959yk
parent: pqm at pqm.ubuntu.com-20061221163807-07adb2b67c60b6e6
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 21:15:35 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: marius.kruger at enerweb.co.za-20061221191435-3y22jy8raa6959yk
parent: marius.kruger at enerweb.co.za-20061221180752-twd4soiaglxi3ofj
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 21:14:35 +0200
message:
* errors
- Add AlreadyVersionedError
- Fix type
- Add 'extra' capability to PathsDoNotExist.
* update test_mv
* workingtre
- Convert more BzrErrors to mores specialised ones.
------------------------------------------------------------
merged: marius.kruger at enerweb.co.za-20061221180752-twd4soiaglxi3ofj
parent: marius.kruger at enerweb.co.za-20061221171344-umbd2lgx2xd9yktu
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 20:07:52 +0200
message:
Improved WorkingTree.move excptions. (as requested)
------------------------------------------------------------
merged: marius.kruger at enerweb.co.za-20061221171344-umbd2lgx2xd9yktu
parent: marius.kruger at enerweb.co.za-20061221163659-12noae60x2pkz20b
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 19:13:44 +0200
message:
* workingtree
- Removed redundant setter method.
- Improved capitalization, and punctuation (as requested).
------------------------------------------------------------
merged: marius.kruger at enerweb.co.za-20061221163659-12noae60x2pkz20b
parent: marius.kruger at enerweb.co.za-20061221051149-9ghc9jjj79899dr3
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 18:36:59 +0200
message:
* Made whitespace and puntuation improvements, as requested.
* Improved NotVersionedError in order to show context
* Updated test_mv to pass again after changes
* Use proper exception when move destination is invalid.
------------------------------------------------------------
merged: marius.kruger at enerweb.co.za-20061221051149-9ghc9jjj79899dr3
parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
parent: scameronde at googlemail.com-20061113085356-579f0c2a1c06ea79
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.enhanced_move
timestamp: Thu 2006-12-21 07:11:49 +0200
message:
merge initial enhancedmv.patch
------------------------------------------------------------
merged: scameronde at googlemail.com-20061113085356-579f0c2a1c06ea79
parent: scameronde at googlemail.com-20061113084737-6d184e0e1527168d
parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Mon 2006-11-13 09:53:56 +0100
message:
merged main development branch
------------------------------------------------------------
merged: scameronde at googlemail.com-20061113084737-6d184e0e1527168d
parent: scameronde at googlemail.com-20061113084654-f6b185863d289320
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Mon 2006-11-13 09:47:37 +0100
message:
added tests for deprecated API workingtree.move
------------------------------------------------------------
merged: scameronde at googlemail.com-20061113084654-f6b185863d289320
parent: scameronde at googlemail.com-20061108154710-5c1b0731ddb9365e
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Mon 2006-11-13 09:46:54 +0100
message:
new parameter to_dir must be a named parameter
------------------------------------------------------------
merged: scameronde at googlemail.com-20061108154710-5c1b0731ddb9365e
parent: scameronde at googlemail.com-20061108154617-4f8049877e9e83f6
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Wed 2006-11-08 16:47:10 +0100
message:
split tests so that each new method contains one test only
------------------------------------------------------------
merged: scameronde at googlemail.com-20061108154617-4f8049877e9e83f6
parent: scameronde at googlemail.com-20061108154558-21af1c09054ba825
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Wed 2006-11-08 16:46:17 +0100
message:
unified error messages
------------------------------------------------------------
merged: scameronde at googlemail.com-20061108154558-21af1c09054ba825
parent: scameronde at googlemail.com-20061107162812-0bea1e610c10e282
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Wed 2006-11-08 16:45:58 +0100
message:
specifying named parameters
------------------------------------------------------------
merged: scameronde at googlemail.com-20061107162812-0bea1e610c10e282
parent: scameronde at googlemail.com-20061107162703-197cfbc1391e59fe
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 17:28:12 +0100
message:
a few new blackbox test for mv
------------------------------------------------------------
merged: scameronde at googlemail.com-20061107162703-197cfbc1391e59fe
parent: scameronde at googlemail.com-20061107150900-80887acd23f7b691
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 17:27:03 +0100
message:
fixed wrong formatting of error text
------------------------------------------------------------
merged: scameronde at googlemail.com-20061107150900-80887acd23f7b691
parent: scameronde at googlemail.com-20061107144652-d7553603b5e0a6c7
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 16:09:00 +0100
message:
fixed the most obvious bugs
------------------------------------------------------------
merged: scameronde at googlemail.com-20061107144652-d7553603b5e0a6c7
parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
committer: Steffen Eichenberg <scameronde at googlemail.com>
branch nick: bzr.mvdev
timestamp: Tue 2006-11-07 15:46:52 +0100
message:
the mv command is now able to move files that have already been moved on the file system
More information about the bazaar-commits
mailing list