Mercurial > hg

annotate tests/test-check-clang-format.t @ 35410:83014fa95435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2e8477059d4f
children 39499bc31fcd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
34834
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
1 #require clang-format test-repo
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
2
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
3 $ . "$TESTDIR/helpers-testrepo.sh"
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
4
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
5 $ cd "$TESTDIR"/..
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
6 $ for f in `testrepohg files 'set:(**.c or **.h) and not "listfile:contrib/clang-format-blacklist"'` ; do
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
7 > clang-format --style file $f > $f.formatted
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
8 > cmp $f $f.formatted || diff -u $f $f.formatted
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
9 > rm $f.formatted
2e8477059d4f test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff changeset
10 > done