This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1738

pushrebase: expose onto bookmark to prepushrebase hook
ClosedPublic

Authored by quark on Dec 20 2017, 4:36 PM.
Tags
None
Subscribers
None

Details

Reviewers
• jeroenv
Group Reviewers
Restricted Project
Commits
rFBHGX7ccded52f71b: pushrebase: expose onto bookmark to prepushrebase hook
Summary

Some hooks need the --to bookmark name.

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

quark created this revision.Dec 20 2017, 4:36 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 20 2017, 4:36 PM
• jeroenv accepted this revision.Dec 20 2017, 4:52 PM
This revision is now accepted and ready to land.Dec 20 2017, 4:52 PM
Closed by commit rFBHGX7ccded52f71b: pushrebase: expose onto bookmark to prepushrebase hook (authored by quark). · Explain WhyDec 20 2017, 6:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/pushrebase.py (6 lines)
Mtests/test-pushrebase.t (2 lines)

Diff 4565

hgext3rd/pushrebase.py

for k in replacements.keys(): for k in replacements.keys():
replacements[hex(k)] = hex(replacements[k]) replacements[hex(k)] = hex(replacements[k])
op.records.add(rebaseparttype, replacements) op.records.add(rebaseparttype, replacements)
return 1 return 1
def prepushrebasehooks(op, params, bundle, bundlefile): def prepushrebasehooks(op, params, bundle, bundlefile):
prelockonto = resolveonto(op.repo, onto = params.get('onto')
params.get('onto', donotrebasemarker)) prelockonto = resolveonto(op.repo, onto or donotrebasemarker)
prelockontonode = prelockonto.hex() if prelockonto else None prelockontonode = prelockonto.hex() if prelockonto else None
# Allow running hooks on the new commits before we take the lock # Allow running hooks on the new commits before we take the lock
prelockrebaseargs = op.hookargs.copy() prelockrebaseargs = op.hookargs.copy()
prelockrebaseargs['source'] = 'push' prelockrebaseargs['source'] = 'push'
prelockrebaseargs['bundle2'] = '1' prelockrebaseargs['bundle2'] = '1'
prelockrebaseargs['node'] = scmutil.revsingle(bundle, prelockrebaseargs['node'] = scmutil.revsingle(bundle,
'min(bundle())').hex() 'min(bundle())').hex()
prelockrebaseargs['node_onto'] = prelockontonode prelockrebaseargs['node_onto'] = prelockontonode
if onto:
prelockrebaseargs['onto'] = onto
prelockrebaseargs['hook_bundlepath'] = bundlefile prelockrebaseargs['hook_bundlepath'] = bundlefile
for path in op.records[treepackrecords]: for path in op.records[treepackrecords]:
if ':' in path: if ':' in path:
raise RuntimeError(_("tree pack path may not contain colon (%s)") % raise RuntimeError(_("tree pack path may not contain colon (%s)") %
path) path)
prelockrebaseargs['hook_packpaths'] = ':'.join(op.records[treepackrecords]) prelockrebaseargs['hook_packpaths'] = ':'.join(op.records[treepackrecords])

tests/test-pushrebase.t

0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark master) (activating bookmark master)
$ echo >> file && hg ci -Aqm first $ echo >> file && hg ci -Aqm first
$ echo >> file && hg ci -Aqm second $ echo >> file && hg ci -Aqm second
$ echo >> file && hg ci -Aqm last $ echo >> file && hg ci -Aqm last
$ hg push --to master -B master $ hg push --to master -B master
pushing to $TESTTMP/hookserver (glob) pushing to $TESTTMP/hookserver (glob)
searching for changes searching for changes
prepushrebase hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushrebase HG_HOOKTYPE=prepushrebase HG_HOOK_BUNDLEPATH=* HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_ONTO=e95be919ac60f0c114075e32a0a4301afabadb60 HG_SOURCE=push (glob) prepushrebase hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushrebase HG_HOOKTYPE=prepushrebase HG_HOOK_BUNDLEPATH=* HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_ONTO=e95be919ac60f0c114075e32a0a4301afabadb60 HG_ONTO=master HG_SOURCE=push (glob)
prechangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob) prechangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
pushing 3 changesets: pushing 3 changesets:
4fcee35c508c first 4fcee35c508c first
11be4ca7f3f4 second 11be4ca7f3f4 second
a5e72ac0df88 last a5e72ac0df88 last
pretxnchangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_LAST=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_PENDING=$TESTTMP/hookserver HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob) pretxnchangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_LAST=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_PENDING=$TESTTMP/hookserver HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=master HG_NAMESPACE=bookmarks HG_NEW=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_OLD=e95be919ac60f0c114075e32a0a4301afabadb60 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob) prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=master HG_NAMESPACE=bookmarks HG_NEW=a5e72ac0df8881afef34132987e8ae78d2e6cb13 HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_OLD=e95be919ac60f0c114075e32a0a4301afabadb60 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver (glob) pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/hookserver (glob)