This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5453

test: introduce a new flag to display env variable line per line
ClosedPublic

Authored by lothiraldan on Dec 19 2018, 11:25 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG73da729ccfef: test: introduce a new flag to display env variable line per line
Summary

It's easier to conditionalize some of the environment variables per Mercurial
version once there is only one value per line.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Dec 19 2018, 11:25 AM
yuja added a subscriber: yuja.Dec 20 2018, 8:00 AM

+parser.add_argument(
+ "--line",
+ action="store_const",
+ const=True,
+ default=False,

Nit: can be action="store_true"

vars = [b"%s=%s" % (k.encode('ascii'), filter(v).encode('ascii'))

for k, v in env]

-out.write(b" ".join(vars))
+
+# Print variables on out
+if args.line is False:

Nit: not args.line

+ vars = ["%s=%s" % (k, filter(v)) for k, v in env]

Why not reuse the vars constructed above? It's carefully written to be
Python3 safe.

lothiraldan added a comment.Dec 20 2018, 1:04 PM
In D5453#80871, @yuja wrote:

+parser.add_argument(
+ "--line",
+ action="store_const",
+ const=True,
+ default=False,

Nit: can be action="store_true"

vars = [b"%s=%s" % (k.encode('ascii'), filter(v).encode('ascii'))

for k, v in env]

-out.write(b" ".join(vars))
+
+# Print variables on out
+if args.line is False:

Nit: not args.line

Will update for the Nits

+ vars = ["%s=%s" % (k, filter(v)) for k, v in env]

Why not reuse the vars constructed above? It's carefully written to be
Python3 safe.

It's a bad resolution of a merge conflict, I will remote the line, nice catch

Closed by commit rHG73da729ccfef: test: introduce a new flag to display env variable line per line (authored by lothiraldan). · Explain WhyDec 22 2018, 2:35 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/printenv.py (16 lines)
Mtests/test-http.t (11 lines)

Diff 12946

tests/printenv.py

nargs="?", nargs="?",
default=0, default=0,
type=int, type=int,
help="the exit code for the hook", help="the exit code for the hook",
) )
parser.add_argument( parser.add_argument(
"out", nargs="?", default=None, help="where to write the output" "out", nargs="?", default=None, help="where to write the output"
) )
parser.add_argument(
"--line",
action="store_true",
help="print environment variables one per line instead of on a single line",
)
args = parser.parse_args() args = parser.parse_args()
if args.out is None: if args.out is None:
out = sys.stdout out = sys.stdout
out = getattr(out, "buffer", out) out = getattr(out, "buffer", out)
else: else:
out = open(args.out, "ab") out = open(args.out, "ab")
# variables with empty values may not exist on all platforms, filter # variables with empty values may not exist on all platforms, filter
# them now for portability sake. # them now for portability sake.
env = [(k, v) for k, v in os.environ.items() env = [(k, v) for k, v in os.environ.items()
if k.startswith("HG_") and v] if k.startswith("HG_") and v]
env.sort() env.sort()
out.write(b"%s hook: " % args.name.encode('ascii')) out.write(b"%s hook: " % args.name.encode('ascii'))
if os.name == 'nt': if os.name == 'nt':
filter = lambda x: x.replace('\\', '/') filter = lambda x: x.replace('\\', '/')
else: else:
filter = lambda x: x filter = lambda x: x
vars = [b"%s=%s" % (k.encode('ascii'), filter(v).encode('ascii')) vars = [b"%s=%s" % (k.encode('ascii'), filter(v).encode('ascii'))
for k, v in env] for k, v in env]
# Print variables on out
if not args.line:
out.write(b" ".join(vars)) out.write(b" ".join(vars))
else:
for var in vars:
out.write(var)
out.write(b"\n")
out.write(b"\n") out.write(b"\n")
out.close() out.close()
sys.exit(args.exitcode) sys.exit(args.exitcode)

tests/test-http.t

2 2
$ cd .. $ cd ..
pull pull
$ cd copy-pull $ cd copy-pull
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [hooks] > [hooks]
> changegroup = sh -c "printenv.py changegroup" > changegroup = sh -c "printenv.py --line changegroup"
> EOF > EOF
$ hg pull $ hg pull
pulling from http://localhost:$HGPORT1/ pulling from http://localhost:$HGPORT1/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 5fed3813f7f5 new changesets 5fed3813f7f5
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/ changegroup hook: HG_HOOKNAME=changegroup
HG_HOOKTYPE=changegroup
HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
HG_SOURCE=pull
HG_TXNID=TXN:$ID$
HG_URL=http://localhost:$HGPORT1/
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ cd .. $ cd ..
clone from invalid URL clone from invalid URL
$ hg clone http://localhost:$HGPORT/bad $ hg clone http://localhost:$HGPORT/bad
abort: HTTP Error 404: Not Found abort: HTTP Error 404: Not Found
[255] [255]