This is an archive of the discontinued Mercurial Phabricator instance.

Differential D518

tweakdefaults: make pull --rebase ffwd if nothing to rebase
ClosedPublic

Authored by mbthomas on Aug 25 2017, 10:52 AM.
Tags
None
Subscribers
quark

Details

Reviewers
ryanmce
quark
Group Reviewers
Restricted Project
Commits
rFBHGX2d89843e201b: tweakdefaults: make pull --rebase ffwd if nothing to rebase
Summary

Pull --rebase when you have local draft commits moves your commits,
your working copy, and your active bookmark to the new branch head
(or whatever destination you specify with -d). If you don't have
any local draft commits, it doesn't do any of that.

This change makes it so that it does everything except moving the
commits.

Test Plan

Added new unit tests. Re-ran existing ones.

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

mbthomas created this revision.Aug 25 2017, 10:52 AM
mbthomas updated this revision to Diff 1292.Aug 25 2017, 11:18 AM

Add more testing

ryanmce added a subscriber: quark.Aug 25 2017, 11:53 AM
ryanmce accepted this revision.

Looks good, thanks!

hgext3rd/tweakdefaults.py
347–350

yikes! but good explanation!

tests/test-tweakdefaults-pullrebaseremotenames.t
2

Looks like these two tests are the same except with remotenames enabled in one, right?. I think someone (@quark?) implemented some way to do "test cases" to prevent repetition like this.

This revision is now accepted and ready to land.Aug 25 2017, 11:53 AM
mbthomas added inline comments.Aug 25 2017, 11:56 AM
tests/test-tweakdefaults-pullrebaseremotenames.t
2

Almost. Without remotenames you have to provide -d dest to pull --rebase.

ryanmce added inline comments.Aug 25 2017, 12:01 PM
tests/test-tweakdefaults-pullrebaseremotenames.t
2

You still *can* provide it, though.... I'll leave it up to you whether you want to take the time to combine them or not.

quark added inline comments.Aug 25 2017, 12:08 PM
tests/test-tweakdefaults-pullrebaseremotenames.t
2

See https://fburl.com/giq7mtdj or test-amend.t in core hg for examples.

quark requested changes to this revision.EditedAug 25 2017, 12:15 PM

Could we just check if . is an ancestor of dest to decide whether to fast-forward or not, without messing up with rebase internal? In general we prefer not monkey patching core Mercurial or other extensions unless we have to.

It seems we can implement this feature in remotenames cleanly.

This revision now requires changes to proceed.Aug 25 2017, 12:15 PM
quark resigned from this revision.Aug 25 2017, 12:31 PM

I thought it would cause issues with the upcoming rebase changes (D347 stack). But it actually won't. So I'll let you decide what to do.

quark accepted this revision as: Restricted Project.Aug 25 2017, 12:31 PM
This revision is now accepted and ready to land.Aug 25 2017, 12:31 PM
Closed by commit rFBHGX2d89843e201b: tweakdefaults: make pull --rebase ffwd if nothing to rebase (authored by mbthomas). · Explain WhyAug 29 2017, 12:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1398

hgext3rd/tweakdefaults.py

_('like --delete but also strip changesets'))) _('like --delete but also strip changesets')))
# wrap bookmarks after remotenames # wrap bookmarks after remotenames
def afterloaded(loaded): def afterloaded(loaded):
if loaded: if loaded:
# remotenames is loaded, wrap its wrapper directly # remotenames is loaded, wrap its wrapper directly
remotenames = extensions.find('remotenames') remotenames = extensions.find('remotenames')
wrapfunction(remotenames, 'exbookmarks', unfilteredcmd) wrapfunction(remotenames, 'exbookmarks', unfilteredcmd)
wrapfunction(remotenames, 'expullcmd', pullrebaseffwd)
else: else:
# otherwise wrap the bookmarks command # otherwise wrap the bookmarks command
wrapcommand(commands.table, 'bookmarks', unfilteredcmd) wrapcommand(commands.table, 'bookmarks', unfilteredcmd)
extensions.afterloaded('remotenames', afterloaded) extensions.afterloaded('remotenames', afterloaded)
entry = wrapcommand(commands.table, 'diff', diffcmd) entry = wrapcommand(commands.table, 'diff', diffcmd)
options = entry[1] options = entry[1]
options.append( options.append(
if 'dest' in opts: if 'dest' in opts:
del opts['dest'] del opts['dest']
ret = orig(ui, repo, *args, **opts) ret = orig(ui, repo, *args, **opts)
# NB: we use rebase and not isrebase on the next line because # NB: we use rebase and not isrebase on the next line because
# remotenames may have already handled the rebase. # remotenames may have already handled the rebase.
if dest and rebase: if dest and rebase:
ret = ret or rebasemodule.rebase(ui, repo, dest=dest, tool=tool) ret = ret or rebaseorfastforward(rebasemodule.rebase, ui, repo,
dest=dest, tool=tool)
if dest and update: if dest and update:
ret = ret or commands.update(ui, repo, node=dest, check=True) ret = ret or commands.update(ui, repo, node=dest, check=True)
return ret return ret
def rebaseorfastforward(orig, ui, repo, dest, **args):
"""Wrapper for rebasemodule.rebase that fast-forwards the working directory
and any active bookmark to the rebase destination if there is actually
nothing to rebase.
"""
prev = repo['.']
destrev = scmutil.revsingle(repo, dest)
common = destrev.ancestor(prev)
if prev == common and destrev != prev:
result = hg.update(repo, destrev.node())
if bmactive(repo):
with repo.wlock():
bookmarks.update(repo, [prev.node()], destrev.node())
ui.status(_("nothing to rebase - fast-forwarded to %s\n") % dest)
return result
return orig(ui, repo, dest=dest, **args)
def pullrebaseffwd(orig, rebasefunc, ui, repo, source="default", **opts):
# The remotenames module also wraps "pull --rebase", and if it is active, it
# is the module that actually performs the rebase. If it is rebasing, we
# need to wrap the rebasemodule.rebase function that it calls to replace it
# with our rebaseorfastforward method.
ryanmceUnsubmitted
Not Done

yikes! but good explanation!

ryanmce: yikes! but good explanation!
rebasing = 'rebase' in opts
if rebasing:
rebasemodule = extensions.find('rebase')
if rebasemodule:
wrapfunction(rebasemodule, 'rebase', rebaseorfastforward)
ret = orig(rebasefunc, ui, repo, source, **opts)
if rebasing and rebasemodule:
extensions.unwrapfunction(rebasemodule, 'rebase', rebaseorfastforward)
return ret
def tweakbehaviors(ui): def tweakbehaviors(ui):
"""Tweak Behaviors """Tweak Behaviors
Right now this only tweaks the rebase behavior such that the default Right now this only tweaks the rebase behavior such that the default
exit status code for a noop rebase becomes 0 instead of 1. exit status code for a noop rebase becomes 0 instead of 1.
In future we may add or modify other behaviours here. In future we may add or modify other behaviours here.
""" """

tests/test-tweakdefaults-pullrebaseffwd.t

  • This file was added.
Set up without remotenames
$ cat >> $HGRCPATH << EOF
> [extensions]
> rebase=
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> EOF
$ hg init repo
$ echo a > repo/a
$ hg -R repo commit -qAm a
$ hg clone -q repo clone
$ cd clone
Pull --rebase with no local changes
$ echo b > ../repo/b
$ hg -R ../repo commit -qAm b
$ hg pull --rebase -d default
pulling from $TESTTMP/repo (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing to rebase - fast-forwarded to default
$ hg log -G -T "{rev} {desc}"
@ 1 b
|
o 0 a
Make a local commit and check pull --rebase still works.
$ echo x > x
$ hg commit -qAm x
$ echo c > ../repo/c
$ hg -R ../repo commit -qAm c
$ hg pull --rebase -d default
pulling from $TESTTMP/repo (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
rebasing 2:* "x" (glob)
saved backup bundle * (glob)
$ hg log -G -T "{rev} {desc}"
@ 3 x
|
o 2 c
|
o 1 b
|
o 0 a

tests/test-tweakdefaults-pullrebaseremotenames.t

  • This file was added.
$ . $TESTDIR/require-ext.sh remotenames
ryanmceUnsubmitted
Not Done

Looks like these two tests are the same except with remotenames enabled in one, right?. I think someone (@quark?) implemented some way to do "test cases" to prevent repetition like this.

ryanmce: Looks like these two tests are the same except with remotenames enabled in one, right?. I think…
mbthomasAuthorUnsubmitted
Not Done

Almost. Without remotenames you have to provide -d dest to pull --rebase.

mbthomas: Almost. Without remotenames you have to provide `-d dest` to `pull --rebase`.
ryanmceUnsubmitted
Not Done

You still *can* provide it, though.... I'll leave it up to you whether you want to take the time to combine them or not.

ryanmce: You still *can* provide it, though.... I'll leave it up to you whether you want to take the…
quarkUnsubmitted
Not Done

See https://fburl.com/giq7mtdj or test-amend.t in core hg for examples.

quark: See https://fburl.com/giq7mtdj or `test-amend.t` in core hg for examples.
Set up with remotenames
$ cat >> $HGRCPATH << EOF
> [extensions]
> rebase=
> remotenames=
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> EOF
$ hg init repo
$ echo a > repo/a
$ hg -R repo commit -qAm a
$ hg clone -q repo clone
$ cd clone
Pull --rebase with no local changes
$ hg bookmark localbookmark -t default/default
$ echo b > ../repo/b
$ hg -R ../repo commit -qAm b
$ hg pull --rebase
pulling from $TESTTMP/repo (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing to rebase - fast-forwarded to default/default
$ hg log -G -T "{rev} {desc}: {bookmarks}"
@ 1 b: localbookmark
|
o 0 a:
Make a local commit and check pull --rebase still works.
$ echo x > x
$ hg commit -qAm x
$ echo c > ../repo/c
$ hg -R ../repo commit -qAm c
$ hg pull --rebase
pulling from $TESTTMP/repo (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
rebasing 2:* "x" (localbookmark) (glob)
saved backup bundle * (glob)
$ hg log -G -T "{rev} {desc}: {bookmarks}"
@ 3 x: localbookmark
|
o 2 c:
|
o 1 b:
|
o 0 a: