This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9340

errors: raise InputError in `hg absorb`
ClosedPublic

Authored by martinvonz on Nov 17 2020, 7:56 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGf4a218331ff4: errors: raise InputError in `hg absorb`
rHG5adc301394f0: errors: raise InputError in `hg absorb`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 17 2020, 7:56 PM
mharbison72 accepted this revision.Nov 18 2020, 1:46 AM
This revision is now accepted and ready to land.Nov 18 2020, 1:46 AM
martinvonz added a commit: rHG5adc301394f0: errors: raise InputError in `hg absorb`.Nov 19 2020, 1:02 PM
Closed by commit rHG5adc301394f0: errors: raise InputError in `hg absorb` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (8 lines)
Mtests/test-absorb.t (6 lines)

Diff 23563

hgext/absorb.py

for i, _f in visiblefctxs for i, _f in visiblefctxs
] ]
), ),
self._getline(l), self._getline(l),
) )
# run editor # run editor
editedtext = self.ui.edit(editortext, b'', action=b'absorb') editedtext = self.ui.edit(editortext, b'', action=b'absorb')
if not editedtext: if not editedtext:
raise error.Abort(_(b'empty editor text')) raise error.InputError(_(b'empty editor text'))
# parse edited result # parse edited result
contents = [b''] * len(self.fctxs) contents = [b''] * len(self.fctxs)
leftpadpos = 4 leftpadpos = 4
colonpos = leftpadpos + len(visiblefctxs) + 1 colonpos = leftpadpos + len(visiblefctxs) + 1
for l in mdiff.splitnewlines(editedtext): for l in mdiff.splitnewlines(editedtext):
if l.startswith(b'HG:'): if l.startswith(b'HG:'):
continue continue
if l[colonpos - 1 : colonpos + 2] != b' : ': if l[colonpos - 1 : colonpos + 2] != b' : ':
raise error.Abort(_(b'malformed line: %s') % l) raise error.InputError(_(b'malformed line: %s') % l)
linecontent = l[colonpos + 2 :] linecontent = l[colonpos + 2 :]
for i, ch in enumerate( for i, ch in enumerate(
pycompat.bytestr(l[leftpadpos : colonpos - 1]) pycompat.bytestr(l[leftpadpos : colonpos - 1])
): ):
if ch == b'y': if ch == b'y':
contents[visiblefctxs[i][0]] += linecontent contents[visiblefctxs[i][0]] += linecontent
# chunkstats is hard to calculate if anything changes, therefore # chunkstats is hard to calculate if anything changes, therefore
# set them to just a simple value (1, 1). # set them to just a simple value (1, 1).
if targetctx is None, the working copy context will be used. if targetctx is None, the working copy context will be used.
if stack is None, the current draft stack will be used. if stack is None, the current draft stack will be used.
return fixupstate. return fixupstate.
""" """
if stack is None: if stack is None:
limit = ui.configint(b'absorb', b'max-stack-size') limit = ui.configint(b'absorb', b'max-stack-size')
headctx = repo[b'.'] headctx = repo[b'.']
if len(headctx.parents()) > 1: if len(headctx.parents()) > 1:
raise error.Abort(_(b'cannot absorb into a merge')) raise error.InputError(_(b'cannot absorb into a merge'))
stack = getdraftstack(headctx, limit) stack = getdraftstack(headctx, limit)
if limit and len(stack) >= limit: if limit and len(stack) >= limit:
ui.warn( ui.warn(
_( _(
b'absorb: only the recent %d changesets will ' b'absorb: only the recent %d changesets will '
b'be analysed\n' b'be analysed\n'
) )
% limit % limit
) )
if not stack: if not stack:
raise error.Abort(_(b'no mutable changeset to change')) raise error.InputError(_(b'no mutable changeset to change'))
if targetctx is None: # default to working copy if targetctx is None: # default to working copy
targetctx = repo[None] targetctx = repo[None]
if pats is None: if pats is None:
pats = () pats = ()
if opts is None: if opts is None:
opts = {} opts = {}
state = fixupstate(stack, ui=ui, opts=opts) state = fixupstate(stack, ui=ui, opts=opts)
matcher = scmutil.match(targetctx, pats, opts) matcher = scmutil.match(targetctx, pats, opts)

tests/test-absorb.t

$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
Do not crash with empty repo: Do not crash with empty repo:
$ hg absorb $ hg absorb
abort: no mutable changeset to change abort: no mutable changeset to change
[255] [10]
Make some commits: Make some commits:
$ for i in 1 2 3 4 5; do $ for i in 1 2 3 4 5; do
> echo $i >> a > echo $i >> a
> hg commit -A a -m "commit $i" -q > hg commit -A a -m "commit $i" -q
> done > done
1: 2b 1: 2b
2: 4d 2: 4d
2: insert aftert 4d 2: insert aftert 4d
$ hg co -qC 1 $ hg co -qC 1
$ sedi 's/Insert/insert/' a $ sedi 's/Insert/insert/' a
$ hg absorb --apply-changes $ hg absorb --apply-changes
abort: no mutable changeset to change abort: no mutable changeset to change
[255] [10]
Make working copy clean: Make working copy clean:
$ hg co -qC ba $ hg co -qC ba
$ rm c $ rm c
$ hg status $ hg status
Merge commit will not be changed: Merge commit will not be changed:
o 1 commit 2 public o 1 commit 2 public
| |
o 0 commit 1 public o 0 commit 1 public
$ echo 2 >> m1 $ echo 2 >> m1
$ echo 2 >> m2 $ echo 2 >> m2
$ hg absorb --apply-changes $ hg absorb --apply-changes
abort: cannot absorb into a merge abort: cannot absorb into a merge
[255] [10]
$ hg revert -q -C m1 m2 $ hg revert -q -C m1 m2
Use a new repo: Use a new repo:
$ cd .. $ cd ..
$ hg init repo2 $ hg init repo2
$ cd repo2 $ cd repo2