hgext/mq.py
changeset 8362 bbc74c05b8a4
parent 8288 9de088320e9a
child 8366 0bf0045000b5
equal deleted inserted replaced
8361:d8c5a7f25a40 8362:bbc74c05b8a4
  1691     q = repo.mq
  1691     q = repo.mq
  1692     q.qimport(repo, filename, patchname=opts['name'],
  1692     q.qimport(repo, filename, patchname=opts['name'],
  1693               existing=opts['existing'], force=opts['force'], rev=opts['rev'],
  1693               existing=opts['existing'], force=opts['force'], rev=opts['rev'],
  1694               git=opts['git'])
  1694               git=opts['git'])
  1695     q.save_dirty()
  1695     q.save_dirty()
       
  1696 
       
  1697     if opts.get('push') and not opts.get('rev'):
       
  1698         return q.push(repo, None)
  1696     return 0
  1699     return 0
  1697 
  1700 
  1698 def init(ui, repo, **opts):
  1701 def init(ui, repo, **opts):
  1699     """init a new queue repository
  1702     """init a new queue repository
  1700 
  1703 
  2520         (qimport,
  2523         (qimport,
  2521          [('e', 'existing', None, _('import file in patch directory')),
  2524          [('e', 'existing', None, _('import file in patch directory')),
  2522           ('n', 'name', '', _('patch file name')),
  2525           ('n', 'name', '', _('patch file name')),
  2523           ('f', 'force', None, _('overwrite existing files')),
  2526           ('f', 'force', None, _('overwrite existing files')),
  2524           ('r', 'rev', [], _('place existing revisions under mq control')),
  2527           ('r', 'rev', [], _('place existing revisions under mq control')),
  2525           ('g', 'git', None, _('use git extended diff format'))],
  2528           ('g', 'git', None, _('use git extended diff format')),
  2526          _('hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...')),
  2529           ('P', 'push', None, _('qpush after importing'))],
       
  2530          _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')),
  2527     "^qinit":
  2531     "^qinit":
  2528         (init,
  2532         (init,
  2529          [('c', 'create-repo', None, _('create queue repository'))],
  2533          [('c', 'create-repo', None, _('create queue repository'))],
  2530          _('hg qinit [-c]')),
  2534          _('hg qinit [-c]')),
  2531     "qnew":
  2535     "qnew":