This is an archive of the discontinued Mercurial Phabricator instance.

Differential D349

tweakdefaults: do not change the date when using amend --to
ClosedPublic

Authored by simonfar on Aug 11 2017, 12:32 PM.
Tags
None
Subscribers
None

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX59a820ec5f7d: tweakdefaults: do not change the date when using amend --to
Summary

amend --to is a thin wrapper around histedit, and fails if you ask it
to update the date. tweakdefaults can be configured to ask amend to change the
date. When this is the case, don't change the date when using --to, so that it
can work.

Test Plan

Test case added here fails before the change complaining about other
flags with --to, and fails in the histedit afterwards (I'm not clear on why - I
suspect phases are significant here).

Diff Detail

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

Event Timeline

simonfar created this revision.Aug 11 2017, 12:32 PM
ryanmce accepted this revision.Aug 15 2017, 5:19 AM
This revision is now accepted and ready to land.Aug 15 2017, 5:19 AM
Closed by commit rFBHGX59a820ec5f7d: tweakdefaults: do not change the date when using amend --to (authored by simonfar). · Explain WhyAug 16 2017, 11:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/tweakdefaults.py (6 lines)
Mtests/test-tweakdefaults.t (19 lines)

Diff 991

hgext3rd/tweakdefaults.py

rebase, "_nothingtorebase", _nothingtorebase rebase, "_nothingtorebase", _nothingtorebase
) )
except (KeyError, AttributeError): except (KeyError, AttributeError):
pass pass
def commitcmd(orig, ui, repo, *pats, **opts): def commitcmd(orig, ui, repo, *pats, **opts):
if (opts.get("amend") if (opts.get("amend")
and not opts.get("date") and not opts.get("date")
and not opts.get("to")
and not ui.configbool('tweakdefaults', 'amendkeepdate')): and not ui.configbool('tweakdefaults', 'amendkeepdate')):
opts["date"] = currentdate() opts["date"] = currentdate()
rev = opts.get('reuse_message') rev = opts.get('reuse_message')
if rev: if rev:
invalidargs = ['message', 'logfile'] invalidargs = ['message', 'logfile']
currentinvalidargs = [ia for ia in invalidargs if opts.get(ia)] currentinvalidargs = [ia for ia in invalidargs if opts.get(ia)]
if currentinvalidargs: if currentinvalidargs:
def graftcmd(orig, ui, repo, *revs, **opts): def graftcmd(orig, ui, repo, *revs, **opts):
if not opts.get("date") and not ui.configbool('tweakdefaults', if not opts.get("date") and not ui.configbool('tweakdefaults',
'graftkeepdate'): 'graftkeepdate'):
opts["date"] = currentdate() opts["date"] = currentdate()
return orig(ui, repo, *revs, **opts) return orig(ui, repo, *revs, **opts)
def amendcmd(orig, ui, repo, *pats, **opts): def amendcmd(orig, ui, repo, *pats, **opts):
if not opts.get("date") and not ui.configbool('tweakdefaults', if (not opts.get("date")
'amendkeepdate'): and not opts.get("to")
and not ui.configbool('tweakdefaults', 'amendkeepdate')):
opts["date"] = currentdate() opts["date"] = currentdate()
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
def log(orig, ui, repo, *pats, **opts): def log(orig, ui, repo, *pats, **opts):
# 'hg log' defaults to -f # 'hg log' defaults to -f
# All special uses of log (--date, --branch, etc) will also now do follow. # All special uses of log (--date, --branch, etc) will also now do follow.
if not opts.get('rev') and not opts.get('all'): if not opts.get('rev') and not opts.get('all'):
opts['follow'] = True opts['follow'] = True

tests/test-tweakdefaults.t

$ hg amend -q -m "amended message" $ hg amend -q -m "amended message"
$ hg log -T "{rev}\n" -d "yesterday to today" $ hg log -T "{rev}\n" -d "yesterday to today"
7 7
Test amend date when tweakdefaults.amendkeepdate is set Test amend date when tweakdefaults.amendkeepdate is set
$ touch new_file $ touch new_file
$ hg commit -d "0 0" -Aqm "commit for amend" $ hg commit -d "0 0" -Aqm "commit for amend"
$ echo x > new_file $ echo x > new_file
$ hg commit -q --amend -m "amended message" --config tweakdefaults.amendkeepdate=True $ hg amend -q -m "amended message" --config tweakdefaults.amendkeepdate=True
$ hg log -l 1 -T "{date} {rev}\n" $ hg log -l 1 -T "{date} {rev}\n"
0.00 8 0.00 8
Test amend --to doesn't give a flag error when tweakdefaults.amendkeepdate is set
$ echo q > new_file
$ hg amend --to 8 --config tweakdefaults.amendkeepdate=False
hg: parse error: pick "3903775176ed" changeset was not a candidate
(only use listed changesets)
[255]
$ hg log -l 1 -T "{date} {rev}\n"
0.00 9
Test commit --amend date when tweakdefaults.amendkeepdate is set Test commit --amend date when tweakdefaults.amendkeepdate is set
$ echo a >> new_file $ echo a >> new_file
$ hg commit -d "0 0" -Aqm "commit for amend" $ hg commit -d "0 0" -Aqm "commit for amend"
$ echo x > new_file $ echo x > new_file
$ hg commit -q --amend -m "amended message" --config tweakdefaults.amendkeepdate=True $ hg commit -q --amend -m "amended message" --config tweakdefaults.amendkeepdate=True
$ hg log -l 1 -T "{date} {rev}\n" $ hg log -l 1 -T "{date} {rev}\n"
0.00 9 0.00 10
Test commit --amend date when tweakdefaults.amendkeepdate is not set and --date is provided Test commit --amend date when tweakdefaults.amendkeepdate is not set and --date is provided
$ echo xxx > a $ echo xxx > a
$ hg commit -d "0 0" -Aqm "commit for amend" $ hg commit -d "0 0" -Aqm "commit for amend"
$ echo x > a $ echo x > a
$ hg commit -q --amend -m "amended message" --date "1 1" $ hg commit -q --amend -m "amended message" --date "1 1"
$ hg log -l 1 -T "{date} {rev}\n" $ hg log -l 1 -T "{date} {rev}\n"
1.01 10 1.01 11
Test rebase date when tweakdefaults.rebasekeepdate is not set Test rebase date when tweakdefaults.rebasekeepdate is not set
$ echo test_1 > rebase_dest $ echo test_1 > rebase_dest
$ hg commit --date "1 1" -Aqm "dest commit for rebase" $ hg commit --date "1 1" -Aqm "dest commit for rebase"
$ hg bookmark rebase_dest_test_1 $ hg bookmark rebase_dest_test_1
$ hg up -q ".^" $ hg up -q ".^"
$ echo test_1 > rebase_source $ echo test_1 > rebase_source
$ hg commit --date "1 1" -Aqm "source commit for rebase" $ hg commit --date "1 1" -Aqm "source commit for rebase"
$ hg bookmark rebase_source_test_1 $ hg bookmark rebase_source_test_1
$ hg rebase -q -s rebase_source_test_1 -d rebase_dest_test_1 $ hg rebase -q -s rebase_source_test_1 -d rebase_dest_test_1
$ hg log -l 1 -T "{rev}\n" -d "yesterday to today" $ hg log -l 1 -T "{rev}\n" -d "yesterday to today"
12 13
Test rebase date when tweakdefaults.rebasekeepdate is set Test rebase date when tweakdefaults.rebasekeepdate is set
$ echo test_2 > rebase_dest $ echo test_2 > rebase_dest
$ hg commit -Aqm "dest commit for rebase" $ hg commit -Aqm "dest commit for rebase"
$ hg bookmark rebase_dest_test_2 $ hg bookmark rebase_dest_test_2
$ hg up -q ".^" $ hg up -q ".^"
$ echo test_2 > rebase_source $ echo test_2 > rebase_source
$ hg commit -Aqm "source commit for rebase" $ hg commit -Aqm "source commit for rebase"
$ hg bookmark rebase_source_test_2 $ hg bookmark rebase_source_test_2
$ hg rebase -q -s rebase_source_test_2 -d rebase_dest_test_2 --config tweakdefaults.rebasekeepdate=True $ hg rebase -q -s rebase_source_test_2 -d rebase_dest_test_2 --config tweakdefaults.rebasekeepdate=True
$ hg log -l 2 -T "{date} {rev}\n" $ hg log -l 2 -T "{date} {rev}\n"
0.00 15
0.00 14 0.00 14
0.00 13
Test reuse message flag by taking message from previous commit Test reuse message flag by taking message from previous commit
$ cd ../.. $ cd ../..
$ hg up -q hyphen-book $ hg up -q hyphen-book
$ touch afile $ touch afile
$ hg add afile $ hg add afile
$ hg commit -M 2 $ hg commit -M 2
$ hg log --template {desc} -r . $ hg log --template {desc} -r .