This is an archive of the discontinued Mercurial Phabricator instance.

Differential D145

drop: fix check-code failures
ClosedPublic

Authored by ryanmce on Jul 19 2017, 9:48 AM.
Tags
None
Subscribers
None

Details

Reviewers
stash
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGX43658fbac789: drop: fix check-code failures
Summary

These issues broke test-check-code-hg.t

Test Plan

test-check-code-hg.t now passes

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

ryanmce created this revision.Jul 19 2017, 9:48 AM
stash accepted this revision.Jul 19 2017, 10:01 AM
This revision is now accepted and ready to land.Jul 19 2017, 10:01 AM
simonfar accepted this revision.Jul 19 2017, 10:01 AM
Closed by commit rFBHGX43658fbac789: drop: fix check-code failures (authored by ryanmce). · Explain WhyJul 19 2017, 10:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/drop.py (2 lines)
Mtests/test-drop.t (10 lines)

Diff 306

hgext3rd/drop.py

testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
def _checkextension(name, ui): def _checkextension(name, ui):
try: try:
return extensions.find(name) return extensions.find(name)
except KeyError: except KeyError:
ui.warn(_('extension %s not found\n' % name)) ui.warn(_('extension %s not found\n') % name)
return None return None
def _showrev(ui, repo, revid): def _showrev(ui, repo, revid):
"""pretty print the changeset to drop""" """pretty print the changeset to drop"""
showopts = { showopts = {
'template': 'Dropping changeset ' 'template': 'Dropping changeset '
'{shortest(node, 6)}{if(bookmarks, " ({bookmarks})")}' '{shortest(node, 6)}{if(bookmarks, " ({bookmarks})")}'

tests/test-drop.t

UTILS: UTILS:
$ reset() { $ reset() {
> cd .. > cd ..
> rm -rf a > rm -rf a
> hg init a > hg init a
> cd a > cd a
> } > }
TEST: incomplete requirements handling (required extension excluded) TEST: incomplete requirements handling (required extension excluded)
$ hg init a $ hg init a
$ cd a $ cd a
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> drop= > drop = $TESTDIR/../hgext3rd/drop.py
> EOF > EOF
$ hg drop 1 $ hg drop 1
extension rebase not found extension rebase not found
abort: required extensions not detected abort: required extensions not detected
[255] [255]
SETUP: Properly setup all required extensions SETUP: Properly setup all required extensions
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drop= > drop = $TESTDIR/../hgext3rd/drop.py
> [experimental] > [experimental]
> evolution=all > evolution=all
> EOF > EOF
TEST: handling no revision provided to drop TEST: handling no revision provided to drop
$ hg drop $ hg drop
abort: no revision to drop was provided abort: no revision to drop was provided
[255] [255]
$ hg log -G -T '{rev} {desc|firstline}' $ hg log -G -T '{rev} {desc|firstline}'
o 0 r0 o 0 r0
RESET and SETUP RESET and SETUP
$ reset $ reset
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drop= > drop = $TESTDIR/../hgext3rd/drop.py
> [experimental] > [experimental]
> evolution=all > evolution=all
> EOF > EOF
TEST: dropping changeset in the middle of the stack TEST: dropping changeset in the middle of the stack
$ hg debugbuilddag +4 -m $ hg debugbuilddag +4 -m
$ hg log -G -T '{rev} {desc|firstline}' $ hg log -G -T '{rev} {desc|firstline}'
o 3 r3 o 3 r3
abort: only one revision can be dropped at a time abort: only one revision can be dropped at a time
[255] [255]
RESET and SETUP RESET and SETUP
$ reset $ reset
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drop= > drop = $TESTDIR/../hgext3rd/drop.py
> [experimental] > [experimental]
> evolution=all > evolution=all
> EOF > EOF
TEST: dropping a changest with child changesets TEST: dropping a changest with child changesets
$ hg debugbuilddag -m "+5 *3 +2" $ hg debugbuilddag -m "+5 *3 +2"
$ hg log -G -T '{rev} {desc|firstline}' $ hg log -G -T '{rev} {desc|firstline}'
o 7 r7 o 7 r7
abort: public changeset which landed cannot be dropped abort: public changeset which landed cannot be dropped
[255] [255]
RESET and SETUP RESET and SETUP
$ reset $ reset
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drop= > drop = $TESTDIR/../hgext3rd/drop.py
> [experimental] > [experimental]
> evolution=all > evolution=all
> EOF > EOF
TEST: dropping a changeset with merge conflict TEST: dropping a changeset with merge conflict
$ hg debugbuilddag -o +4 $ hg debugbuilddag -o +4
$ hg log -G -T '{rev} {desc|firstline}' $ hg log -G -T '{rev} {desc|firstline}'
o 3 r3 o 3 r3