mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
A Scalable, User-Friendly Source Control System.
42c14b3ed1
I accidentally did 'hg forget .' and tried to undo the operation with 'hg add .'. I expected the files to be reported as either modified or clean, but they were still reported as removed. It turns out that forgotten files are only added back if they are listed explicitly, as shown by the following two invocations. This makes it hard to recover from the mistake of forgetting a lot of files. $ hg forget README && hg add README && hg status -A README C README $ hg forget README && hg add . && hg status -A README R README The problem lies in cmdutil.add(). That method checks that the file isn't already tracked before adding it, but it does so by checking the dirstate, which does have an entry for forgotten files (state 'r'). We should instead be checking whether the file exists in the workingctx. The workingctx is also what we later call add() on, and that method takes care of transforming the add() into a normallookup() on the dirstate. Since we're changing repo.dirstate into wctx, let's also change repo.walk into wctx.walk for consistency (repo.walk calls wctx.walk, so we're simply inlining the call). |
||
|---|---|---|
| contrib | ||
| doc | ||
| hgext | ||
| i18n | ||
| mercurial | ||
| tests | ||
| .hgignore | ||
| .hgsigs | ||
| CONTRIBUTORS | ||
| COPYING | ||
| hg | ||
| hgeditor | ||
| hgweb.cgi | ||
| Makefile | ||
| README | ||
| setup.py | ||
Mercurial ========= Mercurial is a fast, easy to use, distributed revision control tool for software developers. Basic install: $ make # see install targets $ make install # do a system-wide install $ hg debuginstall # sanity-check setup $ hg # see help Running without installing: $ make local # build for inplace usage $ ./hg --version # should show the latest version See http://mercurial.selenic.com/ for detailed installation instructions, platform-specific notes, and Mercurial user information.