Comments
Patch
@@ -1,8 +1,10 @@
$ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF
+ > [ui]
+ > logtemplate = {rev}:{node|short} {desc|firstline}'\n
> [extensions]
> graphlog=
> histedit=
> EOF
@@ -26,40 +28,21 @@
$ initrepo
log before edit
$ hg log --graph
- @ changeset: 5:652413bf663e
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: f
+ @ 5:652413bf663e f'
|
- o changeset: 4:e860deea161a
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: e
+ o 4:e860deea161a e'
|
- o changeset: 3:055a42cdd887
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: d
+ o 3:055a42cdd887 d'
|
- o changeset: 2:177f92b77385
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: c
+ o 2:177f92b77385 c'
|
- o changeset: 1:d2ae7f538514
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: b
+ o 1:d2ae7f538514 b'
|
- o changeset: 0:cb9a9f314b8b
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: a
+ o 0:cb9a9f314b8b a'
edit the history
$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
@@ -70,35 +53,19 @@ edit the history
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
log after edit
$ hg log --graph
- @ changeset: 4:7e0a290363ed
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: d
+ @ 4:7e0a290363ed d'
|
- o changeset: 3:5e24935bad3d
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: pick e860deea161a e
+ o 3:5e24935bad3d pick e860deea161a e'
|
- o changeset: 2:ee283cb5f2d5
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: e
+ o 2:ee283cb5f2d5 e'
|
- o changeset: 1:d2ae7f538514
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: b
+ o 1:d2ae7f538514 b'
|
- o changeset: 0:cb9a9f314b8b
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: a
+ o 0:cb9a9f314b8b a'
post-fold manifest
$ hg manifest
a
@@ -110,27 +77,11 @@ post-fold manifest
check histedit_source
$ hg log --debug --rev 3
- changeset: 3:5e24935bad3d5a4486de3b90f233e991465ced72
- phase: draft
- parent: 2:ee283cb5f2d5955443f23a27b697a04339e9a39a
- parent: -1:0000000000000000000000000000000000000000
- manifest: 3:81eede616954057198ead0b2c73b41d1f392829a
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- files+: c f
- extra: branch=default
- extra: histedit_source=a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3,177f92b773850b59254aa5e923436f921b55483b
- description:
- pick e860deea161a e
- pick 652413bf663e f
- fold 177f92b77385 c
- pick 055a42cdd887 d
-
-
+ 3:5e24935bad3d pick e860deea161a e'
$ cd ..
folding and creating no new change doesn't break:
$ mkdir fold-to-empty-test
@@ -144,30 +95,17 @@ folding and creating no new change doesn
$ echo 5 >> file
$ hg commit -m '+5'
$ echo 6 >> file
$ hg commit -m '+6'
$ hg log --graph
- @ changeset: 3:251d831eeec5
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: +6
+ @ 3:251d831eeec5 +6'
|
- o changeset: 2:888f9082bf99
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: +5
+ o 2:888f9082bf99 +5'
|
- o changeset: 1:617f94f13c0f
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: +4
+ o 1:617f94f13c0f +4'
|
- o changeset: 0:0189ba417d34
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: 1+2+3
+ o 0:0189ba417d34 1+2+3'
$ cat > editor.py <<EOF
> import re, sys
> rules = sys.argv[1]
@@ -196,20 +134,13 @@ should effectively drop the changes from
$ hg resolve --mark file
$ hg histedit --continue
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/*-backup.hg (glob)
$ hg log --graph
- @ changeset: 1:617f94f13c0f
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: +4
+ @ 1:617f94f13c0f +4'
|
- o changeset: 0:0189ba417d34
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: 1+2+3
+ o 0:0189ba417d34 1+2+3'
$ cd ..
Test corner case where folded revision is separated from its parent by a
@@ -278,20 +209,13 @@ dropped revision.
HG: changed file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
$ hg log -G
- @ changeset: 1:10c647b2cdd5
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: +4
+ @ 1:10c647b2cdd5 +4'
|
- o changeset: 0:0189ba417d34
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: 1+2+3
+ o 0:0189ba417d34 1+2+3'
$ hg export tip
# HG changeset patch
# User test
# Date 0 0