stabilize: improve unstable selection heuristic
Without argument, stabilize was picking the first in:
"unstable() and ((suspended() or obsancestors(::.))::)"
which usually returned the "oldest" unstable revision in parent
predecessors descendants. This revision is interesting because it
usually gives "soft" merges but rebasing it left the working directory
on a remote branch, which was very confusing.
The new heuristic picks an unstable changeset which can be rebased on
top of the parent revision, or on top of one of its descendants
(selected in revision order). This has the advantage of selecting a
revision which can be rebased on the current subtree, and leave the
working directory in a more convenient location.
#!/usr/bin/env python
import os, os.path as op, re, sys
# line starts with two chars one of which is not a space (and both are not
# newlines obviously) and ends with one or more newlines followed by two spaces
# on a next line (indented text)
CODEBLOCK = re.compile(r'()\n(([^ \n][^\n]|[^\n][^ \n])[^\n]*)\n+ ')
INDEX = '''
Mercurial tests
===============
.. toctree::
:maxdepth: 1
'''
def rstify(orig, name):
header = '%s\n%s\n\n' % (name, '=' * len(name))
content = header + orig
content = CODEBLOCK.sub(r'\n\1\n\n::\n\n ', content)
return content
def main(base):
if os.path.isdir(base):
one_dir(base)
else:
print one_file(base)
def one_dir(base):
index = INDEX
#doc = lambda x: op.join(op.dirname(__file__), 'docs', x)
for fn in sorted(os.listdir(base)):
if not fn.endswith('.t'):
continue
print fn
name = os.path.splitext(fn)[0]
content = one_file(op.join(base, fn))
target = op.join(base, name + '.rst')
#with file(doc(name + '.rst'), 'w') as f:
with file(target, 'w') as f:
f.write(content)
print f
index += '\n ' + name
#with file(doc('index.rst'), 'w') as f:
# f.write(index)
def one_file(path):
name = os.path.basename(path)[:-2]
return rstify(file(path).read(), name)
if __name__ == '__main__':
if len(sys.argv) != 2:
print 'Please supply a path to tests dir as parameter'
sys.exit()
main(sys.argv[1])