mercurial/cmdutil.py
changeset 41173 4145fd3569c3
parent 41125 126101284e04
child 41206 6acbe86c6490
equal deleted inserted replaced
41172:3dcc96582627 41173:4145fd3569c3
  2448                                 'exclusive'))
  2448                                 'exclusive'))
  2449         if opts.get('date'):
  2449         if opts.get('date'):
  2450             date = dateutil.parsedate(opts.get('date'))
  2450             date = dateutil.parsedate(opts.get('date'))
  2451         elif opts.get('currentdate'):
  2451         elif opts.get('currentdate'):
  2452             date = dateutil.makedate()
  2452             date = dateutil.makedate()
  2453         elif ui.configbool('rewrite', 'update-timestamp'):
  2453         elif (ui.configbool('rewrite', 'update-timestamp')
       
  2454               and opts.get('currentdate') is None):
  2454             date = dateutil.makedate()
  2455             date = dateutil.makedate()
  2455             datemaydiffer = True
  2456             datemaydiffer = True
  2456         else:
  2457         else:
  2457             date = old.date()
  2458             date = old.date()
  2458 
  2459