##// END OF EJS Templates
copies: choose target directory based on longest match...
copies: choose target directory based on longest match If one side of a merge renames `dir1/` to `dir2/` and the subdirectory `dir1/subdir1/` to `dir2/subdir2/`, and the other side of the merge adds a file in `dir1/subdir1/`, we should clearly move that into `dir2/subdir2/`. We already detect the directories correctly before this patch, but we iterate over them in arbitrary order. That results in the new file sometimes ending up in `dir2/subdir1/` instead. This patch fixes it by iterating over the source directories by visiting subdirectories first. That's achieved by simply iterating over them in reverse lexicographical order. Without the fix, the test case still passes on Python 2 but fails on Python 3. It depends on the iteration order of the dict. I did not look into how it's built up and why it behaved differently before the fix. I could probably have gotten it to fail on Python 2 as well by choosing different directory names. Differential Revision: https://phab.mercurial-scm.org/D10115

File last commit:

r43487:6a350194 default
r47379:ad30b29b default
Show More
winrm.py
87 lines | 2.0 KiB | text/x-python | PythonLexer
# winrm.py - Interact with Windows Remote Management (WinRM)
#
# Copyright 2019 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.
# no-check-code because Python 3 native.
import logging
import pprint
import time
from pypsrp.client import Client
from pypsrp.powershell import (
PowerShell,
PSInvocationState,
RunspacePool,
)
import requests.exceptions
logger = logging.getLogger(__name__)
def wait_for_winrm(host, username, password, timeout=180, ssl=False):
"""Wait for the Windows Remoting (WinRM) service to become available.
Returns a ``psrpclient.Client`` instance.
"""
end_time = time.time() + timeout
while True:
try:
client = Client(
host,
username=username,
password=password,
ssl=ssl,
connection_timeout=5,
)
client.execute_ps("Write-Host 'Hello, World!'")
return client
except requests.exceptions.ConnectionError:
if time.time() >= end_time:
raise
time.sleep(1)
def format_object(o):
if isinstance(o, str):
return o
try:
o = str(o)
except (AttributeError, TypeError):
o = pprint.pformat(o.extended_properties)
return o
def run_powershell(client, script):
with RunspacePool(client.wsman) as pool:
ps = PowerShell(pool)
ps.add_script(script)
ps.begin_invoke()
while ps.state == PSInvocationState.RUNNING:
ps.poll_invoke()
for o in ps.output:
print(format_object(o))
ps.output[:] = []
ps.end_invoke()
for o in ps.output:
print(format_object(o))
if ps.state == PSInvocationState.FAILED:
raise Exception(
'PowerShell execution failed: %s'
% ' '.join(map(format_object, ps.streams.error))
)