Mercurial > hg
changeset 22685:753515d9e274
obsolete: replace "nb" notation with "num" (for "number")
As requested by Matt Mackall.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 02 Oct 2014 16:57:51 -0500 |
| parents | 73d7de6f9b47 |
| children | 2717dcff7be1 |
| files | mercurial/obsolete.py |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/obsolete.py Wed Sep 24 17:18:57 2014 -0700 +++ b/mercurial/obsolete.py Thu Oct 02 16:57:51 2014 -0500 @@ -146,13 +146,13 @@ # read fixed part cur = data[off:off + _fm0fsize] off += _fm0fsize - nbsuc, mdsize, flags, pre = _unpack(_fm0fixed, cur) + numsuc, mdsize, flags, pre = _unpack(_fm0fixed, cur) # read replacement sucs = () - if nbsuc: - s = (_fm0fnodesize * nbsuc) + if numsuc: + s = (_fm0fnodesize * numsuc) cur = data[off:off + s] - sucs = _unpack(_fm0node * nbsuc, cur) + sucs = _unpack(_fm0node * numsuc, cur) off += s # read metadata # (metadata will be decoded on demand) @@ -202,9 +202,9 @@ for i, p in enumerate(parents): metadata['p%i' % (i + 1)] = node.hex(p) metadata = encodemeta(metadata) - nbsuc = len(sucs) - format = _fm0fixed + (_fm0node * nbsuc) - data = [nbsuc, len(metadata), flags, pre] + numsuc = len(sucs) + format = _fm0fixed + (_fm0node * numsuc) + data = [numsuc, len(metadata), flags, pre] data.extend(sucs) return _pack(format, *data) + metadata