comparison mercurial/commands.py @ 27195:84de71ec5c61

commands: execute checkunfinished and bailifchanged inside wlock scope

Before this patch, "hg import" executes below before acquisition of
wlock:

  - cmdutil.checkunfinished()
  - cmdutil.bailifchanged()

It may cause unintentional result, if another command runs parallelly
(see also issue4368).

To avoid this issue, this patch executes 'cmdutil.checkunfinished()'
and 'cmdutil.bailifchanged()' inside wlock scope of "hg import".

27194:77995317b374

    if opts.get('exact') and opts.get('edit'):
        raise error.Abort(_('cannot use --exact with --edit'))
    if opts.get('exact') and opts.get('prefix'):
        raise error.Abort(_('cannot use --exact with --prefix'))

    if update:
        cmdutil.checkunfinished(repo)
    if (opts.get('exact') or not opts.get('force')) and update:
        cmdutil.bailifchanged(repo)

    base = opts["base"]
    wlock = dsguard = lock = tr = None
    msgs = []
    ret = 0


    try:
        try:
            wlock = repo.wlock()
            if not opts.get('no_commit'):
                lock = repo.lock()
                tr = repo.transaction('import')
            else:
                dsguard = cmdutil.dirstateguard(repo, 'import')

27195:84de71ec5c61

    if opts.get('exact') and opts.get('edit'):
        raise error.Abort(_('cannot use --exact with --edit'))
    if opts.get('exact') and opts.get('prefix'):
        raise error.Abort(_('cannot use --exact with --prefix'))

    base = opts["base"]
    wlock = dsguard = lock = tr = None
    msgs = []
    ret = 0


    try:
        try:
            wlock = repo.wlock()

            if update:
                cmdutil.checkunfinished(repo)
            if (opts.get('exact') or not opts.get('force')) and update:
                cmdutil.bailifchanged(repo)

            if not opts.get('no_commit'):
                lock = repo.lock()
                tr = repo.transaction('import')
            else:
                dsguard = cmdutil.dirstateguard(repo, 'import')