Patchwork D7437: commit: rewrite check for `hg ci <path>` being a directory

login
register
mail settings
Submitter phabricator
Date Nov. 19, 2019, 1:13 p.m.
Message ID <6743feb866d11add7724f0b155d6553a@localhost.localdomain>
Download mbox | patch
Permalink /patch/43354/
State Not Applicable
Headers show

Comments

phabricator - Nov. 19, 2019, 1:13 p.m.
Closed by commit rHG7f443cce2972: commit: rewrite check for `hg ci &lt;path&gt;` being a directory (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7437?vs=18172&id=18234

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7437/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7437

AFFECTED FILES
  mercurial/localrepo.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2800,7 +2800,8 @@ 
                     continue
                 if f in status.deleted:
                     fail(f, _(b'file not found!'))
-                if f in vdirs:  # visited directory
+                # Is it a directory that exists or used to exist?
+                if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
                     d = f + b'/'
                     for mf in matched:
                         if mf.startswith(d):