view tests/autodiff.py @ 13475:c7bef25ca393 stable

eol: handle LockUnavailable error (issue2569)

If the repository is not locked when clearing the dirstate, then
running test-eol.t in a loop fails sooner or later with:

  ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed
  --- /home/mg/src/mercurial-crew/tests/test-eol.t
  +++ /home/mg/src/mercurial-crew/tests/test-eol.t.err
  @@ -343,6 +343,7 @@
     % hg status (eol activated)
     M win.txt
     % hg commit
  +  nothing changed
     % hg status
     $ testmixed CRLF

However, if we cannot lock the repository, then we can also not make a
commit and so we can simply ignore a LockUnavailable error.

# Extension dedicated to test patch.diff() upgrade modes
#
#
from mercurial import cmdutil, patch, util

def autodiff(ui, repo, *pats, **opts):
    diffopts = patch.diffopts(ui, opts)
    git = opts.get('git', 'no')
    brokenfiles = set()
    losedatafn = None
    if git in ('yes', 'no'):
        diffopts.git = git == 'yes'
        diffopts.upgrade = False
    elif git == 'auto':
        diffopts.git = False
        diffopts.upgrade = True
    elif git == 'warn':
        diffopts.git = False
        diffopts.upgrade = True
        def losedatafn(fn=None, **kwargs):
            brokenfiles.add(fn)
            return True
    elif git == 'abort':
        diffopts.git = False
        diffopts.upgrade = True
        def losedatafn(fn=None, **kwargs):
            raise util.Abort('losing data for %s' % fn)
    else:
        raise util.Abort('--git must be yes, no or auto')

    node1, node2 = cmdutil.revpair(repo, [])
    m = cmdutil.match(repo, pats, opts)
    it = patch.diff(repo, node1, node2, match=m, opts=diffopts,
                    losedatafn=losedatafn)
    for chunk in it:
        ui.write(chunk)
    for fn in sorted(brokenfiles):
        ui.write('data lost for: %s\n' % fn)

cmdtable = {
    "autodiff":
        (autodiff,
         [('', 'git', '', 'git upgrade mode (yes/no/auto/warn/abort)'),
          ],
         '[OPTION]... [FILE]...'),
}