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
Lint Skipped
Unit
Unit Tests Skipped

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
282

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 (2 lines)
Mtests/test-strip.t (23 lines)

Diff 15510

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:
raise error.Abort(_('outstanding uncommitted merge'))
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…
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/264128213d29-0b39d6bf-backup.hg
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.
after strip of merge parent after strip of merge parent
$ hg parents $ hg parents
changeset: 1:ef3a871183d7 changeset: 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: b summary: b
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
2 is parent of 3, only one strip should happen 2 is parent of 3, only one strip should happen
$ hg strip "roots(2)" 3 $ hg strip "roots(2)" 3
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/65bd5f99a4a3-0eb9aae0-backup.hg
$ hg log -G $ hg log -G
@ changeset: 2:264128213d29 @ changeset: 2:264128213d29
| 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
| summary: c | summary: c
| |
o changeset: 1:ef3a871183d7 o changeset: 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: a summary: a
Failed hook while applying "saveheads" bundle. Failed hook while applying "saveheads" bundle.
$ hg strip 2 --config hooks.pretxnchangegroup.bad=false $ hg strip 2 --config hooks.pretxnchangegroup.bad=false
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/264128213d29-0b39d6bf-backup.hg
transaction abort! transaction abort!
rollback completed rollback completed
strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg'
strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/264128213d29-0eb9aae0-temp.hg'
(fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/264128213d29-0eb9aae0-temp.hg'")
abort: pretxnchangegroup.bad hook exited with status 1 abort: pretxnchangegroup.bad hook exited with status 1
[255] [255]
$ restore $ restore
$ hg log -G $ hg log -G
o changeset: 4:443431ffac4f o changeset: 4:443431ffac4f
| 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
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
2 different branches: 2 strips 2 different branches: 2 strips
$ hg strip 2 4 $ hg strip 2 4
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/443431ffac4f-21215376-backup.hg
$ hg log -G $ hg log -G
o changeset: 2:65bd5f99a4a3 o changeset: 2:65bd5f99a4a3
| 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
| summary: d | summary: d
| |
@ changeset: 1:ef3a871183d7 @ changeset: 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: b | summary: b
| |
o changeset: 0:9ab35a2d17cb o changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
$ restore $ restore
2 different branches and a common ancestor: 1 strip 2 different branches and a common ancestor: 1 strip
$ hg strip 1 "2|4" $ hg strip 1 "2|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
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/ef3a871183d7-7c4e7e70-backup.hg
$ restore $ restore
verify fncache is kept up-to-date verify fncache is kept up-to-date
$ touch a $ touch a
$ hg ci -qAm a $ hg ci -qAm a
#if repofncache #if repofncache
$ cat .hg/store/fncache | sort $ cat .hg/store/fncache | sort