hgext/mq.py
changeset 36607 c6061cadb400
parent 36389 469c7e146c8f
child 36632 9e2866065982
equal deleted inserted replaced
36606:4de15c54e59f 36607:c6061cadb400
    96     smartset,
    96     smartset,
    97     subrepoutil,
    97     subrepoutil,
    98     util,
    98     util,
    99     vfs as vfsmod,
    99     vfs as vfsmod,
   100 )
   100 )
       
   101 from mercurial.utils import dateutil
   101 
   102 
   102 release = lockmod.release
   103 release = lockmod.release
   103 seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
   104 seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
   104 
   105 
   105 cmdtable = {}
   106 cmdtable = {}
  1199         edit = opts.get('edit')
  1200         edit = opts.get('edit')
  1200         editform = opts.get('editform', 'mq.qnew')
  1201         editform = opts.get('editform', 'mq.qnew')
  1201         user = opts.get('user')
  1202         user = opts.get('user')
  1202         date = opts.get('date')
  1203         date = opts.get('date')
  1203         if date:
  1204         if date:
  1204             date = util.parsedate(date)
  1205             date = dateutil.parsedate(date)
  1205         diffopts = self.diffopts({'git': opts.get('git')}, plain=True)
  1206         diffopts = self.diffopts({'git': opts.get('git')}, plain=True)
  1206         if opts.get('checkname', True):
  1207         if opts.get('checkname', True):
  1207             self.checkpatchname(patchfn)
  1208             self.checkpatchname(patchfn)
  1208         inclsubs = checksubstate(repo)
  1209         inclsubs = checksubstate(repo)
  1209         if inclsubs:
  1210         if inclsubs:
  1642         edit = opts.get('edit')
  1643         edit = opts.get('edit')
  1643         editform = opts.get('editform', 'mq.qrefresh')
  1644         editform = opts.get('editform', 'mq.qrefresh')
  1644         newuser = opts.get('user')
  1645         newuser = opts.get('user')
  1645         newdate = opts.get('date')
  1646         newdate = opts.get('date')
  1646         if newdate:
  1647         if newdate:
  1647             newdate = '%d %d' % util.parsedate(newdate)
  1648             newdate = '%d %d' % dateutil.parsedate(newdate)
  1648         wlock = repo.wlock()
  1649         wlock = repo.wlock()
  1649 
  1650 
  1650         try:
  1651         try:
  1651             self.checktoppatch(repo)
  1652             self.checktoppatch(repo)
  1652             (top, patchfn) = (self.applied[-1].node, self.applied[-1].name)
  1653             (top, patchfn) = (self.applied[-1].node, self.applied[-1].name)
  2594 
  2595 
  2595 def setupheaderopts(ui, opts):
  2596 def setupheaderopts(ui, opts):
  2596     if not opts.get('user') and opts.get('currentuser'):
  2597     if not opts.get('user') and opts.get('currentuser'):
  2597         opts['user'] = ui.username()
  2598         opts['user'] = ui.username()
  2598     if not opts.get('date') and opts.get('currentdate'):
  2599     if not opts.get('date') and opts.get('currentdate'):
  2599         opts['date'] = "%d %d" % util.makedate()
  2600         opts['date'] = "%d %d" % dateutil.makedate()
  2600 
  2601 
  2601 @command("^qnew",
  2602 @command("^qnew",
  2602          [('e', 'edit', None, _('invoke editor on commit messages')),
  2603          [('e', 'edit', None, _('invoke editor on commit messages')),
  2603           ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')),
  2604           ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')),
  2604           ('g', 'git', None, _('use git extended diff format')),
  2605           ('g', 'git', None, _('use git extended diff format')),