This is an archive of the discontinued Mercurial Phabricator instance.

Differential D504

undo: work better with chg
ClosedPublic

Authored by felixmerk on Aug 24 2017, 4:14 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXd8dc2f229646: undo: work better with chg
Summary

chg runs a mercurial command, we want to see which actual commands are run and
don't want to wrap at the chg level.

Diff Detail

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

Event Timeline

felixmerk created this revision.Aug 24 2017, 4:14 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 24 2017, 4:14 PM
quark accepted this revision.Aug 24 2017, 4:14 PM
quark added a subscriber: quark.

Great!

This revision is now accepted and ready to land.Aug 24 2017, 4:14 PM
Closed by commit rFBHGXd8dc2f229646: undo: work better with chg (authored by felixmerk). · Explain WhyAug 24 2017, 6:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (13 lines)

Diff 1265

hgext3rd/undo.py

extensions.wrapfunction(dispatch, 'runcommand', _runcommandwrapper) extensions.wrapfunction(dispatch, 'runcommand', _runcommandwrapper)
# undo has its own locking, whitelist itself to bypass repo lock audit # undo has its own locking, whitelist itself to bypass repo lock audit
localrepo.localrepository._wlockfreeprefix.add('undolog/') localrepo.localrepository._wlockfreeprefix.add('undolog/')
# Wrappers # Wrappers
def _runcommandwrapper(orig, lui, repo, cmd, fullargs, *args): def _runcommandwrapper(orig, lui, repo, cmd, fullargs, *args):
# For chg, do not wrap the "serve" runcommand call
if 'CHGINTERNALMARK' in os.environ:
return orig(lui, repo, cmd, fullargs, *args)
# This wrapper executes whenever a command is run. # This wrapper executes whenever a command is run.
# Some commands (eg hg sl) don't actually modify anything # Some commands (eg hg sl) don't actually modify anything
# ie can't be undone, but the command doesn't know this. # ie can't be undone, but the command doesn't know this.
command = [cmd] + fullargs command = [cmd] + fullargs
# Check wether undolog is consistent # Check wether undolog is consistent
# ie check wether the undo ext was # ie check wether the undo ext was
# off before this command # off before this command
existingnodes = {} existingnodes = {}
if all(newnodes.get(x) == existingnodes.get(x) for x in newnodes.keys()): if all(newnodes.get(x) == existingnodes.get(x) for x in newnodes.keys()):
# no changes to record # no changes to record
return False return False
else: else:
newnodes.update({ newnodes.update({
'date': _logdate(repo, tr), 'date': _logdate(repo, tr),
'command': _logcommand(repo, tr, command), 'command': _logcommand(repo, tr, command),
'unfinished': unfinished(repo, command=command), 'unfinished': unfinished(repo),
}) })
_logindex(repo, tr, newnodes) _logindex(repo, tr, newnodes)
# changes have been recorded # changes have been recorded
return True return True
def unfinished(repo, commit=False, command=None): def unfinished(repo):
'''like cmdutil.checkunfinished without raising an Abort''' '''like cmdutil.checkunfinished without raising an Abort'''
# "hg serve" usually does not make sense to undo to. hide it from undolog
if command and command[0] == 'serve':
return True
for f, clearable, allowcommit, msg, hint in cmdutil.unfinishedstates: for f, clearable, allowcommit, msg, hint in cmdutil.unfinishedstates:
if commit and allowcommit:
continue
if repo.vfs.exists(f): if repo.vfs.exists(f):
return True return True
return False return False
# Write: Logs # Write: Logs
def writelog(repo, tr, name, revstring): def writelog(repo, tr, name, revstring):
if tr is None: if tr is None: