mercurial: comparison hgext/mq.py

equal deleted inserted replaced

-:6ee719f56f01
+:d9cf0d1d0d0f
 numrevs = 0
 if opts.get('rev'):
 if not self.applied:
 raise util.Abort(_('no patches applied'))
-revs = cmdutil.revrange(repo, opts['rev'])
+revs = cmdutil.revrange(repo, opts.get('rev'))
 if len(revs) > 1 and revs[0] > revs[1]:
 revs.reverse()
 revpatches = self._revpatches(repo, revs)
 realpatches += revpatches
 numrevs = len(revpatches)
 hg qimport -e existing-patch -n new-name
 """
 q = repo.mq
 try:
-q.qimport(repo, filename, patchname=opts['name'],
+q.qimport(repo, filename, patchname=opts.get('name'),
-existing=opts['existing'], force=opts['force'], rev=opts['rev'],
+existing=opts.get('existing'), force=opts.get('force'),
-git=opts['git'])
+rev=opts.get('rev'), git=opts.get('git'))
 finally:
 q.save_dirty()
 if opts.get('push') and not opts.get('rev'):
 return q.push(repo, None)
 an unversioned patch repository into a versioned one). You can use
 qcommit to commit changes to this queue repository.
 This command is deprecated. Without -c, it's implied by other relevant
 commands. With -c, use :hg:`init --mq` instead."""
-return qinit(ui, repo, create=opts['create_repo'])
+return qinit(ui, repo, create=opts.get('create_repo'))
 def clone(ui, source, dest=None, **opts):
 '''clone main and patch repository at same time
 If source is local, destination will have no patches applied. If
 url = url[:-1]
 return url + '/.hg/patches'
 if dest is None:
 dest = hg.defaultdest(source)
 sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source))
-if opts['patches']:
+if opts.get('patches'):
-patchespath = ui.expandpath(opts['patches'])
+patchespath = ui.expandpath(opts.get('patches'))
 else:
 patchespath = patchdir(sr)
 try:
 hg.repository(ui, patchespath)
 except error.RepoError:
 qbase = sr.lookup('qbase')
 except error.RepoError:
 pass
 ui.note(_('cloning main repository\n'))
 sr, dr = hg.clone(ui, sr.url(), dest,
-pull=opts['pull'],
+pull=opts.get('pull'),
 rev=destrev,
 update=False,
-stream=opts['uncompressed'])
+stream=opts.get('uncompressed'))
 ui.note(_('cloning patch repository\n'))
-hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr),
+hg.clone(ui, opts.get('patches') or patchdir(sr), patchdir(dr),
-pull=opts['pull'], update=not opts['noupdate'],
+pull=opts.get('pull'), update=not opts.get('noupdate'),
-stream=opts['uncompressed'])
+stream=opts.get('uncompressed'))
 if dr.local():
 if qbase:
 ui.note(_('stripping applied patches from destination '
 'repository\n'))
 dr.mq.strip(dr, [qbase], update=False, backup=None)
-if not opts['noupdate']:
+if not opts.get('noupdate'):
 ui.note(_('updating destination repository\n'))
 hg.update(dr, dr.changelog.tip())
 def commit(ui, repo, *pats, **opts):
 """commit changes in the queue repository (DEPRECATED)
 raise util.Abort('no queue repository')
 commands.commit(r.ui, r, *pats, **opts)
 def series(ui, repo, **opts):
 """print the entire series file"""
-repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary'])
+repo.mq.qseries(repo, missing=opts.get('missing'), summary=opts.get('summary'))
 return 0
 def top(ui, repo, **opts):
 """print the name of the current patch"""
 q = repo.mq
 is important for preserving permission changes and copy/rename
 information.
 """
 msg = cmdutil.logmessage(opts)
 def getmsg():
-return ui.edit(msg, opts['user'] or ui.username())
+return ui.edit(msg, opts.get('user') or ui.username())
 q = repo.mq
 opts['msg'] = msg
 if opts.get('edit'):
 opts['msg'] = getmsg
 else:
 and renames. See the diffs help topic for more information on the
 git diff format.
 """
 q = repo.mq
 message = cmdutil.logmessage(opts)
-if opts['edit']:
+if opts.get('edit'):
 if not q.applied:
 ui.write(_("no patches applied\n"))
 return 1
 if message:
 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
 if not q.check_toppatch(repo)[0]:
 raise util.Abort(_('no patches applied'))
 q.check_localchanges(repo)
 message = cmdutil.logmessage(opts)
-if opts['edit']:
+if opts.get('edit'):
 if message:
 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
 parent = q.lookup('qtip')
 patches = []
 for msg in messages:
 message.append('* * *')
 message.extend(msg)
 message = '\n'.join(message)
-if opts['edit']:
+if opts.get('edit'):
 message = ui.edit(message, user or ui.username())
 diffopts = q.patchopts(q.diffopts(), *patches)
 q.refresh(repo, msg=message, git=diffopts.git)
 q.delete(repo, patches, opts)
 def goto(ui, repo, patch, **opts):
 '''push or pop patches until named patch is at top of stack'''
 q = repo.mq
 patch = q.lookup(patch)
 if q.isapplied(patch):
-ret = q.pop(repo, patch, force=opts['force'])
+ret = q.pop(repo, patch, force=opts.get('force'))
 else:
-ret = q.push(repo, patch, force=opts['force'])
+ret = q.push(repo, patch, force=opts.get('force'))
 q.save_dirty()
 return ret
 def guard(ui, repo, *args, **opts):
 '''set or print guards for a patch
 ui.write('\n')
 q = repo.mq
 applied = set(p.name for p in q.applied)
 patch = None
 args = list(args)
-if opts['list']:
+if opts.get('list'):
-if args or opts['none']:
+if args or opts.get('none'):
 raise util.Abort(_('cannot mix -l/--list with options or arguments'))
 for i in xrange(len(q.series)):
 status(i)
 return
 if not args or args[0][0:1] in '-+':
 patch = q.applied[-1].name
 if patch is None and args[0][0:1] not in '-+':
 patch = args.pop(0)
 if patch is None:
 raise util.Abort(_('no patch to work with'))
-if args or opts['none']:
+if args or opts.get('none'):
 idx = q.find_series(patch)
 if idx is None:
 raise util.Abort(_('no patch named %s') % patch)
 q.set_guards(idx, args)
 q.save_dirty()
 will be lost.
 """
 q = repo.mq
 mergeq = None
-if opts['merge']:
+if opts.get('merge'):
-if opts['name']:
+if opts.get('name'):
-newpath = repo.join(opts['name'])
+newpath = repo.join(opts.get('name'))
 else:
 newpath, i = lastsavename(q.path)
 if not newpath:
 ui.warn(_("no saved queues found, please use -n\n"))
 return 1
 mergeq = queue(ui, repo.join(""), newpath)
 ui.warn(_("merging with queue at: %s\n") % mergeq.path)
-ret = q.push(repo, patch, force=opts['force'], list=opts['list'],
+ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'),
 mergeq=mergeq, all=opts.get('all'), move=opts.get('move'))
 return ret
 def pop(ui, repo, patch=None, **opts):
 """pop the current patch off the stack
 By default, pops off the top of the patch stack. If given a patch
 name, keeps popping off patches until the named patch is at the
 top of the stack.
 """
 localupdate = True
-if opts['name']:
+if opts.get('name'):
-q = queue(ui, repo.join(""), repo.join(opts['name']))
+q = queue(ui, repo.join(""), repo.join(opts.get('name')))
 ui.warn(_('using patch queue: %s\n') % q.path)
 localupdate = False
 else:
 q = repo.mq
-ret = q.pop(repo, patch, force=opts['force'], update=localupdate,
+ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate,
-all=opts['all'])
+all=opts.get('all'))
 q.save_dirty()
 return ret
 def rename(ui, repo, patch, name=None, **opts):
 """rename a patch
 """restore the queue state saved by a revision (DEPRECATED)
 This command is deprecated, use rebase --mq instead."""
 rev = repo.lookup(rev)
 q = repo.mq
-q.restore(repo, rev, delete=opts['delete'],
+q.restore(repo, rev, delete=opts.get('delete'),
-qupdate=opts['update'])
+qupdate=opts.get('update'))
 q.save_dirty()
 return 0
 def save(ui, repo, **opts):
 """save current queue state (DEPRECATED)
 message = cmdutil.logmessage(opts)
 ret = q.save(repo, msg=message)
 if ret:
 return ret
 q.save_dirty()
-if opts['copy']:
+if opts.get('copy'):
 path = q.path
-if opts['name']:
+if opts.get('name'):
-newpath = os.path.join(q.basepath, opts['name'])
+newpath = os.path.join(q.basepath, opts.get('name'))
 if os.path.exists(newpath):
 if not os.path.isdir(newpath):
 raise util.Abort(_('destination %s exists and is not '
 'a directory') % newpath)
-if not opts['force']:
+if not opts.get('force'):
 raise util.Abort(_('destination %s exists, '
 'use -f to force') % newpath)
 else:
 newpath = savename(path)
 ui.warn(_("copy %s to %s\n") % (path, newpath))
 util.copyfiles(path, newpath)
-if opts['empty']:
+if opts.get('empty'):
 try:
 os.unlink(q.join(q.status_path))
 except:
 pass
 return 0
 Use the --nobackup option to discard the backup bundle once the
 operation completes.
 """
 backup = 'all'
-if opts['backup']:
+if opts.get('backup'):
 backup = 'strip'
-elif opts['nobackup']:
+elif opts.get('nobackup'):
 backup = 'none'
 cl = repo.changelog
 revs = set(cl.rev(repo.lookup(r)) for r in revs)
 break
 del q.applied[start:end]
 q.save_dirty()
 repo.mq.strip(repo, list(rootnodes), backup=backup, update=update,
-force=opts['force'])
+force=opts.get('force'))
 return 0
 def select(ui, repo, *args, **opts):
 '''set or print guarded patches to push
 Use -s/--series to print a list of all guards in the series file
 (no other arguments needed). Use -v for more information.'''
 q = repo.mq
 guards = q.active()
-if args or opts['none']:
+if args or opts.get('none'):
 old_unapplied = q.unapplied(repo)
 old_guarded = [i for i in xrange(len(q.applied)) if
 not q.pushable(i)[0]]
 q.set_active(args)
 q.save_dirty()
 if not args:
 ui.status(_('guards deactivated\n'))
-if not opts['pop'] and not opts['reapply']:
+if not opts.get('pop') and not opts.get('reapply'):
 unapplied = q.unapplied(repo)
 guarded = [i for i in xrange(len(q.applied))
 if not q.pushable(i)[0]]
 if len(unapplied) != len(old_unapplied):
 ui.status(_('number of unguarded, unapplied patches has '
 (len(old_unapplied), len(unapplied)))
 if len(guarded) != len(old_guarded):
 ui.status(_('number of guarded, applied patches has changed '
 'from %d to %d\n') %
 (len(old_guarded), len(guarded)))
-elif opts['series']:
+elif opts.get('series'):
 guards = {}
 noguards = 0
 for gs in q.series_guards:
 if not gs:
 noguards += 1
 ui.note(_('active guards:\n'))
 for g in guards:
 ui.write(g, '\n')
 else:
 ui.write(_('no active guards\n'))
-reapply = opts['reapply'] and q.applied and q.appliedname(-1)
+reapply = opts.get('reapply') and q.applied and q.appliedname(-1)
 popped = False
-if opts['pop'] or opts['reapply']:
+if opts.get('pop') or opts.get('reapply'):
 for i in xrange(len(q.applied)):
 pushable, reason = q.pushable(i)
 if not pushable:
 ui.status(_('popping guarded patches\n'))
 popped = True
 This can be especially useful if your changes have been applied to
 an upstream repository, or if you are about to push your changes
 to upstream.
 """
-if not opts['applied'] and not revrange:
+if not opts.get('applied') and not revrange:
 raise util.Abort(_('no revisions specified'))
-elif opts['applied']:
+elif opts.get('applied'):
 revrange = ('qbase::qtip',) + revrange
 q = repo.mq
 if not q.applied:
 ui.status(_('no patches applied\n'))

changeset 12281	d9cf0d1d0d0f
parent 12266	00658492e2aa
child 12282	9e457c3f47d9