[MERGE] Use relative paths with shelve
John Arbash Meinel
john at arbash-meinel.com
Fri Dec 12 15:21:39 GMT 2008
John Arbash Meinel has voted approve.
Status is now: Approved
Comment:
=== modified file 'bzrlib/shelf_ui.py'
--- bzrlib/shelf_ui.py 2008-11-19 07:55:29 +0000
+++ bzrlib/shelf_ui.py 2008-12-12 06:09:44 +0000
@@ -75,8 +75,8 @@
tree, path = workingtree.WorkingTree.open_containing(directory)
target_tree = builtins._get_one_revision_tree('shelf2',
revision,
tree.branch, tree)
- return klass(tree, target_tree, diff_writer, all, all,
file_list,
- message)
+ files = builtins.safe_relpath_files(tree, file_list)
+ return klass(tree, target_tree, diff_writer, all, all, files,
message)
^- I'm a bit curious why you feel the need to use a "directory='.'"
argument
rather than using "builtins.tree_files()".
Considering you can do:
bzr add workingtree/path/file
but
bzr shelve workingtree/path/file
Will fail with your current design.
Anyway, this is still better than what we have, so it should be merged.
For details, see:
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C4942005F.5080702%40aaronbentley.com%3E
Project: Bazaar
More information about the bazaar
mailing list