lp:~gagern/bzr/bug527878-directoryCommonOption

Branch merges

Merged into lp:bzr at revision 5284

Martin Pool: Approve on 2010-06-04

Martin Packman (community): Approve on 2010-05-28

Diff: 313 lines (+107/-16)

8 files modified

NEWS (+4/-0)
bzrlib/builtins.py (+19/-12)
bzrlib/conflicts.py (+6/-4)
bzrlib/tests/blackbox/test_conflicts.py (+13/-0)
bzrlib/tests/blackbox/test_merge_directive.py (+12/-0)
bzrlib/tests/blackbox/test_missing.py (+20/-0)
bzrlib/tests/blackbox/test_shelve.py (+15/-0)
bzrlib/tests/blackbox/test_switch.py (+18/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #527878: All commands should accept an explicit location or -d	Medium	Fix Released
Bug #559998: bzr cat should accept --directory	Low	Fix Released
Bug #561245: Provide --directory and -d option for all commands	Undecided	New

Link a bug report

Related blueprints

5185. By Martin von Gagern on 2010-05-28

NEWS item mentioning new --directory for 7 more commands.

5184. By Martin von Gagern on 2010-05-28

Add --directory option to 7 more commands.

This batch adds a --directory option to the following commands:
conflicts, merge-directive, missing, resolve, shelve, switch, unshelve

Blackbox tests for all of these are included.

5183. By Martin von Gagern on 2010-05-28

Merge from bzr.dev

5182. By Martin von Gagern on 2010-05-03

merge from trunk.

5181. By Martin von Gagern on 2010-05-03

Added NEWS entry.

5180. By Martin von Gagern on 2010-05-03

Rename function to _open_directory_or_containing_tree_or_branch.

The idea is that we either use --directory option, or if it isn't specified,
open the containing tree or branch for the given argument.

5179. By Martin von Gagern on 2010-05-02

Fix error in bzr added --directory.

There is a check whether a possibly added file is present in the file
system. This check has to take the tree base directory into account.

5178. By Martin von Gagern on 2010-05-02

Added blackbox tests for --directory option.

Added tests for the new --directory (-d) option to these commands: added,
annotate, bind, cat, clean-tree, deleted, export, ignore, ignored,
lookup-revision, ls, modified, nick, re-sign, unbind, unknowns.

5177. By Martin von Gagern on 2010-05-02

Fix --directory option to ls command.

5176. By Martin von Gagern on 2010-05-02

Add blackbox test for cat --directory.