Mercurial > hg
view tests/printenv.py @ 46758:7f6c002d7c0a
split: close transaction in the unlikely event of a conflict while rebasing
`hg split` *should* never result in conflicts, but in case there are
bugs, we should at least commit the transaction so they can continue
the rebase. One of our users ran into the regression fixed by
D10120. They fixed the conflict and the tried to continue the rebase,
but it failed with "abort: cannot continue inconsistent rebase"
because the rebase state referred to commits written in a transaction
that was never committed.
Side note: `hg split` should probably turn off copy tracing to reduce
the impact of such bugs, and to speed it up as well. Copies made in
the rebased commits should still be respected because `hg rebase`
calls `copies.graftcopies()`.
Differential Revision: https://phab.mercurial-scm.org/D10164
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 Mar 2021 09:15:40 -0800 |
parents | c102b704edb5 |
children | 6000f5b25c9b |
line wrap: on
line source
#!/usr/bin/env python3 # # simple script to be used in hooks # # put something like this in the repo .hg/hgrc: # # [hooks] # changegroup = python "$TESTDIR/printenv.py" <hookname> [exit] [output] # # - <hookname> is a mandatory argument (e.g. "changegroup") # - [exit] is the exit code of the hook (default: 0) # - [output] is the name of the output file (default: use sys.stdout) # the file will be opened in append mode. # from __future__ import absolute_import import argparse import os import sys try: import msvcrt msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) except ImportError: pass parser = argparse.ArgumentParser() parser.add_argument("name", help="the hook name, used for display") parser.add_argument( "exitcode", nargs="?", default=0, type=int, help="the exit code for the hook", ) parser.add_argument( "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() if args.out is None: out = sys.stdout out = getattr(out, "buffer", out) else: out = open(args.out, "ab") # variables with empty values may not exist on all platforms, filter # them now for portability sake. env = [(k, v) for k, v in os.environ.items() if k.startswith("HG_") and v] env.sort() out.write(b"%s hook: " % args.name.encode('ascii')) if os.name == 'nt': filter = lambda x: x.replace('\\', '/') else: filter = lambda x: x vars = [ b"%s=%s" % (k.encode('ascii'), filter(v).encode('ascii')) for k, v in env ] # Print variables on out if not args.line: out.write(b" ".join(vars)) else: for var in vars: out.write(var) out.write(b"\n") out.write(b"\n") out.close() sys.exit(args.exitcode)