hgext/shelve.py
changeset 19885 6cc696179869
parent 19881 821a89018f17
child 19887 dd7c294365f0
equal deleted inserted replaced
19884:fc3fbca35085 19885:6cc696179869
   154 
   154 
   155     def commitfunc(ui, repo, message, match, opts):
   155     def commitfunc(ui, repo, message, match, opts):
   156         # check modified, added, removed, deleted only
   156         # check modified, added, removed, deleted only
   157         for flist in repo.status(match=match)[:4]:
   157         for flist in repo.status(match=match)[:4]:
   158             shelvedfiles.extend(flist)
   158             shelvedfiles.extend(flist)
   159         saved, repo.mq.checkapplied = repo.mq.checkapplied, False
   159         hasmq = util.safehasattr(repo, 'mq')
       
   160         if hasmq:
       
   161             saved, repo.mq.checkapplied = repo.mq.checkapplied, False
   160         try:
   162         try:
   161             return repo.commit(message, user, opts.get('date'), match)
   163             return repo.commit(message, user, opts.get('date'), match)
   162         finally:
   164         finally:
   163             repo.mq.checkapplied = saved
   165             if hasmq:
       
   166                 repo.mq.checkapplied = saved
   164 
   167 
   165     if parent.node() != nullid:
   168     if parent.node() != nullid:
   166         desc = parent.description().split('\n', 1)[0]
   169         desc = parent.description().split('\n', 1)[0]
   167     else:
   170     else:
   168         desc = '(empty repository)'
   171         desc = '(empty repository)'