( )⚙ D6535 strip: use bailifchanged() instead of reimplementing it

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6535

strip: use bailifchanged() instead of reimplementing it
ClosedPublic

Authored by martinvonz on Jun 17 2019, 1:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1474f5d84662: strip: use bailifchanged() instead of reimplementing it
Summary

This also means that we get the standard error messages (see changed
test cases).

Diff Detail

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

Event Timeline

martinvonz created this revision.Jun 17 2019, 1:59 PM
martinvonz added a commit: rHG1474f5d84662: strip: use bailifchanged() instead of reimplementing it.Jun 17 2019, 6:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1474f5d84662: strip: use bailifchanged() instead of reimplementing it (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/strip.py (10 lines)
Mtests/test-mq.t (2 lines)
Mtests/test-strip.t (4 lines)

Diff 15560

hgext/strip.py

if s not in bctx.substate or bctx.sub(s).dirty(): if s not in bctx.substate or bctx.sub(s).dirty():
inclsubs.append(s) inclsubs.append(s)
return inclsubs return inclsubs
def checklocalchanges(repo, force=False): def checklocalchanges(repo, force=False):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
s = repo.status() s = repo.status()
if not force: if not force:
if len(repo[None].parents()) > 1: cmdutil.bailifchanged(repo)
_("outstanding uncommitted merge") #i18 tool detection
raise error.Abort(_("outstanding uncommitted merge"))
if s.modified or s.added or s.removed or s.deleted:
_("local changes found") # i18n tool detection
raise error.Abort(_("local changes found"))
if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection
raise error.Abort(_("local changed subrepos found"))
return s return s
def _findupdatetarget(repo, nodes): def _findupdatetarget(repo, nodes):
unode, p2 = repo.changelog.parents(nodes[0]) unode, p2 = repo.changelog.parents(nodes[0])
currentbranch = repo[None].branch() currentbranch = repo[None].branch()
if (util.safehasattr(repo, 'mq') and p2 != nullid if (util.safehasattr(repo, 'mq') and p2 != nullid
and p2 in [x.node for x in repo.mq.applied]): and p2 in [x.node for x in repo.mq.applied]):

tests/test-mq.t

strip with local changes, should complain strip with local changes, should complain
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo y>y $ echo y>y
$ hg add y $ hg add y
$ hg strip tip $ hg strip tip
abort: local changes found abort: uncommitted changes
[255] [255]
--force strip with local changes --force strip with local changes
$ hg strip -f tip $ hg strip -f tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg
$ cd .. $ cd ..

tests/test-strip.t

branch: default branch: default
commit: 1 modified, 1 unknown, 1 unresolved commit: 1 modified, 1 unknown, 1 unresolved
update: (current) update: (current)
phases: 2 draft phases: 2 draft
mq: 3 unapplied mq: 3 unapplied
$ echo c > b $ echo c > b
$ hg strip tip $ hg strip tip
abort: local changes found abort: uncommitted changes
[255] [255]
$ hg strip tip --keep $ hg strip tip --keep
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg log --graph $ hg log --graph
@ changeset: 0:9ab35a2d17cb @ changeset: 0:9ab35a2d17cb
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
abort: unknown revision '2702dd0c91e7'! abort: unknown revision '2702dd0c91e7'!
[255] [255]
$ hg update B $ hg update B
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 B) (activating bookmark B)
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg strip -B B $ hg strip -B B
abort: local changes found abort: uncommitted changes
[255] [255]
$ hg bookmarks $ hg bookmarks
* B 6:ff43616e5d0f * B 6:ff43616e5d0f
Make sure no one adds back a -b option: Make sure no one adds back a -b option:
$ hg strip -b tip $ hg strip -b tip
hg strip: option -b not recognized hg strip: option -b not recognized