Mercurial > hg-stable
diff tests/test-histedit-fold.t @ 41213:704a3aa3dc0a
histedit: add rewrite.update-timestamp support to fold and mess
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.
Differential Revision: https://phab.mercurial-scm.org/D5554
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Thu, 10 Jan 2019 20:11:19 +0530 |
parents | 02b5b5c1bba8 |
children | 15d2afa31e57 |
line wrap: on
line diff
--- a/tests/test-histedit-fold.t Sun Jan 13 14:46:15 2019 +0900 +++ b/tests/test-histedit-fold.t Thu Jan 10 20:11:19 2019 +0530 @@ -15,6 +15,7 @@ > logt = log --template '{rev}:{node|short} {desc|firstline}\n' > [extensions] > histedit= + > mockmakedate = $TESTDIR/mockmakedate.py > EOF @@ -597,3 +598,110 @@ 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 ..