← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Michael Ellerman
  • Date: 2005-11-28 18:32:14 UTC
  • mto: (0.3.1 shelf-dev) (325.1.2 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20051128183214-abade6823cc5ff40
Add support for 'unshelve --pick'. This works but the UI is broken, as the
hunk selector prompts are all still related to shelving, not unshelving.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
47
47
    """Reinstate the most recently shelved changes.
48
48
    See 'shelve' for more information.
49
49
    """
50
 
    def run(self):
 
50
    takes_options = [Option('pick')]
 
51
    def run(self, pick=False):
51
52
        s = Shelf('.')
52
 
        return s.unshelve()
 
53
        return s.unshelve(pick)
53
54
 
54
55
bzrlib.commands.register_command(cmd_shelve)
55
56
bzrlib.commands.register_command(cmd_unshelve)