[PATCH 06 of 15] revlog: remove long flag names

[Pradeepkumar Gayam]

On Tue, Jul 13, 2010 at 6:47 PM, Benoit Boissinot <
benoit.boissinot at ens-lyon.org> wrote:

> On Mon, Jul 12, 2010 at 04:19:48PM +0530, Pradeepkumar Gayam wrote:
> > # HG changeset patch
> > # User Pradeepkumar Gayam <in3xes at gmail.com>
> > # Date 1278876198 -19800
> > # Branch stable
> > # Node ID d7ffd4120b04df6bf6382fc88586debe9607013e
> > # Parent  8a50f8585173f86b087ee3f7ece67a1f8a31219e
> > revlog: remove long flag names
>
> Please fold with other patches.
>
My mistake again :-|

>
> thanks,
>
> Benoit
> >
> > diff -r 8a50f8585173 -r d7ffd4120b04 mercurial/revlog.py
> > --- a/mercurial/revlog.py     Mon Jul 12 00:48:17 2010 +0530
> > +++ b/mercurial/revlog.py     Mon Jul 12 00:53:18 2010 +0530
> > @@ -30,7 +30,7 @@
> >  REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA
> >  REVLOG_DEFAULT_FORMAT = REVLOGNG
> >  REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS
> > -REVLOG_PARENTDELTA_FLAGS = 1
> > +REVLOGNG_PDELTA = 1
> >
> >  # amount of data read unconditionally, should be >= 4
> >  # when not inline: threshold for using lazy index
> > @@ -1001,7 +1001,7 @@
> >          '''return previous revision or parentrev according to flags'''
> >          if self.base(rev) == rev:
> >              return nullrev
> > -        elif self.flags(rev) & REVLOG_PARENTDELTA_FLAGS:
> > +        elif self.flags(rev) & REVLOGNG_PDELTA:
> >              return self.parentrevs(rev)[0]
> >          else:
> >              return rev-1
> > @@ -1039,7 +1039,7 @@
> >          base, chain = self.deltachain(rev)
> >
> >          # check rev flags
> > -        if self.flags(rev) & ~REVLOG_PARENTDELTA_FLAGS:
> > +        if self.flags(rev) & ~REVLOGNG_PDELTA:
> >              raise RevlogError(_('incompatible revision flag %x') %
> >                                (self.flags(rev)))
> >
> > @@ -1142,7 +1142,7 @@
> >              if not d:
> >                  ptext = self.revision(p1)
> >                  d = mdiff.textdiff(ptext, text)
> > -                flags = REVLOG_PARENTDELTA_FLAGS
> > +                flags = REVLOGNG_PDELTA
> >              data = compress(d)
> >              l = len(data[1]) + len(data[0])
> >              dist = l + offset - self.start(base)
>
> --
> :wq
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100713/ee3a49ef/attachment.htm>