##// END OF EJS Templates
phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

File last commit:

r37334:9954d0e2 default
r41198:0101a35d default
Show More
test-arbitraryfilectx.t
101 lines | 2.6 KiB | text/troff | Tads3Lexer
/ tests / test-arbitraryfilectx.t
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 Setup:
$ cat > eval.py <<EOF
> from __future__ import absolute_import
> import filecmp
Pulkit Goyal
py3: use pycompat.bytestr() intsead of str...
r37334 > from mercurial import commands, context, pycompat, registrar
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 > cmdtable = {}
> command = registrar.command(cmdtable)
Pulkit Goyal
py3: add missing b'' in test-arbitraryfilectx.t...
r36400 > @command(b'eval', [], b'hg eval CMD')
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 > def eval_(ui, repo, *cmds, **opts):
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 > cmd = b" ".join(cmds)
Pulkit Goyal
py3: use pycompat.bytestr() intsead of str...
r37334 > res = pycompat.bytestr(eval(cmd, globals(), locals()))
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 > ui.warn(b"%s" % res)
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 > EOF
$ echo "[extensions]" >> $HGRCPATH
$ echo "eval=`pwd`/eval.py" >> $HGRCPATH
Arbitraryfilectx.cmp does not follow symlinks:
$ mkdir case1
$ cd case1
$ hg init
Matt Harbison
test-arbitraryfilectx: stabilize for Windows...
r34937 #if symlink
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 $ 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"
Matt Harbison
test-arbitraryfilectx: stabilize for Windows...
r34937 #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
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836
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.
Matt Harbison
test-arbitraryfilectx: stabilize for Windows...
r34937 #if symlink
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 $ hg eval "not filecmp.cmp('real_A', 'sym_A')"
True (no-eol)
Matt Harbison
test-arbitraryfilectx: stabilize for Windows...
r34937 #else
$ hg eval "not filecmp.cmp('real_A', 'sym_A')"
False (no-eol)
#endif