This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6529

strip: during merge allow strip only when -f is used
ClosedPublic

Authored by taapas1128 on Jun 14 2019, 8:59 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1acaa9f37377: strip: during merge allow strip only when -f is used
Summary

This ensures to abort strip to hg strip when we have a merge
in progress and allow it only when a --force flag is used.

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

taapas1128 created this revision.Jun 14 2019, 8:59 AM
pulkit added a subscriber: pulkit.Jun 14 2019, 9:28 AM
pulkit added inline comments.
hgext/strip.py
54

we will need a similar dance for i18n tool detection which is done below.

also we need to add excsuffix to error message too.

tests/test-strip.t
287

this and the similar changes below should be globbed as they were before.

taapas1128 marked 2 inline comments as done.Jun 14 2019, 10:16 AM
pulkit accepted this revision.Jun 14 2019, 11:15 AM
taapas1128 added a commit: rHG1acaa9f37377: strip: during merge allow strip only when -f is used.Jun 14 2019, 11:22 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1acaa9f37377: strip: during merge allow strip only when -f is used (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/strip.py (3 lines)
Mtests/test-strip.t (5 lines)

Diff 15512

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, excsuffix=''): def checklocalchanges(repo, force=False, excsuffix=''):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
s = repo.status() s = repo.status()
if not force: if not force:
if len(repo[None].parents()) > 1:
_("outstanding uncommitted merge") #i18 tool detection
pulkitUnsubmitted
Done

we will need a similar dance for i18n tool detection which is done below.

also we need to add excsuffix to error message too.

pulkit: we will need a similar dance for i18n tool detection which is done below. also we need to add…
raise error.Abort(_("outstanding uncommitted merge"+ excsuffix))
if s.modified or s.added or s.removed or s.deleted: if s.modified or s.added or s.removed or s.deleted:
_("local changes found") # i18n tool detection _("local changes found") # i18n tool detection
raise error.Abort(_("local changes found" + excsuffix)) raise error.Abort(_("local changes found" + excsuffix))
if checksubstate(repo): if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection _("local changed subrepos found") # i18n tool detection
raise error.Abort(_("local changed subrepos found" + excsuffix)) raise error.Abort(_("local changed subrepos found" + excsuffix))
return s return s

tests/test-strip.t

changeset: 4:264128213d29 changeset: 4:264128213d29
tag: tip tag: tip
parent: 1:ef3a871183d7 parent: 1:ef3a871183d7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: c summary: c
##strip not allowed with merge in progress
$ hg strip 4 $ hg strip 4
abort: outstanding uncommitted merge
[255]
##strip allowed --force with merge in progress
$ hg strip 4 --force
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
after strip of merge parent after strip of merge parent
$ hg parents $ hg parents
changeset: 1:ef3a871183d7 changeset: 1:ef3a871183d7
pulkitUnsubmitted
Done

this and the similar changes below should be globbed as they were before.

pulkit: this and the similar changes below should be globbed as they were before.
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: b summary: b
$ restore $ restore
$ 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