This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6316

automation: do a force push to synchronize
ClosedPublic

Authored by indygreg on Apr 27 2019, 2:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5c242c427897: automation: do a force push to synchronize
Summary

We don't know what the state of the remote is. Force pushing will
be more resilient.

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

indygreg created this revision.Apr 27 2019, 2:51 PM
Closed by commit rHG5c242c427897: automation: do a force push to synchronize (authored by indygreg). · Explain WhyMay 15 2019, 11:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15095

contrib/automation/hgautomation/windows.py

cwd=str(hg_repo), env=env, check=True, capture_output=True) cwd=str(hg_repo), env=env, check=True, capture_output=True)
full_revision = res.stdout.decode('ascii') full_revision = res.stdout.decode('ascii')
args = [ args = [
'python2.7', hg_bin, 'python2.7', hg_bin,
'--config', 'ui.ssh=ssh -F %s' % ssh_config, '--config', 'ui.ssh=ssh -F %s' % ssh_config,
'--config', 'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe', '--config', 'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe',
'push', '-r', full_revision, 'ssh://%s/c:/hgdev/src' % public_ip, 'push', '-f', '-r', full_revision,
'ssh://%s/c:/hgdev/src' % public_ip,
] ]
subprocess.run(args, cwd=str(hg_repo), env=env, check=True) subprocess.run(args, cwd=str(hg_repo), env=env, check=True)
run_powershell(winrm_client, run_powershell(winrm_client,
HG_UPDATE_CLEAN.format(revision=full_revision)) HG_UPDATE_CLEAN.format(revision=full_revision))
# TODO detect dirty local working directory and synchronize accordingly. # TODO detect dirty local working directory and synchronize accordingly.