[PATCH 06 of 17] rebase: use nullrev instead of -1

[Martin von Zweigbergk]

On Sun Nov 30 2014 at 11:09:31 AM Mads Kiilerich <mads at kiilerich.com> wrote:

> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1417374421 -3600
> #      Sun Nov 30 20:07:01 2014 +0100
> # Node ID 09fe6c1db24cc0c3fd3dceae4063c0a8dcbd11a5
> # Parent  0cff65a0d024e31284ff6eb804ed4ac65f628a6e
> rebase: use nullrev instead of -1
>
> We have a constant. Use it consistently.
>
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -23,6 +23,9 @@ from mercurial.lock import release
>  from mercurial.i18n import _
>  import os, errno
>
> +# state values:
> +# >= 0 means already rebased to this rev
> +# nullrev = -1 means 'todo'
>  nullmerge = -2
>  revignored = -3
>
> @@ -373,7 +376,7 @@ def rebase(ui, repo, **opts):
>                  desc += ' (%s)' % ' '.join(l)
>              ui.status(_('rebasing %d:%s %s\n') % (rev, short(node), desc))
>              pos += 1
> -            if state[rev] == -1:
> +            if state[rev] == nullrev:
>                  ui.progress(_("rebasing"), pos, ("%d:%s" % (rev,
> short(node))),
>                              _('changesets'), total)
>                  p1, p2 = defineparents(repo, rev, target, state,
> @@ -852,7 +855,7 @@ def abort(repo, originalwd, target, stat
>              merge.update(repo, repo[originalwd].rev(), False, True, False)
>
>          # Strip from the first rebased revision
> -        rebased = filter(lambda x: x > -1 and x != target, state.values())
> +        rebased = filter(lambda x: x > nullrev and x != target,


The other two places compare exactly to nullrev with '==' or '!='. I prefer
that. We seem to have 55 occurrences of those and only 3 occurrences of '>'
or '<'.


> state.values())
>          if rebased:
>              strippoints = [c.node()  for c in repo.set('roots(%ld)',
> rebased)]
>              # no backup of rebased cset versions needed
> @@ -1031,7 +1034,7 @@ def summaryhook(ui, repo):
>          msg = _('rebase: (use "hg rebase --abort" to clear broken
> state)\n')
>          ui.write(msg)
>          return
> -    numrebased = len([i for i in state.itervalues() if i != -1])
> +    numrebased = len([i for i in state.itervalues() if i != nullrev])
>      # i18n: column positioning for "hg summary"
>      ui.write(_('rebase: %s, %s (rebase --continue)\n') %
>               (ui.label(_('%d rebased'), 'rebase.rebased') % numrebased,
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141201/0b98b4cf/attachment-0001.html>