comparison contrib/synthrepo.py @ 24306:6ddc86eedc3b

style: kill ersatz if-else ternary operators

Although Python supports `X = Y if COND else Z`, this was only
introduced in Python 2.5. Since we have to support Python 2.4, it was
a very common thing to write instead `X = COND and Y or Z`, which is a
bit obscure at a glance. It requires some intricate knowledge of
Python to understand how to parse these one-liners.

We change instead all of these one-liners to 4-liners. This was
executed with the following perlism:

    find -name "*.py" -exec perl -pi -e 's,(\s*)([\.\w]+) = \(?(\S+)\s+and\s+(\S*)\)?\s+or\s+(\S*)$,$1if $3:\n$1    $2 = $4\n$1else:\n$1    $2 = $5,' {} \;

I tweaked the following cases from the automatic Perl output:

    prev = (parents and parents[0]) or nullid
    port = (use_ssl and 443 or 80)
    cwd = (pats and repo.getcwd()) or ''
    rename = fctx and webutil.renamelink(fctx) or []
    ctx = fctx and fctx or ctx
    self.base = (mapfile and os.path.dirname(mapfile)) or ''

I also added some newlines wherever they seemd appropriate for readability

There are probably a few ersatz ternary operators still in the code
somewhere, lurking away from the power of a simple regex.

24305:867c3649be5d

        message = 'synthesized wide repo with %d files' % (len(files),)
        mc = context.memctx(repo, [pctx.node(), nullid], message,
                            files.iterkeys(), filectxfn, ui.username(),
                            '%d %d' % util.makedate())
        initnode = mc.commit()
        hexfn = ui.debugflag and hex or short
        ui.status(_('added commit %s with %d files\n')
                  % (hexfn(initnode), len(files)))

    # Synthesize incremental revisions to the repository, adding repo depth.
    count = int(opts['count'])

        renaming regardless of iteration order through the model.
        '''
        if dirpath in replacements:
            return replacements[dirpath]
        head, _ = os.path.split(dirpath)
        head = head and rename(head) or ''
        renamed = os.path.join(head, wordgen.next())
        replacements[dirpath] = renamed
        return renamed
    result = []
    for dirpath, count in dirs.iteritems():

24306:6ddc86eedc3b

        message = 'synthesized wide repo with %d files' % (len(files),)
        mc = context.memctx(repo, [pctx.node(), nullid], message,
                            files.iterkeys(), filectxfn, ui.username(),
                            '%d %d' % util.makedate())
        initnode = mc.commit()
        if ui.debugflag:
            hexfn = hex
        else:
            hexfn = short
        ui.status(_('added commit %s with %d files\n')
                  % (hexfn(initnode), len(files)))

    # Synthesize incremental revisions to the repository, adding repo depth.
    count = int(opts['count'])

        renaming regardless of iteration order through the model.
        '''
        if dirpath in replacements:
            return replacements[dirpath]
        head, _ = os.path.split(dirpath)
        if head:
            head = rename(head)
        else:
            head = ''
        renamed = os.path.join(head, wordgen.next())
        replacements[dirpath] = renamed
        return renamed
    result = []
    for dirpath, count in dirs.iteritems():