##// END OF EJS Templates
tests: test divergence created during interrupted rebase...
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

File last commit:

r46554:89a2afe3 default
r47586:6648307d default
Show More
txnutil.py
36 lines | 1.0 KiB | text/x-python | PythonLexer
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 # txnutil.py - transaction related utilities
#
# Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others
#
# 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 errno
Augie Fackler
formatting: blacken the codebase...
r43346 from . import encoding
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050
def mayhavepending(root):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """return whether 'root' may have pending changes, which are
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 visible to this process.
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return root == encoding.environ.get(b'HG_PENDING')
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050
Augie Fackler
formatting: blacken the codebase...
r43346
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 def trypending(root, vfs, filename, **kwargs):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """Open file to be read according to HG_PENDING environment variable
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050
This opens '.pending' of specified 'filename' only when HG_PENDING
is equal to 'root'.
This returns '(fp, is_pending_opened)' tuple.
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 if mayhavepending(root):
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return (vfs(b'%s.pending' % filename, **kwargs), True)
FUJIWARA Katsunori
txnutil: factor out the logic to read file in according to HG_PENDING...
r31050 except IOError as inst:
if inst.errno != errno.ENOENT:
raise
return (vfs(filename, **kwargs), False)