##// END OF EJS Templates
rebase: add boolean config item rebase.store-source...
rebase: add boolean config item rebase.store-source This allows to use rebase without recording a rebase_source extra field. This is useful for example to build a mirror converted from another SCM (such as svn) by converting only new revisions, and then incrementally add them to the destination by pulling from the newly converted (unrelated) repo and rebasing the new revisions onto the last old already stored changeset. Without this patch the rebased changesets would always receive some rebase_source that would depend on the particular history of the conversion process, instead of only depending on the original source revisions. This is used to implement a hg mirror repo of SvarDOS (a partially nonfree but completely redistributable DOS distribution) in the scripts at https://hg.pushbx.org/ecm/svardos.scr/ In particular, cre.sh creates an svn mirror, upd.sh recreates an entire hg repo from the svn mirror (which takes too long to do in a regular job), and akt.sh uses hg convert with the config item convert.svn.startrev to incrementally convert only the two most recent revisions already found in the mirror destination plus any possible new revisions. If any are found, the temporary repo's changesets are pulled into the destination (as changesets from an unrelated repository). Then the changesets corresponding to the new revisions are rebased onto the prior final changeset. (Finally, the two remaining duplicates of the prior head and its parent are stripped from the destination repository.) Without this patch, the particular rebase_source extra field would depend on the order and times at which akt.sh was used, instead of only depending on the source repository. In other words, whatever sequence of upd.sh and akt.sh is used at whatever times, it is desired that the final output repositories always match each other exactly.

File last commit:

r49772:1672c5af default
r50343:cfff73ca default
Show More
pointer.py
88 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.
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(self.validate().items(), 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 self.items():
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