This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9257

commit: warn the user when a commit already exists
ClosedPublic

Authored by danchr on Oct 29 2020, 3:03 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG976b26bdd0d8: commit: warn the user when a commit already exists
rHG9ab98d654423: commit: warn the user when a commit already exists
rHG103929c25279: commit: warn the user when a commit already exists
Summary

Sometimes, a commit will result in an exact match of a preexisting
commit, and if that commit isn't a branch head, hg will incorrectly
note that it created a new head. Instead, we should warn the user that
commit already existed in the repository.

In practice, this bug is rather uncommon, and will only occur when the
usr explicitly sets the date.

Please note that this commit contains an API change to
cmdutil.commitstatus()

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

danchr created this revision.Oct 29 2020, 3:03 AM
danchr updated this revision to Diff 23356.Oct 29 2020, 3:10 AM
danchr edited parent revisions, added: D9260: i18n: fix coding tag unsupported by xgettext; removed: D9253: commit: don't change phases for preexisting commits.Oct 29 2020, 8:56 AM
danchr retitled this revision from commit, backout: warn the user when a commit already exists to commit: warn the user when a commit already exists.
danchr edited the summary of this revision. (Show Details)
danchr updated this revision to Diff 23363.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> added a commit: rHG103929c25279: commit: warn the user when a commit already exists.Oct 30 2020, 1:03 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG103929c25279: commit: warn the user when a commit already exists (authored by Dan Villiom Podlaski Christiansen <danchr@gmail.com>). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added subscribers: durin42, martinvonz.Oct 30 2020, 6:23 PM

@durin42, this was queued for stable. It doesn't seem like a bug fix to me and I'm a little worried that the warning happens in benign situations and isn't actionable. I'd prefer if we moved it to the default branch.

Revision Contents
Changeset List

Diff 23378

mercurial/cmdutil.py

edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed]) edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed])
if not added and not modified and not removed: if not added and not modified and not removed:
edittext.append(hgprefix(_(b"no files changed"))) edittext.append(hgprefix(_(b"no files changed")))
edittext.append(b"") edittext.append(b"")
return b"\n".join(edittext) return b"\n".join(edittext)
def commitstatus(repo, node, branch, bheads=None, opts=None): def commitstatus(repo, node, branch, bheads=None, tip=None, opts=None):
if opts is None: if opts is None:
opts = {} opts = {}
ctx = repo[node] ctx = repo[node]
parents = ctx.parents() parents = ctx.parents()
if ( if tip is not None and repo.changelog.tip() == tip:
# avoid reporting something like "committed new head" when
# recommitting old changesets, and issue a helpful warning
# for most instances
repo.ui.warn(_("warning: commit already existed in the repository!\n"))
elif (
not opts.get(b'amend') not opts.get(b'amend')
and bheads and bheads
and node not in bheads and node not in bheads
and not any( and not any(
p.node() in bheads and p.branch() == branch for p in parents p.node() in bheads and p.branch() == branch for p in parents
) )
): ):
repo.ui.status(_(b'created new head\n')) repo.ui.status(_(b'created new head\n'))

mercurial/commands.py

if not message: if not message:
# we don't translate commit messages # we don't translate commit messages
message = b"Backed out changeset %s" % short(node) message = b"Backed out changeset %s" % short(node)
e = cmdutil.getcommiteditor(edit=True, editform=editform) e = cmdutil.getcommiteditor(edit=True, editform=editform)
return repo.commit( return repo.commit(
message, opts.get(b'user'), opts.get(b'date'), match, editor=e message, opts.get(b'user'), opts.get(b'date'), match, editor=e
) )
# save to detect changes
tip = repo.changelog.tip()
newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
if not newnode: if not newnode:
ui.status(_(b"nothing changed\n")) ui.status(_(b"nothing changed\n"))
return 1 return 1
cmdutil.commitstatus(repo, newnode, branch, bheads) cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
def nice(node): def nice(node):
return b'%d:%s' % (repo.changelog.rev(node), short(node)) return b'%d:%s' % (repo.changelog.rev(node), short(node))
ui.status( ui.status(
_(b'changeset %s backs out changeset %s\n') _(b'changeset %s backs out changeset %s\n')
% (nice(newnode), nice(node)) % (nice(newnode), nice(node))
) )
raise error.Abort(_(b'cannot amend with --subrepos')) raise error.Abort(_(b'cannot amend with --subrepos'))
# Let --subrepos on the command line override config setting. # Let --subrepos on the command line override config setting.
ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
cmdutil.checkunfinished(repo, commit=True) cmdutil.checkunfinished(repo, commit=True)
branch = repo[None].branch() branch = repo[None].branch()
bheads = repo.branchheads(branch) bheads = repo.branchheads(branch)
tip = repo.changelog.tip()
extra = {} extra = {}
if opts.get(b'close_branch') or opts.get(b'force_close_branch'): if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
extra[b'close'] = b'1' extra[b'close'] = b'1'
if repo[b'.'].closesbranch(): if repo[b'.'].closesbranch():
raise error.Abort( raise error.Abort(
_(b'current revision is already a branch closing head') _(b'current revision is already a branch closing head')
b"'hg status')\n" b"'hg status')\n"
) )
% len(stat.deleted) % len(stat.deleted)
) )
else: else:
ui.status(_(b"nothing changed\n")) ui.status(_(b"nothing changed\n"))
return 1 return 1
cmdutil.commitstatus(repo, node, branch, bheads, opts) cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'): if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
status( status(
ui, ui,
repo, repo,
modified=True, modified=True,
added=True, added=True,
removed=True, removed=True,

tests/test-backout.t

changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f
$ echo 4 > 4 $ echo 4 > 4
$ hg ci -A -m 4 $ hg ci -A -m 4
adding 4 adding 4
$ hg up 2 $ hg up 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg backout 2 $ hg backout 2
removing 3 removing 3
created new head warning: commit already existed in the repository!
changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f

tests/test-merge-tools.t

(branch merge, don't forget to commit) (branch merge, don't forget to commit)
Verify naming of temporary files and that extension is preserved Verify naming of temporary files and that extension is preserved
(experimental.mergetempdirprefix version): (experimental.mergetempdirprefix version):
$ hg update -q -C 1 $ hg update -q -C 1
$ hg mv f f.txt $ hg mv f f.txt
$ hg ci -qm "f.txt" $ hg ci -qm "f.txt"
warning: commit already existed in the repository!
$ hg update -q -C 2 $ hg update -q -C 2
$ hg merge -y -r tip --tool echo \ $ hg merge -y -r tip --tool echo \
> --config merge-tools.echo.args='$base $local $other $output' \ > --config merge-tools.echo.args='$base $local $other $output' \
> --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. > --config experimental.mergetempdirprefix=$TESTTMP/hgmerge.
merging f and f.txt to f.txt merging f and f.txt to f.txt
$TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob) $TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-phases.t

draft: draft:
$ cd initialrepo $ cd initialrepo
$ hg phase -r 2 $ hg phase -r 2
2: public 2: public
$ hg up -C 1 $ hg up -C 1
0 files updated, 0 files merged, 4 files removed, 0 files unresolved 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ mkcommit C $ mkcommit C
created new head warning: commit already existed in the repository!
$ hg phase -r 2 $ hg phase -r 2
2: public 2: public
Same, but for secret: Same, but for secret:
$ hg up 7 $ hg up 7
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit F -s $ mkcommit F -s
test-debug-phase: new rev 8: x -> 2 test-debug-phase: new rev 8: x -> 2
test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret
$ hg up 7 $ hg up 7
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 phase $ hg phase
7: draft 7: draft
$ mkcommit F $ mkcommit F
test-debug-phase: new rev 8: x -> 2 test-debug-phase: new rev 8: x -> 2
warning: commit already existed in the repository!
test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret
$ hg phase -r tip $ hg phase -r tip
8: secret 8: secret
But what about obsoleted changesets? But what about obsoleted changesets?
$ hg up 4 $ hg up 4
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit H $ mkcommit H
test-debug-phase: new rev 5: x -> 2 test-debug-phase: new rev 5: x -> 2
created new head warning: commit already existed in the repository!
test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret
$ hg phase -r 5 $ hg phase -r 5
5: secret 5: secret
$ hg par $ hg par
changeset: 5:a030c6be5127 changeset: 5:a030c6be5127
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
obsolete: pruned obsolete: pruned
summary: H summary: H
$ hg up tip $ hg up tip
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cd .. $ cd ..

tests/test-remotefilelog-local.t

$ cd shallow3 $ cd shallow3
$ echo 1 > A $ echo 1 > A
$ hg commit -m foo -A A $ hg commit -m foo -A A
$ hg log -r . -T '{node}\n' $ hg log -r . -T '{node}\n'
383ce605500277f879b7460a16ba620eb6930b7f 383ce605500277f879b7460a16ba620eb6930b7f
$ hg update -r '.^' -q $ hg update -r '.^' -q
$ echo 1 > A $ echo 1 > A
$ hg commit -m foo -A A $ hg commit -m foo -A A
warning: commit already existed in the repository!
$ hg log -r . -T '{node}\n' $ hg log -r . -T '{node}\n'
383ce605500277f879b7460a16ba620eb6930b7f 383ce605500277f879b7460a16ba620eb6930b7f

tests/test-unamend.t

$ hg revert -qa $ hg revert -qa
$ rm c $ rm c
Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'move to a b' $ hg ci -qm 'move to a b'
warning: commit already existed in the repository!
$ hg mv b c $ hg mv b c
$ hg amend $ hg amend
warning: commit already existed in the repository!
$ hg mv c d $ hg mv c d
$ hg unamend $ hg unamend
$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
$ hg st --copies $ hg st --copies
A d A d
b b
R b R b