##// END OF EJS Templates
context: make forget work like commands.forget...
Matt Mackall -
r14435:5f6090e5 default
parent child Browse files
Show More
@@ -735,8 +735,7 b' class queue(object):'
735 735 if not keep:
736 736 r = self.qrepo()
737 737 if r:
738 r[None].remove(patches, True)
739 else:
738 r[None].forget(patches)
740 739 for p in patches:
741 740 os.unlink(self.join(p))
742 741
@@ -2623,7 +2622,7 b' def rename(ui, repo, patch, name=None, *'
2623 2622 if r.dirstate[name] == 'r':
2624 2623 wctx.undelete([name])
2625 2624 wctx.copy(patch, name)
2626 wctx.remove([patch], False)
2625 wctx.forget([patch])
2627 2626 finally:
2628 2627 wlock.release()
2629 2628
@@ -2269,7 +2269,7 b' def forget(ui, repo, *pats, **opts):'
2269 2269 if ui.verbose or not m.exact(f):
2270 2270 ui.status(_('removing %s\n') % m.rel(f))
2271 2271
2272 repo[None].remove(forget, unlink=False)
2272 repo[None].forget(forget)
2273 2273 return errs
2274 2274
2275 2275 @command('grep',
@@ -835,12 +835,14 b' class workingctx(changectx):'
835 835 finally:
836 836 wlock.release()
837 837
838 def forget(self, list):
838 def forget(self, files):
839 839 wlock = self._repo.wlock()
840 840 try:
841 for f in list:
841 for f in files:
842 842 if self._repo.dirstate[f] != 'a':
843 self._repo.ui.warn(_("%s not added!\n") % f)
843 self._repo.dirstate.remove(f)
844 elif f not in self._repo.dirstate:
845 self._repo.ui.warn(_("%s not tracked!\n") % f)
844 846 else:
845 847 self._repo.dirstate.drop(f)
846 848 finally:
@@ -489,7 +489,7 b' class workingbackend(fsbackend):'
489 489 scmutil.dirstatecopy(self.ui, self.repo, wctx, src, dst)
490 490 addremoved.discard(src)
491 491 if (not self.similarity) and self.removed:
492 wctx.remove(sorted(self.removed))
492 wctx.forget(sorted(self.removed))
493 493 if addremoved:
494 494 cwd = self.repo.getcwd()
495 495 if cwd:
@@ -623,7 +623,7 b' def addremove(repo, pats=[], opts={}, dr'
623 623 wctx = repo[None]
624 624 wlock = repo.wlock()
625 625 try:
626 wctx.remove(deleted)
626 wctx.forget(deleted)
627 627 wctx.add(unknown)
628 628 for new, old in copies.iteritems():
629 629 wctx.copy(old, new)
General Comments 0
You need to be logged in to leave comments. Login now