This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5554

histedit: added rewrite.update-timestamp to fold and mess
ClosedPublic

Authored by taapas1128 on Jan 10 2019, 10:39 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG704a3aa3dc0a: histedit: add rewrite.update-timestamp support to fold and mess
rHG6459797090ea: histedit: add rewrite.update-timestamp support to fold and mess
Summary

This adds the config option to update time to current in histedit fold and mess options . Setting rewrite.update-timestamp option to True will update the timestamp to current time.This also adds tests/mockmakedate.py for supplying testable values in case current time is invoked in the tests.

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.Jan 10 2019, 10:39 AM
taapas1128 edited the summary of this revision. (Show Details)EditedJan 10 2019, 10:43 AM
taapas1128 added a subscriber: pulkit.

@pulkit please review.

yuja added a subscriber: yuja.Jan 12 2019, 8:55 PM

+ $ cat >> testmocks.py << EOF
+ > # mock out util.makedate() to supply testable values
+ > import os
+ > from mercurial import pycompat, util
+ > from mercurial.utils import dateutil
+ >
+ > def mockmakedate():
+ > filename = os.path.join(os.environ['TESTTMP'], 'testtime')
+ > try:
+ > with open(filename, 'rb') as timef:
+ > time = float(timef.read()) + 1
+ > except IOError:
+ > time = 0.0
+ > with open(filename, 'wb') as timef:
+ > timef.write(pycompat.bytestr(time))
+ > return (time, 0)
+ >
+ > dateutil.makedate = mockmakedate
+ > EOF

Perhaps, it's time to extract the mockmakedate extension to
tests/mockmakedate.py.

@@ -519,9 +520,12 @@

editor = self.commiteditor()
commit = commitfuncfor(repo, rulectx)

+ if repo.ui.configbool('rewrite','update-timestamp'):

Style nit: insert space after comma.

+ date = dateutil.makedate()
+ else :

and no space after else.

def commiteditor(self):
    """The editor to be used to edit the commit message."""

@@ -800,6 +804,8 @@

  1. date if self.firstdate(): commitopts['date'] = ctx.date()

+ elif ui.configbool('rewrite','update-timestamp'):
+ commitopts['date'] = dateutil.makedate()

else:
    commitopts['date'] = max(ctx.date(), oldctx.date())

I'm not pretty sure, but shouldn't we always update the date if update-timestamp
is on?

taapas1128 updated this revision to Diff 13197.Jan 13 2019, 1:47 AM
taapas1128 updated this revision to Diff 13198.Jan 13 2019, 1:51 AM
taapas1128 updated this revision to Diff 13199.Jan 13 2019, 2:10 AM
taapas1128 updated this revision to Diff 13200.Jan 13 2019, 2:34 AM
taapas1128 added a comment.EditedJan 13 2019, 2:38 AM

I have extracted mockdate function as tests/mockdate.py and dealt with the commas and spaces.

def commiteditor(self):
    """The editor to be used to edit the commit message."""

@@ -800,6 +804,8 @@

  1. date if self.firstdate(): commitopts['date'] = ctx.date()

+ elif ui.configbool('rewrite','update-timestamp'):
+ commitopts['date'] = dateutil.makedate()

else:
    commitopts['date'] = max(ctx.date(), oldctx.date())

Yes this is not right time should be updated everytime update-timestamp is True . I have corrected it. @yuja please review.

taapas1128 edited the summary of this revision. (Show Details)Jan 13 2019, 2:42 AM
taapas1128 edited the summary of this revision. (Show Details)Jan 13 2019, 2:46 AM
taapas1128 edited the summary of this revision. (Show Details)Jan 13 2019, 2:49 AM
taapas1128 updated this revision to Diff 13201.
taapas1128 edited the summary of this revision. (Show Details)Jan 13 2019, 2:52 AM
yuja added a comment.Jan 13 2019, 7:14 AM

Queued with minor modifications, thanks.

  • a/tests/test-histedit-fold.t

+++ b/tests/test-histedit-fold.t
@@ -15,6 +15,7 @@

> logt = log --template '{rev}:{node|short} {desc|firstline}\n'
> [extensions]
> histedit=

+ > mockmakedate = $TESTDIR/mockmakedate.py

> EOF

Inserted cd ..

+-==========================================
+Test update-timestamp config option|
+==========================================
+ $ addwithdate ()
+ > {
+ > echo $1 > $1
+ > hg add $1
+ > hg ci -m $1 -d "$2 0"
+ > }
+
+ $ initrepo ()
+ > {
+ > hg init r
+ > cd r

and renamed r to r2 to get around name conflicts.

+++ b/tests/mockmakedate.py
@@ -0,0 +1,19 @@
+from future import absolute_import
+
+# mock out util.makedate() to supply testable values
+import os
+from mercurial import pycompat, util
+from mercurial.utils import dateutil

Removed unused import of util.

Closed by commit rHG6459797090ea: histedit: add rewrite.update-timestamp support to fold and mess (authored by taapas1128). · Explain WhyJan 13 2019, 7:14 AM
This revision was automatically updated to reflect the committed changes.
taapas1128 added a comment.Jan 13 2019, 7:39 AM

@yuja thanks for the edits and queuing .

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (12 lines)
AMtests/mockmakedate.py (21 lines)
Mtests/test-histedit-edit.t (51 lines)
Mtests/test-histedit-fold.t (108 lines)

Diff 13202

hgext/histedit.py

pycompat, pycompat,
registrar, registrar,
repair, repair,
scmutil, scmutil,
state as statemod, state as statemod,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil,
stringutil, stringutil,
) )
pickle = util.pickle pickle = util.pickle
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {} configtable = {}
def continuedirty(self): def continuedirty(self):
"""Continues the action when changes have been applied to the working """Continues the action when changes have been applied to the working
copy. The default behavior is to commit the dirty changes.""" copy. The default behavior is to commit the dirty changes."""
repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
editor = self.commiteditor() editor = self.commiteditor()
commit = commitfuncfor(repo, rulectx) commit = commitfuncfor(repo, rulectx)
if repo.ui.configbool('rewrite', 'update-timestamp'):
date = dateutil.makedate()
else:
date = rulectx.date()
commit(text=rulectx.description(), user=rulectx.user(), commit(text=rulectx.description(), user=rulectx.user(),
date=rulectx.date(), extra=rulectx.extra(), editor=editor) date=date, extra=rulectx.extra(), editor=editor)
def commiteditor(self): def commiteditor(self):
"""The editor to be used to edit the commit message.""" """The editor to be used to edit the commit message."""
return False return False
def continueclean(self): def continueclean(self):
"""Continues the action when the working copy is clean. The default """Continues the action when the working copy is clean. The default
behavior is to accept the current commit as the new version of the behavior is to accept the current commit as the new version of the
[repo[r].description() for r in internalchanges] + [repo[r].description() for r in internalchanges] +
[oldctx.description()]) + '\n' [oldctx.description()]) + '\n'
commitopts['message'] = newmessage commitopts['message'] = newmessage
# date # date
if self.firstdate(): if self.firstdate():
commitopts['date'] = ctx.date() commitopts['date'] = ctx.date()
else: else:
commitopts['date'] = max(ctx.date(), oldctx.date()) commitopts['date'] = max(ctx.date(), oldctx.date())
# if date is to be updated to current
if ui.configbool('rewrite', 'update-timestamp'):
commitopts['date'] = dateutil.makedate()
extra = ctx.extra().copy() extra = ctx.extra().copy()
# histedit_source # histedit_source
# note: ctx is likely a temporary commit but that the best we can do # note: ctx is likely a temporary commit but that the best we can do
# here. This is sufficient to solve issue3681 anyway. # here. This is sufficient to solve issue3681 anyway.
extra['histedit_source'] = '%s,%s' % (ctx.hex(), oldctx.hex()) extra['histedit_source'] = '%s,%s' % (ctx.hex(), oldctx.hex())
commitopts['extra'] = extra commitopts['extra'] = extra
phasemin = max(ctx.phase(), oldctx.phase()) phasemin = max(ctx.phase(), oldctx.phase())
overrides = {('phases', 'new-commit'): phasemin} overrides = {('phases', 'new-commit'): phasemin}

tests/mockmakedate.py

  • This file was added.
# mock out util.makedate() to supply testable values
from __future__ import absolute_import
import os
from mercurial import pycompat
from mercurial.utils import dateutil
def mockmakedate():
filename = os.path.join(os.environ['TESTTMP'], 'testtime')
try:
with open(filename, 'rb') as timef:
time = float(timef.read()) + 1
except IOError:
time = 0.0
with open(filename, 'wb') as timef:
timef.write(pycompat.bytestr(time))
return (time, 0)
dateutil.makedate = mockmakedate

tests/test-histedit-edit.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit= > histedit=
> strip= > strip=
> mockmakedate = $TESTDIR/mockmakedate.py
> EOF > EOF
$ initrepo () $ initrepo ()
> { > {
> hg init r > hg init r
> cd r > cd r
> for x in a b c d e f g; do > for x in a b c d e f g; do
> echo $x > $x > echo $x > $x
# b, base = checkout changeset and apply further changesets from there # b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ cd .. $ cd ..
============================================
Test update-timestamp config option in mess|
============================================
$ addwithdate ()
> {
> echo $1 > $1
> hg add $1
> hg ci -m $1 -d "$2 0"
> }
$ initrepo ()
> {
> hg init r2
> cd r2
> addwithdate a 1
> addwithdate b 2
> addwithdate c 3
> addwithdate d 4
> addwithdate e 5
> addwithdate f 6
> }
$ initrepo
log before edit
$ hg log --limit 1
changeset: 5:178e35e0ce73
tag: tip
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: f
$ hg histedit tip --commands - 2>&1 --config rewrite.update-timestamp=True << EOF | fixbundle
> mess 178e35e0ce73 f
> EOF
log after edit
$ hg log --limit 1
changeset: 5:98bf456d476b
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: f
$ cd ..
warn the user on editing tagged commits warn the user on editing tagged commits
$ hg init issue4017 $ hg init issue4017
$ cd issue4017 $ cd issue4017
$ echo > a $ echo > a
$ hg ci -Am 'add a' $ hg ci -Am 'add a'
adding a adding a
$ hg tag a $ hg tag a

tests/test-histedit-fold.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [alias] > [alias]
> logt = log --template '{rev}:{node|short} {desc|firstline}\n' > logt = log --template '{rev}:{node|short} {desc|firstline}\n'
> [extensions] > [extensions]
> histedit= > histedit=
> mockmakedate = $TESTDIR/mockmakedate.py
> EOF > EOF
Simple folding Simple folding
-------------------- --------------------
$ addwithdate () $ addwithdate ()
> { > {
> echo $1 > $1 > echo $1 > $1
$ hg log -G -T '{node|short} {desc}' $ hg log -G -T '{node|short} {desc}'
@ 5db65b93a12b cc @ 5db65b93a12b cc
| |
| o 301d76bdc3ae bb | o 301d76bdc3ae bb
|/ |/
o 8f0162e483d0 aa o 8f0162e483d0 aa
$ cd ..
====================================
Test update-timestamp config option|
====================================
$ addwithdate ()
> {
> echo $1 > $1
> hg add $1
> hg ci -m $1 -d "$2 0"
> }
$ initrepo ()
> {
> hg init r
> cd r
> addwithdate a 1
> addwithdate b 2
> addwithdate c 3
> addwithdate d 4
> addwithdate e 5
> addwithdate f 6
> }
$ initrepo
log before edit
$ hg log
changeset: 5:178e35e0ce73
tag: tip
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: f
changeset: 4:1ddb6c90f2ee
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: e
changeset: 3:532247a8969b
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: d
changeset: 2:ff2c9fa2018b
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
changeset: 1:97d72e5f12c7
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
$ hg histedit 1ddb6c90f2ee --commands - 2>&1 --config rewrite.update-timestamp=True <<EOF | fixbundle
> pick 178e35e0ce73 f
> fold 1ddb6c90f2ee e
> EOF
log after edit
observe time from f is updated
$ hg log
changeset: 4:f7909b1863a2
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: f
changeset: 3:532247a8969b
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: d
changeset: 2:ff2c9fa2018b
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
changeset: 1:97d72e5f12c7
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
post-fold manifest
$ hg manifest
a
b
c
d
e
f
$ cd ..