← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Robert Collins
  • Date: 2005-09-13 16:52:44 UTC
  • mto: (147.2.6) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20050913165244-2c4a9223d286580c
handle missing ancestry

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
7
7
import tty, termios
8
8
import glob
9
9
from bzrlib.commands import Command
10
 
from bzrlib.branch import Branch
11
10
 
12
11
def main(args):
13
12
    name = os.path.basename(args.pop(0))
166
165
    takes_args = ['file*']
167
166
    takes_options = ['message', 'revision']
168
167
    def run(self, file_list=None, message=None, revision=None):
169
 
        revision_list = None
170
 
        if revision is not None and revision:
171
 
            if file_list is not None and len(file_list) > 0:
172
 
                branchdir = file_list[0]
173
 
            else:
174
 
                branchdir = '.'
175
 
            b = Branch.open_containing(branchdir)
176
 
            revision_list = ["revid:" + revision[0].in_history(b).rev_id]
177
 
 
178
 
        return shelve(message=message, file_list=file_list, 
179
 
                      revision=revision_list)
 
168
        return shelve(message=message, file_list=file_list, revision=revision)
180
169
 
181
170
class cmd_unshelve(Command):
182
171
    """Restore previously-shelved changes to the current tree.