This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6237

absorb: aborting if another operation is in progress
ClosedPublic

Authored by rdamazio on Apr 16 2019, 1:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG537a8aeb9977: absorb: aborting if another operation is in progress
Summary

This increases safety of using absorb by both aborting when another operation
is in progress (since the absorption could confuse any other command a lot)
and holding the locks throughout the reading of the working directory (for
which changes to absorb) and the reading of the repo (for which changes to
absorb into).

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

rdamazio created this revision.Apr 16 2019, 1:16 AM
pulkit accepted this revision.Apr 16 2019, 7:55 AM
Closed by commit rHG537a8aeb9977: absorb: aborting if another operation is in progress (authored by rdamazio). · Explain WhyApr 16 2019, 8:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (24 lines)
AMtests/test-absorb-unfinished.t (30 lines)

Diff 14760

hgext/absorb.py

@property @property
def chunkstats(self): def chunkstats(self):
"""-> {path: chunkstats}. collect chunkstats from filefixupstates""" """-> {path: chunkstats}. collect chunkstats from filefixupstates"""
return dict((path, state.chunkstats) return dict((path, state.chunkstats)
for path, state in self.fixupmap.iteritems()) for path, state in self.fixupmap.iteritems())
def commit(self): def commit(self):
"""commit changes. update self.finalnode, self.replacemap""" """commit changes. update self.finalnode, self.replacemap"""
with self.repo.wlock(), self.repo.lock():
with self.repo.transaction('absorb') as tr: with self.repo.transaction('absorb') as tr:
self._commitstack() self._commitstack()
self._movebookmarks(tr) self._movebookmarks(tr)
if self.repo['.'].node() in self.replacemap: if self.repo['.'].node() in self.replacemap:
self._moveworkingdirectoryparent() self._moveworkingdirectoryparent()
self._cleanupoldcommits() self._cleanupoldcommits()
return self.finalnode return self.finalnode
def printchunkstats(self): def printchunkstats(self):
"""print things like '1 of 2 chunk(s) applied'""" """print things like '1 of 2 chunk(s) applied'"""
ui = self.ui ui = self.ui
chunkstats = self.chunkstats chunkstats = self.chunkstats
if ui.verbose: if ui.verbose:
# chunkstats for each file # chunkstats for each file
By default, absorb will show what it plans to do and prompt for By default, absorb will show what it plans to do and prompt for
confirmation. If you are confident that the changes will be absorbed confirmation. If you are confident that the changes will be absorbed
to the correct place, run :hg:`absorb -a` to apply the changes to the correct place, run :hg:`absorb -a` to apply the changes
immediately. immediately.
Returns 0 on success, 1 if all chunks were ignored and nothing amended. Returns 0 on success, 1 if all chunks were ignored and nothing amended.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
with repo.wlock(), repo.lock():
if not opts['dry_run']:
cmdutil.checkunfinished(repo)
state = absorb(ui, repo, pats=pats, opts=opts) state = absorb(ui, repo, pats=pats, opts=opts)
if sum(s[0] for s in state.chunkstats.values()) == 0: if sum(s[0] for s in state.chunkstats.values()) == 0:
return 1 return 1

tests/test-absorb-unfinished.t

  • This file was added.
$ cat >> $HGRCPATH << EOF
> [extensions]
> absorb=
> EOF
Abort absorb if there is an unfinished operation.
$ hg init abortunresolved
$ cd abortunresolved
$ echo "foo1" > foo.whole
$ hg commit -Aqm "foo 1"
$ hg update null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "foo2" > foo.whole
$ hg commit -Aqm "foo 2"
$ hg --config extensions.rebase= rebase -r 1 -d 0
rebasing 1:c3b6dc0e177a "foo 2" (tip)
merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg --config extensions.rebase= absorb
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
[255]