This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9183

fix: update commit hash references in the new commits
ClosedPublic

Authored by mharbison72 on Oct 9 2020, 12:22 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG04de8a1ec08f: fix: update commit hash references in the new commits

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Oct 9 2020, 12:22 PM
pulkit accepted this revision.Oct 14 2020, 3:40 AM
This revision is now accepted and ready to land.Oct 14 2020, 3:40 AM

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (8 lines)
Mtests/test-fix-topology.t (70 lines)

Diff 23155

hgext/fix.py

for path in filedata.keys(): for path in filedata.keys():
fctx = ctx[path] fctx = ctx[path]
copysource = fctx.copysource() copysource = fctx.copysource()
wctx.write(path, filedata[path], flags=fctx.flags()) wctx.write(path, filedata[path], flags=fctx.flags())
if copysource: if copysource:
wctx.markcopied(path, copysource) wctx.markcopied(path, copysource)
desc = rewriteutil.update_hash_refs(
repo,
ctx.description(),
{oldnode: [newnode] for oldnode, newnode in replacements.items()},
)
memctx = wctx.tomemctx( memctx = wctx.tomemctx(
text=ctx.description(), text=desc,
branch=ctx.branch(), branch=ctx.branch(),
extra=extra, extra=extra,
date=ctx.date(), date=ctx.date(),
parents=(newp1node, newp2node), parents=(newp1node, newp2node),
user=ctx.user(), user=ctx.user(),
) )
sucnode = memctx.commit() sucnode = memctx.commit()

tests/test-fix-topology.t

$ printf "gggg\n" > g $ printf "gggg\n" > g
$ hg commit -Am "change G" $ hg commit -Am "change G"
adding g adding g
created new head created new head
$ hg merge -r 5 $ hg merge -r 5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ printf "hhhh\n" > h $ printf "hhhh\n" > h
$ hg commit -Am "change H" $ hg commit -Am "change H (child of b53d63e816fb and 0e49f92ee6e9)"
adding h adding h
$ hg merge -r 4 $ hg merge -r 4
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ printf "iiii\n" > i $ printf "iiii\n" > i
$ hg commit -Am "change I" $ hg commit -Am "change I"
adding i adding i
$ hg checkout 2 $ hg checkout 2
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
$ printf "jjjj\n" > j $ printf "jjjj\n" > j
$ hg commit -Am "change J" $ hg commit -Am "change J (child of 7f371349286e)"
adding j adding j
created new head created new head
$ hg checkout 7 $ hg checkout 7
3 files updated, 0 files merged, 3 files removed, 0 files unresolved 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ printf "kkkk\n" > k $ printf "kkkk\n" > k
$ hg add $ hg add
adding k adding k
$ hg log --graph --template '{rev} {desc}\n' $ hg log --graph --template '{rev}:{node|short} {desc}\n'
o 9 change J o 9:884041ccc490 change J (child of 7f371349286e)
| |
| o 8 change I | o 8:b7c772105fd2 change I
| |\ | |\
| | @ 7 change H | | @ 7:4e7b9312dad2 change H (child of b53d63e816fb and 0e49f92ee6e9)
| | |\ | | |\
| | | o 6 change G | | | o 6:0e49f92ee6e9 change G
| | | | | | | |
| | o | 5 change F | | o | 5:b53d63e816fb change F
| | |/ | | |/
| o | 4 change E | o | 4:ddad58af5e51 change E
|/| | |/| |
| o | 3 change D | o | 3:c015ebfd2bfe change D
| |/ | |/
o | 2 change C o | 2:7f371349286e change C
| | | |
o | 1 change B o | 1:388fdd33fea0 change B
|/ |/
o 0 change A o 0:a55a84d97a24 change A
Fix all but the root revision and its four children. Fix all but the root revision and its four children.
$ hg fix -r '2|4|7|8|9' --working-dir $ hg fix -r '2|4|7|8|9' --working-dir
saved backup bundle to * (glob) (obsstore-off !) saved backup bundle to * (glob) (obsstore-off !)
The five revisions remain, but the other revisions were fixed and replaced. All The five revisions remain, but the other revisions were fixed and replaced. All
parent pointers have been accurately set to reproduce the previous topology parent pointers have been accurately set to reproduce the previous topology
(though it is rendered in a slightly different order now). (though it is rendered in a slightly different order now).
#if obsstore-on #if obsstore-on
$ hg log --graph --template '{rev} {desc}\n' $ hg log --graph --template '{rev}:{node|short} {desc}\n'
o 14 change J o 14:d8d0e7974598 change J (child of 89de0da1d5da)
| |
| o 13 change I | o 13:4fc0b354461e change I
| |\ | |\
| | @ 12 change H | | @ 12:1c45f3923443 change H (child of b53d63e816fb and 0e49f92ee6e9)
| | |\ | | |\
| o | | 11 change E | o | | 11:d75754455722 change E
|/| | | |/| | |
o | | | 10 change C o | | | 10:89de0da1d5da change C
| | | | | | | |
| | | o 6 change G | | | o 6:0e49f92ee6e9 change G
| | | | | | | |
| | o | 5 change F | | o | 5:b53d63e816fb change F
| | |/ | | |/
| o / 3 change D | o / 3:c015ebfd2bfe change D
| |/ | |/
o / 1 change B o / 1:388fdd33fea0 change B
|/ |/
o 0 change A o 0:a55a84d97a24 change A
$ C=10 $ C=10
$ E=11 $ E=11
$ H=12 $ H=12
$ I=13 $ I=13
$ J=14 $ J=14
#else #else
$ hg log --graph --template '{rev} {desc}\n' $ hg log --graph --template '{rev}:{node|short} {desc}\n'
o 9 change J o 9:d8d0e7974598 change J (child of 89de0da1d5da)
| |
| o 8 change I | o 8:4fc0b354461e change I
| |\ | |\
| | @ 7 change H | | @ 7:1c45f3923443 change H (child of b53d63e816fb and 0e49f92ee6e9)
| | |\ | | |\
| o | | 6 change E | o | | 6:d75754455722 change E
|/| | | |/| | |
o | | | 5 change C o | | | 5:89de0da1d5da change C
| | | | | | | |
| | | o 4 change G | | | o 4:0e49f92ee6e9 change G
| | | | | | | |
| | o | 3 change F | | o | 3:b53d63e816fb change F
| | |/ | | |/
| o / 2 change D | o / 2:c015ebfd2bfe change D
| |/ | |/
o / 1 change B o / 1:388fdd33fea0 change B
|/ |/
o 0 change A o 0:a55a84d97a24 change A
$ C=5 $ C=5
$ E=6 $ E=6
$ H=7 $ H=7
$ I=8 $ I=8
$ J=9 $ J=9
#endif #endif