This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6069

uncommit: add flag --allow-dirty-working-copy
ClosedPublic

Authored by navaneeth.suresh on Mar 4 2019, 10:04 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGaa284d9a33ca: uncommit: add flag --allow-dirty-working-copy
Summary

This adds a flag --allow-dirty-working-copy as an alias for
the experimental config option experimental.uncommitondirtydir.

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

pulkit added a subscriber: pulkit.Mar 4 2019, 10:14 AM
pulkit added inline comments.
hgext/uncommit.py
165

how about making this as:

allowdirty = opts['allow_dirty_working_copy'] or repo.ui.configbool('experimental', 'uncommitondirtywdir')

This will make the if condition more simpler to understand.

navaneeth.suresh marked an inline comment as done.Mar 4 2019, 10:39 AM
navaneeth.suresh updated this revision to Diff 14344.
navaneeth.suresh added inline comments.Mar 4 2019, 10:40 AM
hgext/uncommit.py
165

Done.

pulkit accepted this revision.Mar 6 2019, 8:04 AM
Closed by commit rHGaa284d9a33ca: uncommit: add flag --allow-dirty-working-copy (authored by navaneeth.suresh). · Explain WhyMar 6 2019, 8:39 AM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Mar 7 2019, 12:37 PM
mharbison72 added inline comments.
tests/test-uncommit.t
164

Did we lose test coverage here? The output before the prior patch noted it was keeping an empty commit, so maybe the suggested flag needs to be used after this abort?

navaneeth.suresh added inline comments.Mar 7 2019, 2:51 PM
tests/test-uncommit.t
164

I'm not quite sure about this. I'll wait for @pulkit. Also, the fix won't be that easy if needed.

pulkit added inline comments.Mar 8 2019, 1:01 PM
tests/test-uncommit.t
164

@mharbison72 I looked at the test file an there are more instances of that being tested. I am not sure whether we test that here also.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (9 lines)
Mtests/test-uncommit.t (19 lines)

Diff 14375

hgext/uncommit.py

# Adjust the dirstate copies # Adjust the dirstate copies
for dst, src in copies.iteritems(): for dst, src in copies.iteritems():
if (src not in newctx or dst in newctx or ds[dst] != 'a'): if (src not in newctx or dst in newctx or ds[dst] != 'a'):
src = None src = None
ds.copy(src, dst) ds.copy(src, dst)
@command('uncommit', @command('uncommit',
[('', 'keep', None, _('allow an empty commit after uncommiting')), [('', 'keep', None, _('allow an empty commit after uncommiting')),
('', 'allow-dirty-working-copy', False,
_('allow uncommit with outstanding changes'))
] + commands.walkopts, ] + commands.walkopts,
_('[OPTION]... [FILE]...'), _('[OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
def uncommit(ui, repo, *pats, **opts): def uncommit(ui, repo, *pats, **opts):
"""uncommit part or all of a local changeset """uncommit part or all of a local changeset
This command undoes the effect of a local commit, returning the affected This command undoes the effect of a local commit, returning the affected
files to their uncommitted state. This means that files modified or files to their uncommitted state. This means that files modified or
deleted in the changeset will be left unchanged, and so will remain deleted in the changeset will be left unchanged, and so will remain
modified in the working directory. modified in the working directory.
If no files are specified, the commit will be pruned, unless --keep is If no files are specified, the commit will be pruned, unless --keep is
given. given.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
m, a, r, d = repo.status()[:4] m, a, r, d = repo.status()[:4]
isdirtypath = any(set(m + a + r + d) & set(pats)) isdirtypath = any(set(m + a + r + d) & set(pats))
if (not repo.ui.configbool('experimental', 'uncommitondirtywdir') and allowdirtywcopy = (opts['allow_dirty_working_copy'] or
pulkitUnsubmitted
Done

how about making this as:

allowdirty = opts['allow_dirty_working_copy'] or repo.ui.configbool('experimental', 'uncommitondirtywdir')

This will make the if condition more simpler to understand.

pulkit: how about making this as: `allowdirty = opts['allow_dirty_working_copy'] or repo.ui.configbool…
navaneeth.sureshAuthorUnsubmitted
Not Done

Done.

navaneeth.suresh: Done.
(not pats or isdirtypath)): repo.ui.configbool('experimental', 'uncommitondirtywdir'))
if not allowdirtywcopy and (not pats or isdirtypath):
cmdutil.bailifchanged(repo, hint=_('requires ' cmdutil.bailifchanged(repo, hint=_('requires '
'experimental.uncommitondirtywdir to uncommit')) '--allow-dirty-working-copy to uncommit'))
old = repo['.'] old = repo['.']
rewriteutil.precheck(repo, [old.rev()], 'uncommit') rewriteutil.precheck(repo, [old.rev()], 'uncommit')
if len(old.parents()) > 1: if len(old.parents()) > 1:
raise error.Abort(_("cannot uncommit merge changeset")) raise error.Abort(_("cannot uncommit merge changeset"))
with repo.transaction('uncommit'): with repo.transaction('uncommit'):
match = scmutil.match(old, pats, opts) match = scmutil.match(old, pats, opts)
keepcommit = pats keepcommit = pats

tests/test-uncommit.t

If no files are specified, the commit will be pruned, unless --keep is If no files are specified, the commit will be pruned, unless --keep is
given. given.
(use 'hg help -e uncommit' to show help for the uncommit extension) (use 'hg help -e uncommit' to show help for the uncommit extension)
options ([+] can be repeated): options ([+] can be repeated):
--keep allow an empty commit after uncommiting --keep allow an empty commit after uncommiting
--allow-dirty-working-copy allow uncommit with outstanding changes
-I --include PATTERN [+] include names matching the given patterns -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)
Uncommit with no commits should fail Uncommit with no commits should fail
$ hg uncommit $ hg uncommit
abort: cannot uncommit null changeset abort: cannot uncommit null changeset
(no changeset checked out) (no changeset checked out)
$ echo "foo" >> files $ echo "foo" >> files
$ cat files $ cat files
abcde abcde
foo foo
$ hg status $ hg status
M files M files
$ hg uncommit $ hg uncommit
abort: uncommitted changes abort: uncommitted changes
(requires experimental.uncommitondirtywdir to uncommit) (requires --allow-dirty-working-copy to uncommit)
[255] [255]
$ hg uncommit files $ hg uncommit files
abort: uncommitted changes abort: uncommitted changes
(requires experimental.uncommitondirtywdir to uncommit) (requires --allow-dirty-working-copy to uncommit)
mharbison72Unsubmitted
Not Done

Did we lose test coverage here? The output before the prior patch noted it was keeping an empty commit, so maybe the suggested flag needs to be used after this abort?

mharbison72: Did we lose test coverage here? The output before the prior patch noted it was keeping an…
navaneeth.sureshAuthorUnsubmitted
Not Done

I'm not quite sure about this. I'll wait for @pulkit. Also, the fix won't be that easy if needed.

navaneeth.suresh: I'm not quite sure about this. I'll wait for @pulkit. Also, the fix won't be that easy if…
pulkitUnsubmitted
Not Done

@mharbison72 I looked at the test file an there are more instances of that being tested. I am not sure whether we test that here also.

pulkit: @mharbison72 I looked at the test file an there are more instances of that being tested. I am…
[255] [255]
$ cat files $ cat files
abcde abcde
foo foo
$ hg commit --amend -m "files abcde + foo" $ hg commit --amend -m "files abcde + foo"
Testing the 'experimental.uncommitondirtywdir' config Testing the 'experimental.uncommitondirtywdir' config
$ echo "bar" >> files $ echo "bar" >> files
$ hg uncommit $ hg uncommit
abort: uncommitted changes abort: uncommitted changes
(requires experimental.uncommitondirtywdir to uncommit) (requires --allow-dirty-working-copy to uncommit)
[255] [255]
$ hg uncommit --config experimental.uncommitondirtywdir=True $ hg uncommit --config experimental.uncommitondirtywdir=True
$ hg commit -m "files abcde + foo" $ hg commit -m "files abcde + foo"
Uncommit in the middle of a stack, does not move bookmark Uncommit in the middle of a stack, does not move bookmark
$ hg checkout '.^^^' $ hg checkout '.^^^'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Add and expect uncommit to fail on both merge working dir and merge changeset Add and expect uncommit to fail on both merge working dir and merge changeset
$ hg merge 2 $ hg 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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg uncommit $ hg uncommit
abort: outstanding uncommitted merge abort: outstanding uncommitted merge
(requires experimental.uncommitondirtywdir to uncommit) (requires --allow-dirty-working-copy to uncommit)
[255] [255]
$ hg uncommit --config experimental.uncommitondirtywdir=True $ hg uncommit --config experimental.uncommitondirtywdir=True
abort: cannot uncommit while merging abort: cannot uncommit while merging
[255] [255]
$ hg status $ hg status
M a M a
$ echo 'foo' > b $ echo 'foo' > b
$ hg add b $ hg add b
$ hg status $ hg status
A b A b
$ hg unc a $ hg unc a
note: keeping empty commit note: keeping empty commit
$ hg unc b $ hg unc b
abort: uncommitted changes abort: uncommitted changes
(requires experimental.uncommitondirtywdir to uncommit) (requires --allow-dirty-working-copy to uncommit)
[255] [255]
$ cat a $ cat a
super critical info! super critical info!
$ hg log $ hg log
changeset: 1:656ba143d384 changeset: 1:656ba143d384
tag: tip tag: tip
parent: -1:000000000000 parent: -1:000000000000
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add a summary: add a
$ hg ci -Am 'add b' $ hg ci -Am 'add b'
$ echo 'foo bar' > b $ echo 'foo bar' > b
$ hg unc --config experimental.uncommitondirtywdir=True b $ hg unc --allow-dirty-working-copy b
$ hg log $ hg log
changeset: 3:30fa958635b2 changeset: 3:30fa958635b2
tag: tip tag: tip
parent: 1:656ba143d384 parent: 1:656ba143d384
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add b summary: add b
changeset: 1:656ba143d384 changeset: 1:656ba143d384
parent: -1:000000000000 parent: -1:000000000000
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add a summary: add a