This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2235

manifest: add support for including directories outside narrowspec
ClosedPublic

Authored by martinvonz on Feb 13 2018, 5:48 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5c9bdfb32eac: manifest: add support for including directories outside narrowspec
Summary

When using tree manifests and the client doesn't have a directory, we
have two choices for what to do with "hg manifest" output: 1) ignore
the directory, and 2) include the directory (not files within it). For
"hg files", we decided to ignore the directories (and files) outside
the narrowspec.

If we choose to not include directories outside the narrowspec, then I
think we should also make sure we don't include files outside the
narrowspec. I also think we should add --outside-narrow flag (or other
name). Thus, whichever way we go, I think we should have a way of
displaying paths (files or directories) outside the narrowspec. For
that we'll need to handle the 't' flag that narrowhg uses, and that's
what this patch adds support for.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 13 2018, 5:48 PM
durin42 accepted this revision.Feb 14 2018, 8:34 PM
This revision is now accepted and ready to land.Feb 14 2018, 8:34 PM
Closed by commit rHG5c9bdfb32eac: manifest: add support for including directories outside narrowspec (authored by martinvonz). · Explain WhyFeb 14 2018, 9:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)
Mtests/test-narrow-commit.t (8 lines)

Diff 5657

mercurial/commands.py

return return
if rev and node: if rev and node:
raise error.Abort(_("please specify just one revision")) raise error.Abort(_("please specify just one revision"))
if not node: if not node:
node = rev node = rev
char = {'l': '@', 'x': '*', '': ''} char = {'l': '@', 'x': '*', '': '', 't': 'd'}
mode = {'l': '644', 'x': '755', '': '644'} mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
if node: if node:
repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
ctx = scmutil.revsingle(repo, node) ctx = scmutil.revsingle(repo, node)
mf = ctx.manifest() mf = ctx.manifest()
ui.pager('manifest') ui.pager('manifest')
for f in ctx: for f in ctx:
fm.startitem() fm.startitem()
fl = ctx[f].flags() fl = ctx[f].flags()

tests/test-narrow-commit.t

A inside/f3 A inside/f3
$ hg revert -qC . $ hg revert -qC .
$ rm inside/f3 $ rm inside/f3
Can commit changes inside. Leaves outside unchanged. Can commit changes inside. Leaves outside unchanged.
$ hg update -q 'desc("initial")' $ hg update -q 'desc("initial")'
$ echo modified2 > inside/f1 $ echo modified2 > inside/f1
$ hg manifest --debug
4d6a634d5ba06331a60c29ee0db8412490a54fcd 644 inside/f1
7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
$ hg commit -m 'modify inside/f1' $ hg commit -m 'modify inside/f1'
created new head created new head
$ hg files -r . $ hg files -r .
inside/f1 inside/f1
outside/f1 (flat !) outside/f1 (flat !)
outside/ (tree !) outside/ (tree !)
$ hg manifest --debug
3f4197b4a11b9016e77ebc47fe566944885fd11b 644 inside/f1
7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
Some filesystems (notably FAT/exFAT only store timestamps with 2 Some filesystems (notably FAT/exFAT only store timestamps with 2
seconds of precision, so by sleeping for 3 seconds, we can ensure that seconds of precision, so by sleeping for 3 seconds, we can ensure that
the timestamps of files stored by dirstate will appear older than the the timestamps of files stored by dirstate will appear older than the
dirstate file, and therefore we'll be able to get stable output from dirstate file, and therefore we'll be able to get stable output from
debugdirstate. If we don't do this, the test can be slightly flaky. debugdirstate. If we don't do this, the test can be slightly flaky.
$ sleep 3 $ sleep 3
$ hg status $ hg status
$ hg debugdirstate --nodates $ hg debugdirstate --nodates
n 644 10 set inside/f1 n 644 10 set inside/f1