##// END OF EJS Templates
phabricator: teach `getoldnodedrevmap()` to handle folded reviews...
phabricator: teach `getoldnodedrevmap()` to handle folded reviews The tricky part here is reasoning through all of the possible predecessor scenarios. In the typical case of submitting a folded range and then resubmitting it (also folded), filtering the list of commits for the diff stored on Phabricator through the local predecessor list for each single node will result in the typical 1:1 mapping to the old node. There are edge cases like using `hg fold` within the range prior to resubmitting, that will result in mapping to multiple old nodes. In that case, the first direct predecessor is needed for the base of the diff, and the last direct predecessor is needed for the head of the diff in order to make sure that the entire range is included in the diff content. And none of this matters for commits in the middle of the range, as they are never used. Fortunately the only crucial thing here is the `drev` number for each node. For these complicated cases where there are multiple old nodes, simply ignore them all. This will cause `createdifferentialrevision()` to generate a new diff (within the same Differential), and avoids complicating the code. Differential Revision: https://phab.mercurial-scm.org/D8311

File last commit:

r43375:649d3ac3 default
r45136:5f9c917e default
Show More
pointer.py
89 lines | 2.8 KiB | text/x-python | PythonLexer
# pointer.py - Git-LFS pointer serialization
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import re
from mercurial.i18n import _
from mercurial import (
error,
pycompat,
)
from mercurial.utils import stringutil
class InvalidPointer(error.StorageError):
pass
class gitlfspointer(dict):
VERSION = b'https://git-lfs.github.com/spec/v1'
def __init__(self, *args, **kwargs):
self[b'version'] = self.VERSION
super(gitlfspointer, self).__init__(*args)
self.update(pycompat.byteskwargs(kwargs))
@classmethod
def deserialize(cls, text):
try:
return cls(l.split(b' ', 1) for l in text.splitlines()).validate()
except ValueError: # l.split returns 1 item instead of 2
raise InvalidPointer(
_(b'cannot parse git-lfs text: %s') % stringutil.pprint(text)
)
def serialize(self):
sortkeyfunc = lambda x: (x[0] != b'version', x)
items = sorted(pycompat.iteritems(self.validate()), key=sortkeyfunc)
return b''.join(b'%s %s\n' % (k, v) for k, v in items)
def oid(self):
return self[b'oid'].split(b':')[-1]
def size(self):
return int(self[b'size'])
# regular expressions used by _validate
# see https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md
_keyre = re.compile(br'\A[a-z0-9.-]+\Z')
_valuere = re.compile(br'\A[^\n]*\Z')
_requiredre = {
b'size': re.compile(br'\A[0-9]+\Z'),
b'oid': re.compile(br'\Asha256:[0-9a-f]{64}\Z'),
b'version': re.compile(br'\A%s\Z' % stringutil.reescape(VERSION)),
}
def validate(self):
"""raise InvalidPointer on error. return self if there is no error"""
requiredcount = 0
for k, v in pycompat.iteritems(self):
if k in self._requiredre:
if not self._requiredre[k].match(v):
raise InvalidPointer(
_(b'unexpected lfs pointer value: %s=%s')
% (k, stringutil.pprint(v))
)
requiredcount += 1
elif not self._keyre.match(k):
raise InvalidPointer(_(b'unexpected lfs pointer key: %s') % k)
if not self._valuere.match(v):
raise InvalidPointer(
_(b'unexpected lfs pointer value: %s=%s')
% (k, stringutil.pprint(v))
)
if len(self._requiredre) != requiredcount:
miss = sorted(set(self._requiredre.keys()).difference(self.keys()))
raise InvalidPointer(
_(b'missing lfs pointer keys: %s') % b', '.join(miss)
)
return self
deserialize = gitlfspointer.deserialize