update copyright statements in some additional files

Summary:
Update additional files in other locations that haven't been covered by
previous diffs.

Reviewed By: sfilipco

Differential Revision: D18277575

fbshipit-source-id: d82458d7439d977aea29821e01bc897e9d1e2656

CMakeLists.txt

@@ -1,3 +1,8 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 cmake_minimum_required(VERSION 3.7)
 
 # CMake include directories

Makefile

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # If you want to change PREFIX, do not just edit it below. The changed
 # value wont get passed on to recursive make calls. You should instead
 # override the variable on the command like:

contrib/bdiff-torture.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # Randomized torture test generation for bdiff
 
 from __future__ import absolute_import, print_function

contrib/casesmash.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 from __future__ import absolute_import
 
 import __builtin__

contrib/check-code.py

@@ -1,12 +1,16 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
 #
-# check-code - a style and portability checker for Mercurial
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # Copyright 2010 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+# check-code - a style and portability checker for Mercurial
+
 """style and portability checker for Mercurial
 
 when a rule triggers wrong, do one of the following (prefer one from top):

contrib/check-config.py

@@ -1,12 +1,16 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
 #
-# check-config - a config flag documentation checker for Mercurial
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # Copyright 2015 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+# check-config - a config flag documentation checker for Mercurial
+
 from __future__ import absolute_import, print_function
 
 import re

contrib/check-py3-compat.py

@@ -1,12 +1,16 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
 #
-# check-py3-compat - check Python 3 compatibility of Mercurial files
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+# check-py3-compat - check Python 3 compatibility of Mercurial files
+
 from __future__ import absolute_import, print_function
 
 import ast

contrib/debugcmdserver.py

@@ -1,4 +1,14 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 #
 # Dumps output generated by Mercurial's command server in a formatted style to a
 # given file or stderr if '-' is specified. Output is also written in its raw

contrib/dirstatenonnormalcheck.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # dirstatenonnormalcheck.py - extension to check the consistency of the
 # dirstate's non-normal map
 #

contrib/fix-code.py

@@ -1,4 +1,13 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
 
 """Automatically fix code
 

contrib/genosxversion.py

@@ -1,4 +1,13 @@
 #!/usr/bin/env python2
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
 from __future__ import absolute_import, print_function
 
 import argparse

contrib/hgclient.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # A minimal client for Mercurial's command server
 
 from __future__ import absolute_import, print_function

contrib/hggitperf.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # hggitperf.py - performance test routines
 """helper extension to measure performance of hg-git operations
 

contrib/lint.py

@@ -1,4 +1,13 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
 
 """ Convert mercurial check-code errors into a format
 that plays nicely with arc lint """

contrib/memory.py

@@ -1,10 +1,15 @@
-# memory.py - track memory usage
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
 #
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+# memory.py - track memory usage
+
 """helper extension to measure memory usage
 
 Reads current and peak memory usage from ``/proc/self/status`` and

contrib/perf.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # perf.py - performance test routines
 """helper extension to measure performance"""
 

contrib/python-hook-examples.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 """
 Examples of useful python hooks for Mercurial.
 """

contrib/python3-ratchet.py

@@ -1,7 +1,13 @@
-# Copyright 2012 Facebook
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
+
 """Find tests that newly pass under Python 3.
 
 The approach is simple: we maintain a whitelist of Python 3 passing

contrib/revsetbenchmarks.py

@@ -1,4 +1,13 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
 
 # Measure the performance of a list of revsets against multiple revisions
 # defined by parameter. Checkout one by one and run perfrevset with every

contrib/synthrepo.py

@@ -1,10 +1,15 @@
-# synthrepo.py - repo synthesis
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
 #
-# Copyright 2012 Facebook
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+# synthrepo.py - repo synthesis
+
 """synthesize structurally interesting change history
 
 This extension is useful for creating a repository with properties

contrib/traceprof.py

@@ -1,4 +1,13 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import, print_function
 

distutils_rust/__init__.py

@@ -1,6 +1,9 @@
-# distutils_rust.py - distutils extension for building Rust extension modules
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# Copyright 2017 Facebook, Inc.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# distutils_rust.py - distutils extension for building Rust extension modules
 
 from __future__ import absolute_import
 

doc/check-seclevel.py

@@ -1,5 +1,14 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
 #
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # checkseclevel - checking section title levels in each online help document
 
 from __future__ import absolute_import

doc/gendoc.py

@@ -1,4 +1,14 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 """usage: %s DOC ...
 
 where DOC is the name of a document

edenscm/__init__.py

@@ -1,7 +1,7 @@
-# Copyright Facebook, Inc. 2019
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
+# GNU General Public License version 2.
 
 from __future__ import absolute_import
 

edenscm/hgdemandimport/__init__.py

@@ -1,6 +1,11 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # hgdemandimport - global demand-loading of modules for Mercurial
 #
-# Copyright 2017 Facebook Inc.
+# Copyright Matt Mackall <mpm@selenic.com> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.

edenscm/hgdemandimport/demandimportpy2.py

@@ -1,3 +1,8 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # demandimport.py - global demand-loading of modules for Mercurial
 #
 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>

edenscm/hgdemandimport/demandimportpy3.py

@@ -1,6 +1,11 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # demandimportpy3 - global demand-loading of modules for Mercurial
 #
-# Copyright 2017 Facebook Inc.
+# Copyright Matt Mackall <mpm@selenic.com> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.

edenscmnative/clindex.pyx

@@ -1,7 +1,7 @@
-# Copyright 2017 Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
+# GNU General Public License version 2.
 
 """alternative changelog index
 

edenscmnative/linelog.pyx

@@ -1,7 +1,7 @@
-# Copyright 2016 Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
+# GNU General Public License version 2.
 
 from libc.errno cimport errno
 from libc.stdint cimport uint32_t, uint8_t

edenscmnative/patchrmdir.pyx

@@ -1,9 +1,7 @@
-# patchrmdir.py
-#
-# Copyright 2017 Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
+# GNU General Public License version 2.
 
 """patch rmdir
 

edenscmnative/traceprof.pyx

@@ -1,11 +1,11 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 # distutils: language = c++
 
 # traceprof.pyx - C++ to Python bridge for the traceprof Mercurial extension
-#
-# Copyright 2017 Facebook, Inc.
-#
-# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
 
 """accurate callgraph profiling
 

gen_version.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python
-# Copyright 2004-present Facebook. All Rights Reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
 import argparse
 import errno
 import hashlib

i18n/check-translation.py

@@ -1,4 +1,8 @@
 #!/usr/bin/env python
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
 
 # Copyright 2013 Mercurial Contributors
 #

setup.py

@@ -1,3 +1,13 @@
+# Portions Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+# Copyright Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
 # This is the mercurial setup script.
 #
 # 'python setup.py install', or

slides/201904-segmented-changelog/segmented-changelog.py

@@ -1,7 +1,7 @@
-# Copyright 2019 Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
+# GNU General Public License version 2.
 
 import hashlib
 import sys

tests/test-run-tests.t

@@ -1205,12 +1205,11 @@ running is placed.
   > If this prints a path, that means RUNTESTDIR didn't equal
   > TESTDIR as it should have.
   >   $ test "\$RUNTESTDIR" = "$TESTDIR" || echo "\$RUNTESTDIR"
-  > This should print the start of check-code. If this passes but the
-  > previous check failed, that means we found a copy of check-code at whatever
-  > RUNTESTSDIR ended up containing, even though it doesn't match TESTDIR.
-  >   $ head -n 3 "\$RUNTESTDIR"/../contrib/check-code.py | sed 's@.!.*python@#!USRBINENVPY@'
-  >   #!USRBINENVPY
-  >   #
+  > Make sure we can find check-code.py relative to $RUNTESTDIR
+  > If this passes but the previous check failed, that means we found a copy of
+  > check-code at whatever RUNTESTSDIR ended up containing, even though it
+  > doesn't match TESTDIR.
+  >   $ grep 'a style and portability checker' "\$RUNTESTDIR"/../contrib/check-code.py
   >   # check-code - a style and portability checker for Mercurial
   > EOF
   $ rt test-runtestdir.t