Mercurial > hg
view tests/test-arbitraryfilectx.t @ 35410:83014fa95435
rebase: fix for hgsubversion
5c25fe7fb1e broke something in the hgsubversion test path, causing it raise an
abort (Abort: nothing to merge) during a perfectly good rebase. I tracked it
down to this change. It's probably not hgsubversion related.
I suspect that using the same `wctx` from before the initial update causes
problems with the wctx's cached manifest property. I noticed we also sometimes
stick random gunk on the wctx object in other places (like in `copies.py`) so
it's probably best to reset it for now.
The line I added before was actually useless since we don't pass wctx to the
initial `merge.update`, so it defaults to `repo[None]`. So I just removed it.
Differential Revision: https://phab.mercurial-scm.org/D1679
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Tue, 12 Dec 2017 22:05:21 -0800 |
parents | 9645c2a2bc2a |
children | a36d3c8a0e41 |
line wrap: on
line source
Setup: $ cat > eval.py <<EOF > from __future__ import absolute_import > import filecmp > from mercurial import commands, context, registrar > cmdtable = {} > command = registrar.command(cmdtable) > @command(b'eval', [], 'hg eval CMD') > def eval_(ui, repo, *cmds, **opts): > cmd = " ".join(cmds) > res = str(eval(cmd, globals(), locals())) > ui.warn("%s" % res) > EOF $ echo "[extensions]" >> $HGRCPATH $ echo "eval=`pwd`/eval.py" >> $HGRCPATH 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