This is an archive of the discontinued Mercurial Phabricator instance.

Differential D797

sparse: add --sparse option to hg diff
ClosedPublic

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

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGXb4df4123d0e9: sparse: add --sparse option to hg diff
Summary

Add a --sparse option to hg diff which filters the diff to include only files
that are part of the sparse profile.

When files are moved or copied across the sparse profile boundary, they will
show as added or removed (for moves) in the diff. This is the same behaviour
as hg diff --root.

Test Plan

Expand 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, 10:39 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 22 2017, 10:39 AM
durham accepted this revision.Sep 22 2017, 12:51 PM
durham added a subscriber: durham.

I'm not sure how I feel about this showing add/delete for changes that cross the sparse boundary. But as long as it's an opt-in option, I'm fine with experimenting with it.

What was the motivation for this diff? Just out of curiousity

hgext3rd/sparse.py
371

When wrapping something for the duration of just this function call, you should use try/finally and put an extensions.unwrapfunction in the finally clause. That way we aren't depending on the process dying to clean this up.

This revision is now accepted and ready to land.Sep 22 2017, 12:51 PM
mbthomas updated this revision to Diff 2031.Sep 22 2017, 1:31 PM
ryanmce added a subscriber: ryanmce.Sep 22 2017, 1:34 PM

I'm not sure how I feel about this showing add/delete for changes that cross the sparse boundary. But as long as it's an opt-in option, I'm fine with experimenting with it.

This is the same way hg --root behaves so I think it's reasonable.

Closed by commit rFBHGXb4df4123d0e9: sparse: add --sparse option to hg diff (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 (26 lines)
Mtests/test-sparse-diff.t (114 lines)

Diff 2096

hgext3rd/sparse.py

# sparse.py - allow sparse checkouts of the working directory # sparse.py - allow sparse checkouts of the working directory
# #
# Copyright 2014 Facebook, Inc. # Copyright 2014 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
"""allow sparse checkouts of the working directory """allow sparse checkouts of the working directory
""" """
from mercurial import util, cmdutil, extensions, context, dirstate, commands from mercurial import util, cmdutil, extensions, context, dirstate, commands
from mercurial import localrepo, error, hg, pathutil, registrar from mercurial import localrepo, error, hg, pathutil, registrar, patch
from mercurial import match as matchmod from mercurial import match as matchmod
from mercurial import merge as mergemod from mercurial import merge as mergemod
from mercurial.node import nullid from mercurial.node import nullid
from mercurial.i18n import _ from mercurial.i18n import _
import os, collections, hashlib import os, collections, hashlib
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
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): def _setupdiff(ui):
entry = commands.table['^diff']
entry[1].append(('s', 'sparse', None,
'only show changes in files in the sparse config'))
# wrap workingfilectx's data function to return the data for files # wrap workingfilectx's data function to return the data for files
# outside the sparse checkout by fetching from the working copy parent. # outside the sparse checkout by fetching from the working copy parent.
def workingfilectxdata(orig, self): def workingfilectxdata(orig, self):
sparsematch = self.repo().sparsematch() sparsematch = self.repo().sparsematch()
if sparsematch(self._path): if sparsematch(self._path):
return orig(self) return orig(self)
else: else:
basectx = self._changectx._parents[0] basectx = self._changectx._parents[0]
return basectx[self._path].data() return basectx[self._path].data()
extensions.wrapfunction(context.workingfilectx, 'data', workingfilectxdata) extensions.wrapfunction(context.workingfilectx, 'data', workingfilectxdata)
# wrap trydiff to filter diffs if '--sparse' is set
def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, opts, losedatafn, prefix, relroot):
sparsematch = repo.sparsematch()
modified = filter(sparsematch, modified)
added = filter(sparsematch, added)
removed = filter(sparsematch, removed)
copy = dict((d, s) for d, s in copy.items() if sparsematch(s))
return orig(repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, opts, losedatafn, prefix, relroot)
def diff(orig, ui, repo, *pats, **opts):
issparse = bool(opts.get('sparse'))
if issparse:
durhamUnsubmitted
Not Done

When wrapping something for the duration of just this function call, you should use try/finally and put an extensions.unwrapfunction in the finally clause. That way we aren't depending on the process dying to clean this up.

durham: When wrapping something for the duration of just this function call, you should use try/finally…
extensions.wrapfunction(patch, 'trydiff', trydiff)
try:
orig(ui, repo, *pats, **opts)
finally:
if issparse:
extensions.unwrapfunction(patch, 'trydiff', trydiff)
extensions.wrapcommand(commands.table, 'diff', diff)
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

$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat > .hg/hgrc <<EOF $ cat > .hg/hgrc <<EOF
> [extensions] > [extensions]
> sparse=$TESTDIR/../hgext3rd/sparse.py > sparse=$TESTDIR/../hgext3rd/sparse.py
> EOF > EOF
$ mkdir a b $ mkdir show hide
$ echo a1 > a/a $ echo show-modify-1 > show/modify
$ echo b1 > b/b $ echo show-remove-1 > show/remove
$ hg add a/a b/b $ echo hide-modify-1 > hide/modify
$ hg commit -m "add files" $ echo hide-remove-1 > hide/remove
$ echo a2 > a/a $ echo show-moveout > show/moveout
$ echo b2 > b/b $ echo show-movein > hide/movein
$ hg commit -m "modify files" $ hg add show/modify show/remove hide/modify hide/remove show/moveout hide/movein
$ hg sparse --exclude b $ hg commit -m "first revision"
$ echo show-modify-2 > show/modify
$ echo show-add-2 > show/add ; hg add show/add
$ hg rm show/remove
$ echo hide-modify-2 > hide/modify
$ echo hide-add-2 > hide/add ; hg add hide/add
$ hg rm hide/remove
$ hg mv hide/movein show/movein
$ hg mv show/moveout hide/moveout
$ hg commit -m "second revision"
$ hg sparse --exclude hide
Run diff. This should still show the file contents of excluded files (and should not crash). Run diff. This should still show the file contents of excluded files (and should not crash).
$ hg diff -r ".^" $ hg diff -r ".^" --git
diff -r 45479a47b024 a/a diff --git a/hide/add b/hide/add
--- a/a/a Thu Jan 01 00:00:00 1970 +0000 new file mode 100644
+++ b/a/a Thu Jan 01 00:00:00 1970 +0000 --- /dev/null
+++ b/hide/add
@@ -0,0 +1,1 @@
+hide-add-2
diff --git a/hide/modify b/hide/modify
--- a/hide/modify
+++ b/hide/modify
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-a1 -hide-modify-1
+a2 +hide-modify-2
diff -r 45479a47b024 b/b diff --git a/show/moveout b/hide/moveout
--- a/b/b Thu Jan 01 00:00:00 1970 +0000 rename from show/moveout
+++ b/b/b Thu Jan 01 00:00:00 1970 +0000 rename to hide/moveout
diff --git a/hide/remove b/hide/remove
deleted file mode 100644
--- a/hide/remove
+++ /dev/null
@@ -1,1 +0,0 @@
-hide-remove-1
diff --git a/show/add b/show/add
new file mode 100644
--- /dev/null
+++ b/show/add
@@ -0,0 +1,1 @@
+show-add-2
diff --git a/show/modify b/show/modify
--- a/show/modify
+++ b/show/modify
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-b1 -show-modify-1
+b2 +show-modify-2
diff --git a/hide/movein b/show/movein
rename from hide/movein
rename to show/movein
diff --git a/show/remove b/show/remove
deleted file mode 100644
--- a/show/remove
+++ /dev/null
@@ -1,1 +0,0 @@
-show-remove-1
Run diff --sparse. This should only show files within the sparse profile.
$ hg diff --sparse --git -r ".^"
diff --git a/show/add b/show/add
new file mode 100644
--- /dev/null
+++ b/show/add
@@ -0,0 +1,1 @@
+show-add-2
diff --git a/show/modify b/show/modify
--- a/show/modify
+++ b/show/modify
@@ -1,1 +1,1 @@
-show-modify-1
+show-modify-2
diff --git a/show/movein b/show/movein
new file mode 100644
--- /dev/null
+++ b/show/movein
@@ -0,0 +1,1 @@
+show-movein
diff --git a/show/moveout b/show/moveout
deleted file mode 100644
--- a/show/moveout
+++ /dev/null
@@ -1,1 +0,0 @@
-show-moveout
diff --git a/show/remove b/show/remove
deleted file mode 100644
--- a/show/remove
+++ /dev/null
@@ -1,1 +0,0 @@
-show-remove-1