This is an archive of the discontinued Mercurial Phabricator instance.

Differential D164

tweakdefaults: remove --nocheck flag
ClosedPublic

Authored by ryanmce on Jul 21 2017, 6:39 AM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX6844e648c7f5: tweakdefaults: remove --nocheck flag
Summary

Core mercurial has a much better "nocheck" option now that we should just start
using. It's better and it's built-in!

Test Plan

Updated tests

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

ryanmce created this revision.Jul 21 2017, 6:39 AM
quark accepted this revision.Jul 21 2017, 12:01 PM
quark added a subscriber: quark.

killitwithfire

This revision is now accepted and ready to land.Jul 21 2017, 12:01 PM
Closed by commit rFBHGX6844e648c7f5: tweakdefaults: remove --nocheck flag (authored by ryanmce). · Explain WhyJul 24 2017, 8:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 356

hgext3rd/tweakdefaults.py

commands.table['^annotate|blame'][0].__doc__ = blame.__doc__ commands.table['^annotate|blame'][0].__doc__ = blame.__doc__
def extsetup(ui): def extsetup(ui):
entry = wrapcommand(commands.table, 'update', update) entry = wrapcommand(commands.table, 'update', update)
options = entry[1] options = entry[1]
# try to put in alphabetical order # try to put in alphabetical order
options.insert(3, ('', 'inactive', None, options.insert(3, ('', 'inactive', None,
_('update without activating bookmarks'))) _('update without activating bookmarks')))
options.insert(3, ('n', 'nocheck', None,
_('update even with outstanding changes')))
wrapblame() wrapblame()
entry = wrapcommand(commands.table, 'commit', commitcmd) entry = wrapcommand(commands.table, 'commit', commitcmd)
options = entry[1] options = entry[1]
options.insert(9, ('M', 'reuse-message', '', options.insert(9, ('M', 'reuse-message', '',
_('reuse commit message from REV'), _('REV'))) _('reuse commit message from REV'), _('REV')))
opawarerebase = markermetadatawritingcommand(ui, _rebase, 'rebase') opawarerebase = markermetadatawritingcommand(ui, _rebase, 'rebase')
wrapcommand(rebase.cmdtable, 'rebase', opawarerebase) wrapcommand(rebase.cmdtable, 'rebase', opawarerebase)
# updatetotally not to be none # updatetotally not to be none
if not node and not rev and not kwargs['date']: if not node and not rev and not kwargs['date']:
raise error.Abort( raise error.Abort(
'You must specify a destination to update to,' + 'You must specify a destination to update to,' +
' for example "hg update master".', ' for example "hg update master".',
hint='If you\'re trying to move a bookmark forward, try ' + hint='If you\'re trying to move a bookmark forward, try ' +
'"hg rebase -d <destination>".') '"hg rebase -d <destination>".')
# By default, never update when there are local changes unless updating to
# the current rev. This is useful for, eg, arc feature when the only
# thing changing is the bookmark.
if not kwargs['clean'] and not kwargs['nocheck'] and not kwargs['merge']:
target = node or rev
if target and scmutil.revsingle(repo, target, target).rev() != \
repo.revs('.').first():
kwargs['check'] = True
if 'nocheck' in kwargs:
del kwargs['nocheck']
# Doesn't activate inactive bookmarks with this flag # Doesn't activate inactive bookmarks with this flag
# In order to avoid submitting to upstream: # In order to avoid submitting to upstream:
# assumes checkout not to be none # assumes checkout not to be none
# assumes whitespace to be illegal bookmark char # assumes whitespace to be illegal bookmark char
# Wrapping bookmarks' active with pass will # Wrapping bookmarks' active with pass will
# give you the same behavior without the assumptions # give you the same behavior without the assumptions
# but will print wrong output # but will print wrong output
inactive = kwargs.pop('inactive') inactive = kwargs.pop('inactive')

tests/test-tweakdefaults-update.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> rebase= > rebase=
> [experimental]
> updatecheck=noconflict
> EOF > EOF
Set up the repository. Set up the repository.
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ hg debugbuilddag -m '+4 *3 +1' $ hg debugbuilddag -m '+4 *3 +1'
$ hg log --graph -r 0:: -T '{rev}' $ hg log --graph -r 0:: -T '{rev}'
o 5 o 5
$ hg add foo $ hg add foo
$ hg st $ hg st
A foo A foo
Can always update to current commit. Can always update to current commit.
$ hg up . $ hg up .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
By default, --check should be set. Abort with --check set, succeed with --merge
$ hg up 2 $ hg up 2 --check
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg up --nocheck 2 $ hg up --merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Updates to other branches should fail without --merge. Updates to other branches should fail without --merge.
$ hg up 4 $ hg up 4 --check
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg up --nocheck 4
abort: uncommitted changes
(commit or update --clean to discard changes)
[255]
$ hg up --merge 4 $ hg up --merge 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Certain flags shouldn't work together. Certain flags shouldn't work together.
$ hg up --check --merge 3 $ hg up --check --merge 3
abort: can only specify one of -C/--clean, -c/--check, or -m/merge abort: can only specify one of -C/--clean, -c/--check, or -m/merge
[255] [255]
$ hg up --check --clean 3 $ hg up --check --clean 3

tests/test-tweakdefaults.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> rebase= > rebase=
> [experimental]
> updatecheck=noconflict
> EOF > EOF
Setup repo Setup repo
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ touch a $ touch a
$ hg commit -Aqm a $ hg commit -Aqm a
$ hg log -G -T '{rev} {desc}\n' --all $ hg log -G -T '{rev} {desc}\n' --all
o 2 a2 o 2 a2
| |
| @ 1 b | @ 1 b
|/ |/
o 0 a o 0 a
Dirty update to different rev fails by default Dirty update to different rev fails with --check
$ echo x >> a $ echo x >> a
$ hg st $ hg st
M a M a
$ hg update ".^" $ hg update ".^" --check
abort: uncommitted changes abort: uncommitted changes
[255] [255]
Dirty update allowed to same rev and with --nocheck and --clean Dirty update allowed to same rev, with no conflicts, and --clean
$ hg update . $ hg update .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update --nocheck ".^" $ hg update ".^"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg update --clean 1 $ hg update --clean 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Log on dir's works Log on dir's works
$ hg log -T '{rev} {desc}\n' dir $ hg log -T '{rev} {desc}\n' dir
1 b 1 b