##// END OF EJS Templates
rebase: don't use rebased node as dirstate p2 (BC)...
rebase: don't use rebased node as dirstate p2 (BC) When rebasing a node, we currently use the rebased node as p2 in the dirstate until just before we commit it (we then change to the desired parents). This p2 is visible to the user when the rebase gets interrupted because of merge conflicts. That can be useful to the user as a reminder of which commit is currently being rebased, but I believe it's incorrect for a few reasons: * I think the dirstate parents should be the ones that will be set when the commit is created. * I think having two parents means that you're merging those two commits, but when rebasing, you're generally grafting, not merging. * When rebasing a merge commit, we should use the two desired parents as dirstate parents (and we clearly can't have the rebased node as a third dirstate parent). * `hg graft` (and `hg update --merge`) sets only one parent and `hg rebase` should be consistent with that. I realize that this is a somewhat large user-visible change, but I think it's worth it because it will simplify things quite a bit. Differential Revision: https://phab.mercurial-scm.org/D7827

File last commit:

r43359:c59eb156 default
r44821:9c9cfecd default
Show More
storefactory.py
89 lines | 2.5 KiB | text/x-python | PythonLexer
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305 # 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 _
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from mercurial.pycompat import getattr
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305 from mercurial import (
error,
hg,
util,
)
from . import (
lfutil,
localstore,
wirestore,
)
# During clone this function is passed the src's ui object
# but it needs the dest's ui object so it can read out of
# the config file. Use repo.ui instead.
Boris Feld
largefiles: add support for 'largefiles://' url scheme...
r35580 def openstore(repo=None, remote=None, put=False, ui=None):
if ui is None:
ui = repo.ui
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
if not remote:
lfpullsource = getattr(repo, 'lfpullsource', None)
if lfpullsource:
path = ui.expandpath(lfpullsource)
elif put:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 path = ui.expandpath(b'default-push', b'default')
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 path = ui.expandpath(b'default')
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
# ui.expandpath() leaves 'default-push' and 'default' alone if
# they cannot be expanded: fallback to the empty string,
# meaning the current directory.
Boris Feld
largefiles: add support for 'largefiles://' url scheme...
r35580 if repo is None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 path = ui.expandpath(b'default')
Boris Feld
largefiles: add support for 'largefiles://' url scheme...
r35580 path, _branches = hg.parseurl(path)
remote = hg.peer(repo or ui, {}, path)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif path == b'default-push' or path == b'default':
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305 remote = repo
else:
path, _branches = hg.parseurl(path)
Boris Feld
largefiles: add support for 'largefiles://' url scheme...
r35580 remote = hg.peer(repo or ui, {}, path)
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
# The path could be a scheme so use Mercurial's normal functionality
# to resolve the scheme to a repository and use its path
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 path = util.safehasattr(remote, b'url') and remote.url() or remote.path
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
match = _scheme_re.match(path)
Augie Fackler
formatting: blacken the codebase...
r43346 if not match: # regular filesystem path
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 scheme = b'file'
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305 else:
scheme = match.group(1)
try:
storeproviders = _storeprovider[scheme]
except KeyError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'unsupported URL scheme %r') % scheme)
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
for classobj in storeproviders:
try:
return classobj(ui, repo, remote)
except lfutil.storeprotonotcapable:
pass
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'%s does not appear to be a largefile store')
Augie Fackler
formatting: blacken the codebase...
r43346 % util.hidepassword(path)
)
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
_storeprovider = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'file': [localstore.localstore],
b'http': [wirestore.wirestore],
b'https': [wirestore.wirestore],
b'ssh': [wirestore.wirestore],
Augie Fackler
formatting: blacken the codebase...
r43346 }
liscju
largefiles: move basestore._openstore into new module to remove cycle
r29305
Augie Fackler
largefiles: make scheme regex a bytes regex...
r36328 _scheme_re = re.compile(br'^([a-zA-Z0-9+-.]+)://')
Boris Feld
largefiles: add support for 'largefiles://' url scheme...
r35580
Augie Fackler
formatting: blacken the codebase...
r43346
Boris Feld
largefiles: add support for 'largefiles://' url scheme...
r35580 def getlfile(ui, hash):
return util.chunkbuffer(openstore(ui=ui)._get(hash))