mercurial/commands.py

38151:0dfa27e53c57

        ui.warn(_('warning: inconsistent use of --rev might give unexpected '
                  'revision ordering!\n'))

    revs = list(revs)
    revs.extend(opts.get('rev'))

    if not opts.get('user') and opts.get('currentuser'):
        opts['user'] = ui.username()
    if not opts.get('date') and opts.get('currentdate'):
        opts['date'] = "%d %d" % dateutil.makedate()

        else:
            extra['source'] = ctx.hex()
        user = ctx.user()
        if opts.get('user'):
            user = opts['user']
        date = ctx.date()
        if opts.get('date'):
            date = opts['date']
        message = ctx.description()
        if opts.get('log'):
            message += '\n(grafted from %s)' % ctx.hex()

        # we don't merge the first commit when continuing

                repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
            # report any conflicts
            if stats.unresolvedcount > 0:
                # write out state for --continue
                nodes = [repo[rev].hex() for rev in revs[pos:]]
                statedata = {'nodes': nodes}
                stateversion = 1
                graftstate.save(stateversion, statedata)
                extra = ''
                if opts.get('user'):
                    extra += ' --user %s' % procutil.shellquote(opts['user'])

38152:63553c2bef7e

        ui.warn(_('warning: inconsistent use of --rev might give unexpected '
                  'revision ordering!\n'))

    revs = list(revs)
    revs.extend(opts.get('rev'))
    # a dict of data to be stored in state file
    statedata = {}

    if not opts.get('user') and opts.get('currentuser'):
        opts['user'] = ui.username()
    if not opts.get('date') and opts.get('currentdate'):
        opts['date'] = "%d %d" % dateutil.makedate()

        else:
            extra['source'] = ctx.hex()
        user = ctx.user()
        if opts.get('user'):
            user = opts['user']
            statedata['user'] = user
        date = ctx.date()
        if opts.get('date'):
            date = opts['date']
            statedata['date'] = date
        message = ctx.description()
        if opts.get('log'):
            message += '\n(grafted from %s)' % ctx.hex()

        # we don't merge the first commit when continuing

                repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
            # report any conflicts
            if stats.unresolvedcount > 0:
                # write out state for --continue
                nodes = [repo[rev].hex() for rev in revs[pos:]]
                statedata['nodes'] = nodes
                stateversion = 1
                graftstate.save(stateversion, statedata)
                extra = ''
                if opts.get('user'):
                    extra += ' --user %s' % procutil.shellquote(opts['user'])