##// END OF EJS Templates
graft: introduce --base option for using custom base revision while merging...
graft: introduce --base option for using custom base revision while merging The graft command usually performs an internal merge of the current parent revision with the graft revision, using p1 of the grafted revision as base for the merge. As a trivial extension of this, we introduce the --base option to allow for using another base revision. This can be used as a building block for grafting and collapsing multiple changesets at once, or for grafting the resulting change from a merge as a single simple change. (This is kind of similar to backout --parent ... only different: this graft base must be an ancestor, but is usually *not* a parent.) This is probably an advanced use case, and we do thus not show it in the non-verbose help.

File last commit:

r39813:b63dee7b default
r40460:3c0d5016 default
Show More
pointer.py
83 lines | 2.8 KiB | text/x-python | PythonLexer
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # 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
Matt Harbison
lfs: quiesce check-module-import warnings...
r35098 from mercurial.i18n import _
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 from mercurial import (
error,
Augie Fackler
lfs: use byteskwargs() on some **kwargs for python 3 compat...
r36620 pycompat,
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 )
Augie Fackler
lfs: stabilize error message values for Python 2 and 3...
r37945 from mercurial.utils import (
stringutil,
)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
Gregory Szorc
global: replace most uses of RevlogError with StorageError (API)...
r39813 class InvalidPointer(error.StorageError):
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 pass
class gitlfspointer(dict):
VERSION = 'https://git-lfs.github.com/spec/v1'
def __init__(self, *args, **kwargs):
self['version'] = self.VERSION
Augie Fackler
lfs: use byteskwargs() on some **kwargs for python 3 compat...
r36620 super(gitlfspointer, self).__init__(*args)
self.update(pycompat.byteskwargs(kwargs))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
@classmethod
def deserialize(cls, text):
try:
return cls(l.split(' ', 1) for l in text.splitlines()).validate()
except ValueError: # l.split returns 1 item instead of 2
Yuya Nishihara
stringutil: flip the default of pprint() to bprefix=False...
r37961 raise InvalidPointer(_('cannot parse git-lfs text: %s')
% stringutil.pprint(text))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
def serialize(self):
sortkeyfunc = lambda x: (x[0] != 'version', x)
items = sorted(self.validate().iteritems(), key=sortkeyfunc)
return ''.join('%s %s\n' % (k, v) for k, v in items)
def oid(self):
return self['oid'].split(':')[-1]
def size(self):
return int(self['size'])
# regular expressions used by _validate
# see https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md
Augie Fackler
lfs: add missing b prefixes on some regular expressions...
r36618 _keyre = re.compile(br'\A[a-z0-9.-]+\Z')
_valuere = re.compile(br'\A[^\n]*\Z')
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 _requiredre = {
Augie Fackler
lfs: add missing b prefixes on some regular expressions...
r36618 'size': re.compile(br'\A[0-9]+\Z'),
'oid': re.compile(br'\Asha256:[0-9a-f]{64}\Z'),
Augie Fackler
cleanup: migrate from re.escape to stringutil.reescape...
r38494 'version': re.compile(br'\A%s\Z' % stringutil.reescape(VERSION)),
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 }
def validate(self):
"""raise InvalidPointer on error. return self if there is no error"""
requiredcount = 0
for k, v in self.iteritems():
if k in self._requiredre:
if not self._requiredre[k].match(v):
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 raise InvalidPointer(
_('unexpected lfs pointer value: %s=%s')
% (k, stringutil.pprint(v)))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 requiredcount += 1
elif not self._keyre.match(k):
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 raise InvalidPointer(_('unexpected lfs pointer key: %s') % k)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 if not self._valuere.match(v):
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 raise InvalidPointer(_('unexpected lfs pointer value: %s=%s')
Yuya Nishihara
stringutil: flip the default of pprint() to bprefix=False...
r37961 % (k, stringutil.pprint(v)))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 if len(self._requiredre) != requiredcount:
miss = sorted(set(self._requiredre.keys()).difference(self.keys()))
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 raise InvalidPointer(_('missing lfs pointer keys: %s')
% ', '.join(miss))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 return self
deserialize = gitlfspointer.deserialize