This is an archive of the discontinued Mercurial Phabricator instance.

Differential D788

sparse: get data for excluded files from working copy parent
ClosedPublic

Authored by mbthomas on Sep 22 2017, 6:43 AM.
Tags
None
Subscribers
durham, ryanmce

Details

Reviewers
ryanmce
durham
Group Reviewers
Restricted Project
Commits
rFBHGX0654bba9a9cf: sparse: get data for excluded files from working copy parent
Summary

When commands like 'diff' request the contents of files from a workingfilectx,
normally this is satisfied by reading from disk. For files outside the sparse
checkout this doesn't work, so instead we must return the content from the
working copy parent.

Test Plan

tests/test-sparse-diff.t

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Sep 22 2017, 6:43 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 22 2017, 6:43 AM
ryanmce accepted this revision.Sep 22 2017, 8:26 AM
ryanmce added a subscriber: ryanmce.

The change looks good to me. It would be informative to comment on the test what the error was before this change.

I think it might be worth some follow-ups for the weird edge cases we talked about: a sparse-excluded filename being in the working copy -- should we warn in this case? Diff against it with a warning? Diff against the "real" one with a warning?

However, this is clearly better than what we have now and we should get it in, and perhaps into the upstream sparse as well.

This revision is now accepted and ready to land.Sep 22 2017, 8:26 AM
mbthomas added a comment.Sep 22 2017, 10:35 AM

Files in the working copy that alias sparse-excluded files are completely ignored by other commands (for example, they don't even show up in hg status), so I think ignoring here is fine, too.

I'm about to push a change that refactors this in preparation for my next diff. This is just to clean it up a bit.

durham accepted this revision.Sep 22 2017, 6:39 PM
durham added a subscriber: durham.

Hmm, seems a bit odd for the wctx to kinda lie about the data in the working copy. But the diff behavior is clearly better than it was before. Guess we'll see.

Closed by commit rFBHGX0654bba9a9cf: sparse: get data for excluded files from working copy parent (authored by mbthomas). · Explain WhySep 26 2017, 5:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/sparse.py (13 lines)
AMtests/test-sparse-diff.t (31 lines)

Diff 2097

hgext3rd/sparse.py

_setupupdates(ui) _setupupdates(ui)
_setupcommit(ui) _setupcommit(ui)
def extsetup(ui): def extsetup(ui):
_setupclone(ui) _setupclone(ui)
_setuplog(ui) _setuplog(ui)
_setupadd(ui) _setupadd(ui)
_setupdirstate(ui) _setupdirstate(ui)
_setupdiff(ui)
# if fsmonitor is enabled, tell it to use our hash function # if fsmonitor is enabled, tell it to use our hash function
try: try:
fsmonitor = extensions.find('fsmonitor') fsmonitor = extensions.find('fsmonitor')
def _hashignore(orig, ignore): def _hashignore(orig, ignore):
return _hashmatcher(ignore) return _hashmatcher(ignore)
extensions.wrapfunction(fsmonitor, '_hashignore', _hashignore) extensions.wrapfunction(fsmonitor, '_hashignore', _hashignore)
except KeyError: except KeyError:
pass pass
if (f is not None and not sparsematch(f) and if (f is not None and not sparsematch(f) and
f not in dirstate): f not in dirstate):
raise error.Abort(_("cannot add '%s' - it is outside " raise error.Abort(_("cannot add '%s' - it is outside "
"the sparse checkout") % f, "the sparse checkout") % f,
hint=hint) hint=hint)
return orig(self, *args) return orig(self, *args)
extensions.wrapfunction(dirstate.dirstate, func, _wrapper) extensions.wrapfunction(dirstate.dirstate, func, _wrapper)
def _setupdiff(ui):
# wrap workingfilectx's data function to return the data for files
# outside the sparse checkout by fetching from the working copy parent.
def workingfilectxdata(orig, self):
sparsematch = self.repo().sparsematch()
if sparsematch(self._path):
return orig(self)
else:
basectx = self._changectx._parents[0]
return basectx[self._path].data()
extensions.wrapfunction(context.workingfilectx, 'data', workingfilectxdata)
def _wraprepo(ui, repo): def _wraprepo(ui, repo):
class SparseRepo(repo.__class__): class SparseRepo(repo.__class__):
def readsparseconfig(self, raw): def readsparseconfig(self, raw):
"""Takes a string sparse config and returns the includes, """Takes a string sparse config and returns the includes,
excludes, and profiles it specified. excludes, and profiles it specified.
""" """
includes = set() includes = set()
excludes = set() excludes = set()

tests/test-sparse-diff.t

  • This file was added.
$ hg init repo
$ cd repo
$ cat > .hg/hgrc <<EOF
> [extensions]
> sparse=$TESTDIR/../hgext3rd/sparse.py
> EOF
$ mkdir a b
$ echo a1 > a/a
$ echo b1 > b/b
$ hg add a/a b/b
$ hg commit -m "add files"
$ echo a2 > a/a
$ echo b2 > b/b
$ hg commit -m "modify files"
$ hg sparse --exclude b
Run diff. This should still show the file contents of excluded files (and should not crash).
$ hg diff -r ".^"
diff -r 45479a47b024 a/a
--- a/a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-a1
+a2
diff -r 45479a47b024 b/b
--- a/b/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b/b Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-b1
+b2