##// END OF EJS Templates
histedit: make check for unresolved conflicts explicit (issue5545)...
histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

File last commit:

r30068:a76d5ba7 default
r32057:e5ffc91a stable
Show More
lockdelay.py
22 lines | 659 B | text/x-python | PythonLexer
Gregory Szorc
hg: obtain lock when creating share from pooled repo (issue5104)...
r28289 # Dummy extension that adds a delay after acquiring a lock.
#
# This extension can be used to test race conditions between lock acquisition.
from __future__ import absolute_import
import os
import time
Pierre-Yves David
pull: grab wlock during pull...
r30068 def reposetup(ui, repo):
Gregory Szorc
hg: obtain lock when creating share from pooled repo (issue5104)...
r28289
Pierre-Yves David
pull: grab wlock during pull...
r30068 class delayedlockrepo(repo.__class__):
def lock(self):
delay = float(os.environ.get('HGPRELOCKDELAY', '0.0'))
if delay:
time.sleep(delay)
res = super(delayedlockrepo, self).lock()
delay = float(os.environ.get('HGPOSTLOCKDELAY', '0.0'))
if delay:
time.sleep(delay)
return res
repo.__class__ = delayedlockrepo