mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
44343769f8
Summary: We want to rename away from "mercurial". Rather than rename the "mercurial" Python package, we opted to just collapse it into the parent "edenscm" package. This is also a step towards further organizing we want to do around the new project name. To ease the transition wrt hotfixes, we now replace "edenscm.mercurial" with "mercurial" to fix imports within base64-python extensions. Reviewed By: sggutier Differential Revision: D38943169 fbshipit-source-id: 03fa18079c51e2f7fac05d65b127095da3ab7c99
102 lines
2.5 KiB
Perl
102 lines
2.5 KiB
Perl
#chg-compatible
|
|
#debugruntest-compatible
|
|
|
|
Setup:
|
|
$ newext eval <<EOF
|
|
> from __future__ import absolute_import
|
|
> import filecmp
|
|
> from edenscm import commands, context, registrar
|
|
> cmdtable = {}
|
|
> command = registrar.command(cmdtable)
|
|
> @command('eval', [], 'hg eval CMD')
|
|
> def eval_(ui, repo, *cmds, **opts):
|
|
> cmd = " ".join(cmds)
|
|
> res = str(eval(cmd, globals(), locals()))
|
|
> ui.warn("%s" % res)
|
|
> EOF
|
|
|
|
Arbitraryfilectx.cmp does not follow symlinks:
|
|
$ mkdir case1
|
|
$ cd case1
|
|
$ hg init
|
|
#if symlink
|
|
$ printf "A" > real_A
|
|
$ printf "foo" > A
|
|
$ printf "foo" > B
|
|
$ ln -s A sym_A
|
|
$ hg add .
|
|
adding A
|
|
adding B
|
|
adding real_A
|
|
adding sym_A
|
|
$ hg commit -m "base"
|
|
#else
|
|
$ hg import -q --bypass - <<EOF
|
|
> # HG changeset patch
|
|
> # User test
|
|
> # Date 0 0
|
|
> base
|
|
>
|
|
> diff --git a/A b/A
|
|
> new file mode 100644
|
|
> --- /dev/null
|
|
> +++ b/A
|
|
> @@ -0,0 +1,1 @@
|
|
> +foo
|
|
> \ No newline at end of file
|
|
> diff --git a/B b/B
|
|
> new file mode 100644
|
|
> --- /dev/null
|
|
> +++ b/B
|
|
> @@ -0,0 +1,1 @@
|
|
> +foo
|
|
> \ No newline at end of file
|
|
> diff --git a/real_A b/real_A
|
|
> new file mode 100644
|
|
> --- /dev/null
|
|
> +++ b/real_A
|
|
> @@ -0,0 +1,1 @@
|
|
> +A
|
|
> \ No newline at end of file
|
|
> diff --git a/sym_A b/sym_A
|
|
> new file mode 120000
|
|
> --- /dev/null
|
|
> +++ b/sym_A
|
|
> @@ -0,0 +1,1 @@
|
|
> +A
|
|
> \ No newline at end of file
|
|
> EOF
|
|
$ hg up -q
|
|
#endif
|
|
|
|
These files are different and should return True (different):
|
|
(Note that filecmp.cmp's return semantics are inverted from ours, so we invert
|
|
for simplicity):
|
|
$ hg eval "context.arbitraryfilectx('A', repo).cmp(repo[None]['real_A'])"
|
|
True (no-eol)
|
|
$ hg eval "not filecmp.cmp('A', 'real_A')"
|
|
True (no-eol)
|
|
|
|
These files are identical and should return False (same):
|
|
$ hg eval "context.arbitraryfilectx('A', repo).cmp(repo[None]['A'])"
|
|
False (no-eol)
|
|
$ hg eval "context.arbitraryfilectx('A', repo).cmp(repo[None]['B'])"
|
|
False (no-eol)
|
|
$ hg eval "not filecmp.cmp('A', 'B')"
|
|
False (no-eol)
|
|
|
|
This comparison should also return False, since A and sym_A are substantially
|
|
the same in the eyes of ``filectx.cmp``, which looks at data only.
|
|
$ hg eval "context.arbitraryfilectx('real_A', repo).cmp(repo[None]['sym_A'])"
|
|
False (no-eol)
|
|
|
|
A naive use of filecmp on those two would wrongly return True, since it follows
|
|
the symlink to "A", which has different contents.
|
|
#if symlink
|
|
$ hg eval "not filecmp.cmp('real_A', 'sym_A')"
|
|
True (no-eol)
|
|
#else
|
|
$ hg eval "not filecmp.cmp('real_A', 'sym_A')"
|
|
False (no-eol)
|
|
#endif
|