Patchwork D3032: narrow: add trailing slash to dir earlier for debug{revlog, index, data}

login
register
mail settings
Submitter phabricator
Date April 3, 2018, 12:48 p.m.
Message ID <df3e6b4aa4c91f4a69807beb1b62352a@localhost.localdomain>
Download mbox | patch
Permalink /patch/30159/
State Not Applicable
Headers show

Comments

phabricator - April 3, 2018, 12:48 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6ff8bd691fb8: narrow: add trailing slash to dir earlier for debug{revlog,index,data} (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3032?vs=7533&id=7536

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

AFFECTED FILES
  hgext/narrow/narrowrevlog.py
  mercurial/cmdutil.py
  mercurial/manifest.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -1160,8 +1160,6 @@ 
 
         if dir:
             assert self._treeondisk, 'opts is %r' % opts
-            if not dir.endswith('/'):
-                dir = dir + '/'
 
         if indexfile is None:
             indexfile = '00manifest.i'
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1058,6 +1058,8 @@ 
             if 'treemanifest' not in repo.requirements:
                 raise error.Abort(_("--dir can only be used on repos with "
                                    "treemanifest enabled"))
+            if not dir.endswith('/'):
+                dir = dir + '/'
             dirlog = repo.manifestlog._revlog.dirlog(dir)
             if len(dirlog):
                 r = dirlog
diff --git a/hgext/narrow/narrowrevlog.py b/hgext/narrow/narrowrevlog.py
--- a/hgext/narrow/narrowrevlog.py
+++ b/hgext/narrow/narrowrevlog.py
@@ -117,8 +117,6 @@ 
         # at least some push operations. This will be used to wrap/exclude the
         # child directories when using treemanifests.
         def dirlog(self, d):
-            if d and not d.endswith('/'):
-                d = d + '/'
             if not repo.narrowmatch().visitdir(d[:-1] or '.'):
                 return excludedmanifestrevlog(d)
             result = super(narrowmanifestrevlog, self).dirlog(d)