hgext/mq.py
changeset 26654 30657909b2ba
parent 26587 56b2bcea2529
child 26736 143b52fce68e
equal deleted inserted replaced
26653:cffc4f7c6c36 26654:30657909b2ba
  1426                     ret = self.apply(repo, s, list, all_files=all_files,
  1426                     ret = self.apply(repo, s, list, all_files=all_files,
  1427                                      tobackup=tobackup, keepchanges=keepchanges)
  1427                                      tobackup=tobackup, keepchanges=keepchanges)
  1428             except AbortNoCleanup:
  1428             except AbortNoCleanup:
  1429                 raise
  1429                 raise
  1430             except: # re-raises
  1430             except: # re-raises
  1431                 self.ui.warn(_('cleaning up working directory...'))
  1431                 self.ui.warn(_('cleaning up working directory...\n'))
  1432                 node = repo.dirstate.p1()
  1432                 cmdutil.revert(self.ui, repo, repo['.'],
  1433                 hg.revert(repo, node, None)
  1433                                repo.dirstate.parents(), no_backup=True)
  1434                 # only remove unknown files that we know we touched or
  1434                 # only remove unknown files that we know we touched or
  1435                 # created while patching
  1435                 # created while patching
  1436                 for f in all_files:
  1436                 for f in all_files:
  1437                     if f not in repo.dirstate:
  1437                     if f not in repo.dirstate:
  1438                         util.unlinkpath(repo.wjoin(f), ignoremissing=True)
  1438                         util.unlinkpath(repo.wjoin(f), ignoremissing=True)