mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 17:58:27 +03:00
304e5c383b
Summary: `push --new-branch` is very rarely used and it does not make much sense with checkheads removed (D14179861). Remove it everywhere. There is still [one user](https://fburl.com/t5hmcxrp) of the `push --new-branch` flag. Do not remove it just yet. Reviewed By: singhsrb Differential Revision: D14212180 fbshipit-source-id: 18f80576ab6464fc36b047a8a35b339231ee9d8e
80 lines
2.8 KiB
Python
80 lines
2.8 KiB
Python
import util
|
|
from edenscm.mercurial import localrepo, util as hgutil
|
|
from edenscm.mercurial.node import bin
|
|
from git_handler import GitHandler
|
|
from gitrepo import gitrepo
|
|
|
|
|
|
try:
|
|
unicode
|
|
except NameError:
|
|
unicode = str
|
|
|
|
|
|
def generate_repo_subclass(baseclass):
|
|
class hgrepo(baseclass):
|
|
if hgutil.safehasattr(localrepo.localrepository, "pull"):
|
|
# Mercurial < 3.2
|
|
@util.transform_notgit
|
|
def pull(self, remote, heads=None, force=False):
|
|
if isinstance(remote, gitrepo):
|
|
return self.githandler.fetch(remote.path, heads)
|
|
else: # pragma: no cover
|
|
return super(hgrepo, self).pull(remote, heads, force)
|
|
|
|
if hgutil.safehasattr(localrepo.localrepository, "push"):
|
|
# Mercurial < 3.2
|
|
@util.transform_notgit
|
|
def push(self, remote, force=False, revs=None):
|
|
if isinstance(remote, gitrepo):
|
|
return self.githandler.push(remote.path, revs, force)
|
|
else: # pragma: no cover
|
|
return super(hgrepo, self).push(remote, force, revs)
|
|
|
|
@util.transform_notgit
|
|
def findoutgoing(self, remote, base=None, heads=None, force=False):
|
|
if isinstance(remote, gitrepo):
|
|
base, heads = self.githandler.get_refs(remote.path)
|
|
out, h = super(hgrepo, self).findoutgoing(remote, base, heads, force)
|
|
return out
|
|
else: # pragma: no cover
|
|
return super(hgrepo, self).findoutgoing(remote, base, heads, force)
|
|
|
|
def _findtags(self):
|
|
(tags, tagtypes) = super(hgrepo, self)._findtags()
|
|
|
|
for tag, rev in self.githandler.tags.iteritems():
|
|
if isinstance(tag, unicode):
|
|
tag = tag.encode("utf-8")
|
|
tags[tag] = bin(rev)
|
|
tagtypes[tag] = "git"
|
|
for tag, rev in self.githandler.remote_refs.iteritems():
|
|
if isinstance(tag, unicode):
|
|
tag = tag.encode("utf-8")
|
|
tags[tag] = rev
|
|
tagtypes[tag] = "git-remote"
|
|
tags.update(self.githandler.remote_refs)
|
|
return (tags, tagtypes)
|
|
|
|
@hgutil.propertycache
|
|
def githandler(self):
|
|
"""get the GitHandler for an hg repo
|
|
|
|
This only makes sense if the repo talks to at least one git remote.
|
|
"""
|
|
return GitHandler(self, self.ui)
|
|
|
|
def tags(self):
|
|
# TODO consider using self._tagscache
|
|
tagscache = super(hgrepo, self).tags()
|
|
tagscache.update(self.githandler.remote_refs)
|
|
for tag, rev in self.githandler.tags.iteritems():
|
|
if tag in tagscache:
|
|
continue
|
|
|
|
tagscache[tag] = bin(rev)
|
|
|
|
return tagscache
|
|
|
|
return hgrepo
|