This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1867

evolution: report new unstable changesets
ClosedPublic

Authored by martinvonz on Jan 16 2018, 2:33 AM.

Details

Reviewers
durin42
lothiraldan
yuja
Group Reviewers
hg-reviewers
Commits
rHG1a09dad8b85a: evolution: report new unstable changesets
Summary

This adds a transaction summary callback that reports the number of
new orphan, content-divergent and phase-divergent changesets.

The code for reporting it is based on the code from the evolve
extension, but simplified a bit. It simply counts the numbers for each
kind of instability before and after the transaction. That's obviously
not very efficient, but it's easy to reason about, so I'm doing this
as a first step that can make us quite confident about the test case
changes. We can optimize it later and make sure that the tests are not
affected. The code has been used in the evolve extension for a long
time and has apparently been sufficiently fast, so it doesn't seem
like a pressing issue.

Unlike the evolve extension's version of this report, this version
applies to all commands (or all transactions run as part of any
command, to be exact).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 16 2018, 2:33 AM
lothiraldan added a subscriber: lothiraldan.Jan 16 2018, 2:48 AM

LGTM on a first quick review

lothiraldan accepted this revision.Jan 17 2018, 1:55 PM
yuja accepted this revision.Jan 18 2018, 8:14 AM
This revision is now accepted and ready to land.Jan 18 2018, 8:14 AM
Closed by commit rHG1a09dad8b85a: evolution: report new unstable changesets (authored by martinvonz). · Explain WhyJan 18 2018, 8:41 AM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Jan 20 2018, 3:05 PM

Any idea why this introduced failures on Windows? The missing orphan line I assumed was a #if conditional, but there's not one in any of the files.

--- c:/Users/Matt/projects/hg/tests/test-single-head.t
+++ c:/Users/Matt/projects/hg/tests/test-single-head.t.err
@@ -200,4 +200,5 @@

   $ hg strip --config extensions.strip= --rev 'desc("c_dH0")'
   saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg
-
+  warning: ignoring unknown working parent 49003e504178!
+

ERROR: test-single-head.t output changed
!
--- c:/Users/Matt/projects/hg/tests/test-histedit-obsolete.t
+++ c:/Users/Matt/projects/hg/tests/test-histedit-obsolete.t.err
@@ -71,6 +71,7 @@
   $ hg commit --amend -X . -m XXXXXX
   $ hg commit --amend -X . -m b2
   $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
+  warning: ignoring unknown working parent aba7da937030!
   $ hg histedit --continue
   $ hg log -G
   @  8:273c1f3b8626 c

ERROR: test-histedit-obsolete.t output changed
!
--- c:/Users/Matt/projects/hg/tests/test-rebase-obsolete.t
+++ c:/Users/Matt/projects/hg/tests/test-rebase-obsolete.t.err
@@ -772,6 +772,7 @@
   1 new orphan changesets
   $ hg --hidden strip -r 'desc(B1)'
   saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
+  1 new orphan changesets
   $ hg log -G
   @  5:1a79b7535141 D
   |

ERROR: test-rebase-obsolete.t output changed
!
Failed test-single-head.t: output changed
Failed test-histedit-obsolete.t: output changed
Failed test-rebase-obsolete.t: output changed
martinvonz added a comment.Jan 21 2018, 2:36 AM
In D1867#32367, @mharbison72 wrote:

Any idea why this introduced failures on Windows? The missing orphan line I assumed was a #if conditional, but there's not one in any of the files.

That one actually looked correct (i.e. it seemed wrong for it to be missing in the Linux case). It seems to have something to do with cache invalidation. I'll continue digging. Thanks for bringing it to my attention.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (29 lines)
Mtests/test-amend.t (1 line)
Mtests/test-cache-abuse.t (5 lines)
Mtests/test-commit-amend.t (1 line)
Mtests/test-drawdag.t (1 line)
Mtests/test-exchange-obsmarkers-case-A3.t (4 lines)
Mtests/test-exchange-obsmarkers-case-A4.t (1 line)
Mtests/test-exchange-obsmarkers-case-B5.t (1 line)
Mtests/test-exchange-obsmarkers-case-C1.t (1 line)
Mtests/test-exchange-obsmarkers-case-C4.t (1 line)
Mtests/test-exchange-obsmarkers-case-D1.t (1 line)
Mtests/test-exchange-obsmarkers-case-D4.t (1 line)
Mtests/test-histedit-obsolete.t (1 line)
Mtests/test-obshistory.t (3 lines)
Mtests/test-obsmarker-template.t (6 lines)
Mtests/test-obsolete-bundle-strip.t (6 lines)
Mtests/test-obsolete-changeset-exchange.t (1 line)
Mtests/test-obsolete-distributed.t (2 lines)
Mtests/test-obsolete-divergent.t (6 lines)
Mtests/test-obsolete.t (6 lines)
Mtests/test-push-checkheads-partial-C2.t (1 line)
Mtests/test-push-checkheads-partial-C4.t (1 line)
Mtests/test-push-checkheads-pruned-B2.t (1 line)
Mtests/test-push-checkheads-pruned-B3.t (1 line)
Mtests/test-push-checkheads-pruned-B4.t (1 line)
Mtests/test-push-checkheads-pruned-B5.t (1 line)
Mtests/test-push-checkheads-pruned-B8.t (1 line)
Mtests/test-push-checkheads-superceed-A2.t (1 line)
Mtests/test-push-checkheads-superceed-A3.t (1 line)
Mtests/test-push-checkheads-superceed-A6.t (1 line)
Mtests/test-push-checkheads-superceed-A7.t (1 line)
Mtests/test-push-checkheads-unpushed-D2.t (1 line)
Mtests/test-push-checkheads-unpushed-D3.t (1 line)
Mtests/test-push-checkheads-unpushed-D4.t (1 line)
Mtests/test-push-checkheads-unpushed-D5.t (2 lines)
Mtests/test-push-race.t (5 lines)
Mtests/test-rebase-dest.t (1 line)
Mtests/test-rebase-obsolete.t (31 lines)
Mtests/test-revset2.t (2 lines)
Mtests/test-show-work.t (1 line)
Mtests/test-split.t (2 lines)
Mtests/test-strip.t (1 line)
Mtests/test-unamend.t (3 lines)
Mtests/test-uncommit.t (2 lines)

Diff 4842

mercurial/scmutil.py

'unbundle', 'unbundle',
] ]
_reportnewcssource = [ _reportnewcssource = [
'pull', 'pull',
'unbundle', 'unbundle',
] ]
# A marker that tells the evolve extension to suppress its own reporting
_reportstroubledchangesets = True
def registersummarycallback(repo, otr, txnname=''): def registersummarycallback(repo, otr, txnname=''):
"""register a callback to issue a summary after the transaction is closed """register a callback to issue a summary after the transaction is closed
""" """
def txmatch(sources): def txmatch(sources):
return any(txnname.startswith(source) for source in sources) return any(txnname.startswith(source) for source in sources)
categories = [] categories = []
if txmatch(_reportobsoletedsource): if txmatch(_reportobsoletedsource):
@reportsummary @reportsummary
def reportobsoleted(repo, tr): def reportobsoleted(repo, tr):
obsoleted = obsutil.getobsoleted(repo, tr) obsoleted = obsutil.getobsoleted(repo, tr)
if obsoleted: if obsoleted:
repo.ui.status(_('obsoleted %i changesets\n') repo.ui.status(_('obsoleted %i changesets\n')
% len(obsoleted)) % len(obsoleted))
if obsolete.isenabled(repo, obsolete.createmarkersopt):
instabilitytypes = [
('orphan', 'orphan'),
('phase-divergent', 'phasedivergent'),
('content-divergent', 'contentdivergent'),
]
def getinstabilitycounts(repo):
filtered = repo.changelog.filteredrevs
counts = {}
for instability, revset in instabilitytypes:
counts[instability] = len(set(obsolete.getrevs(repo, revset)) -
filtered)
return counts
oldinstabilitycounts = getinstabilitycounts(repo)
@reportsummary
def reportnewinstabilities(repo, tr):
newinstabilitycounts = getinstabilitycounts(repo)
for instability, revset in instabilitytypes:
delta = (newinstabilitycounts[instability] -
oldinstabilitycounts[instability])
if delta > 0:
repo.ui.warn(_('%i new %s changesets\n') %
(delta, instability))
if txmatch(_reportnewcssource): if txmatch(_reportnewcssource):
@reportsummary @reportsummary
def reportnewcs(repo, tr): def reportnewcs(repo, tr):
"""Report the range of new revisions pulled/unbundled.""" """Report the range of new revisions pulled/unbundled."""
newrevs = tr.changes.get('revs', xrange(0, 0)) newrevs = tr.changes.get('revs', xrange(0, 0))
if not newrevs: if not newrevs:
return return

tests/test-amend.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True
> EOF > EOF
$ hg amend $ hg amend
1 new orphan changesets
$ hg log -T '{rev} {node|short} {desc}\n' -G $ hg log -T '{rev} {node|short} {desc}\n' -G
@ 3 be169c7e8dbe B @ 3 be169c7e8dbe B
| |
| * 2 26805aba1e60 C | * 2 26805aba1e60 C
| | | |
| x 1 112478962961 B | x 1 112478962961 B
|/ |/
o 0 426bada5c675 A o 0 426bada5c675 A

tests/test-cache-abuse.t

> test -f $CACHE || echo "not rebuilt" > test -f $CACHE || echo "not rebuilt"
> } > }
Beat up tags caches: Beat up tags caches:
$ damage "tags --hidden" tags2 $ damage "tags --hidden" tags2
$ damage tags tags2-visible $ damage tags tags2-visible
$ damage "tag -f t3" hgtagsfnodes1 $ damage "tag -f t3" hgtagsfnodes1
1 new orphan changesets
1 new orphan changesets
1 new orphan changesets
1 new orphan changesets
1 new orphan changesets
Beat up branch caches: Beat up branch caches:
$ damage branches branch2-base "rm .hg/cache/branch2-[vs]*" $ damage branches branch2-base "rm .hg/cache/branch2-[vs]*"
$ damage branches branch2-served "rm .hg/cache/branch2-[bv]*" $ damage branches branch2-served "rm .hg/cache/branch2-[bv]*"
$ damage branches branch2-visible $ damage branches branch2-visible
$ damage "log -r branch(.)" rbc-names-v1 $ damage "log -r branch(.)" rbc-names-v1
$ damage "log -r branch(default)" rbc-names-v1 $ damage "log -r branch(default)" rbc-names-v1

tests/test-commit-amend.t

$ hg up '.^' $ hg up '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo 'b' >> a $ echo 'b' >> a
$ hg log --style compact -r 'children(.)' $ hg log --style compact -r 'children(.)'
16[tip]:11 37973c7e0b61 1970-01-01 00:00 +0000 test 16[tip]:11 37973c7e0b61 1970-01-01 00:00 +0000 test
babar babar
$ hg commit --amend $ hg commit --amend
1 new orphan changesets
$ hg log -r 'orphan()' $ hg log -r 'orphan()'
changeset: 16:37973c7e0b61 changeset: 16:37973c7e0b61
branch: a branch: a
parent: 11:0ddb275cfad1 parent: 11:0ddb275cfad1
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
instability: orphan instability: orphan
summary: babar summary: babar

tests/test-drawdag.t

> G > G
> | > |
> I D C F # split: B -> E, F, G > I D C F # split: B -> E, F, G
> \ \| | # replace: C -> D -> H > \ \| | # replace: C -> D -> H
> H B E # prune: F, I > H B E # prune: F, I
> \|/ > \|/
> A > A
> EOS > EOS
1 new orphan changesets
$ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}' $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
* G 711f53bbef0bebd12eb6f0511d5e2e998b984846 * G 711f53bbef0bebd12eb6f0511d5e2e998b984846
| |
x F 64a8289d249234b9886244d379f15e6b650b28e3 x F 64a8289d249234b9886244d379f15e6b650b28e3
| |
o E 7fb047a69f220c21711122dfd94305a9efb60cba o E 7fb047a69f220c21711122dfd94305a9efb60cba
| |

tests/test-exchange-obsmarkers-case-A3.t

$ hg update -q 0 $ hg update -q 0
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg update -q 0 $ hg update -q 0
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ f6298a8ac3a4 (draft): B1 @ f6298a8ac3a4 (draft): B1
| |
| o e5ea8f9c7314 (draft): A1 | o e5ea8f9c7314 (draft): A1
|/ |/
| x 6e72f0a95b5e (draft): B0 | x 6e72f0a95b5e (draft): B0
$ hg update -q 0 $ hg update -q 0
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg update -q 0 $ hg update -q 0
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ f6298a8ac3a4 (draft): B1 @ f6298a8ac3a4 (draft): B1
| |
| o e5ea8f9c7314 (draft): A1 | o e5ea8f9c7314 (draft): A1
|/ |/
| x 6e72f0a95b5e (draft): B0 | x 6e72f0a95b5e (draft): B0
pushing to pushdest pushing to pushdest
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 1 new obsolescence markers remote: 1 new obsolescence markers
remote: obsoleted 1 changesets remote: obsoleted 1 changesets
remote: 1 new orphan changesets
## post push state ## post push state
# obstore: main # obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest # obstore: pushdest
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest # obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest ## pulling "e5ea8f9c7314" from main into pulldest
pulling from main pulling from main
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
new changesets e5ea8f9c7314 new changesets e5ea8f9c7314
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
## post pull state ## post pull state
# obstore: main # obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest # obstore: pushdest
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest # obstore: pulldest
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

tests/test-exchange-obsmarkers-case-A4.t

$ mkcommit B $ mkcommit B
$ hg update 0 $ hg update 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg log -G --hidden $ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1 @ e5ea8f9c7314 (draft): A1
| |
| * 06055a7959d4 (draft): B | * 06055a7959d4 (draft): B
| | | |
| x 28b51eb45704 (draft): A0 | x 28b51eb45704 (draft): A0
|/ |/
o a9bdc8b26820 (public): O o a9bdc8b26820 (public): O

tests/test-exchange-obsmarkers-case-B5.t

$ mkcommit B0 $ mkcommit B0
$ mkcommit C $ mkcommit C
$ hg up --quiet 0 $ hg up --quiet 0
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ mkcommit B1 $ mkcommit B1
$ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets obsoleted 1 changesets
2 new orphan changesets
$ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
$ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg prune -qd '0 0' 'desc(B1)' $ hg prune -qd '0 0' 'desc(B1)'
$ hg log -G --hidden $ hg log -G --hidden
x 069b05c3876d (draft): B1 x 069b05c3876d (draft): B1
| |
@ e5ea8f9c7314 (draft): A1 @ e5ea8f9c7314 (draft): A1

tests/test-exchange-obsmarkers-case-C1.t

- pulldest - pulldest
- main - main
- pushdest - pushdest
cd into `main` and proceed with env setup cd into `main` and proceed with env setup
$ cd main $ cd main
$ mkcommit A $ mkcommit A
$ mkcommit B $ mkcommit B
$ hg prune -qd '0 0' '.~1' $ hg prune -qd '0 0' '.~1'
1 new orphan changesets
$ hg prune -qd '0 0' . $ hg prune -qd '0 0' .
$ hg log -G --hidden $ hg log -G --hidden
x f6fbb35d8ac9 (draft): B x f6fbb35d8ac9 (draft): B
| |
x f5bc6836db60 (draft): A x f5bc6836db60 (draft): A
| |
@ a9bdc8b26820 (public): O @ a9bdc8b26820 (public): O

tests/test-exchange-obsmarkers-case-C4.t

$ mkcommit B $ mkcommit B
created new head created new head
$ hg update -q 0 $ hg update -q 0
$ mkcommit C $ mkcommit C
created new head created new head
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
2 new content-divergent changesets
$ hg prune -qd '0 0' . $ hg prune -qd '0 0' .
$ hg log -G --hidden $ hg log -G --hidden
x 7f7f229b13a6 (draft): C x 7f7f229b13a6 (draft): C
| |
| o 35b183996678 (draft): B | o 35b183996678 (draft): B
|/ |/
| x f5bc6836db60 (draft): A | x f5bc6836db60 (draft): A
|/ |/

tests/test-exchange-obsmarkers-case-D1.t

$ cd main $ cd main
$ mkcommit A0 $ mkcommit A0
$ mkcommit B $ mkcommit B
$ hg up -q 0 $ hg up -q 0
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg prune -d '0 0' 'desc(B)' $ hg prune -d '0 0' 'desc(B)'
obsoleted 1 changesets obsoleted 1 changesets
$ hg strip --hidden -q 'desc(A0)' $ hg strip --hidden -q 'desc(A0)'
$ hg log -G --hidden $ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1 @ e5ea8f9c7314 (draft): A1
| |
o a9bdc8b26820 (public): O o a9bdc8b26820 (public): O

tests/test-exchange-obsmarkers-case-D4.t

$ mkcommit A0 $ mkcommit A0
$ mkcommit B0 $ mkcommit B0
$ hg update -q 0 $ hg update -q 0
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ mkcommit B1 $ mkcommit B1
$ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
$ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'` $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
$ hg log -G --hidden $ hg log -G --hidden
@ 069b05c3876d (draft): B1 @ 069b05c3876d (draft): B1
| |
o e5ea8f9c7314 (draft): A1 o e5ea8f9c7314 (draft): A1

tests/test-histedit-obsolete.t

> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c adding c
Editing (b346ab9a313d), you may commit or record as needed now. Editing (b346ab9a313d), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ echo c >> c $ echo c >> c
$ hg histedit --continue $ hg histedit --continue
1 new orphan changesets
$ hg log -r 'orphan()' $ hg log -r 'orphan()'
11:c13eb81022ca f (no-eol) 11:c13eb81022ca f (no-eol)
stabilise stabilise
$ hg rebase -r 'orphan()' -d . $ hg rebase -r 'orphan()' -d .
rebasing 11:c13eb81022ca "f" rebasing 11:c13eb81022ca "f"

tests/test-obshistory.t

$ echo "A0" > A0 $ echo "A0" > A0
$ echo "B0" > B0 $ echo "B0" > B0
$ hg add A0 B0 $ hg add A0 B0
$ hg commit -m "C0" $ hg commit -m "C0"
created new head created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'` $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:eb5a0daa2192 @ changeset: 3:eb5a0daa2192
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c updating to a hidden changeset 471f378eab4c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "A2" $ hg commit --amend -m "A2"
2 new content-divergent changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:65b757b745b9 @ changeset: 3:65b757b745b9
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent
| summary: A2 | summary: A2
$ echo "A0" > A0 $ echo "A0" > A0
$ echo "B0" > B0 $ echo "B0" > B0
$ hg add A0 B0 $ hg add A0 B0
$ hg commit -m "C0" $ hg commit -m "C0"
created new head created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'` $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 4:eb5a0daa2192 @ changeset: 4:eb5a0daa2192
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test

tests/test-obsmarker-template.t

$ echo "A0" > A0 $ echo "A0" > A0
$ echo "B0" > B0 $ echo "B0" > B0
$ hg commit -A -m "C0" $ hg commit -A -m "C0"
adding A0 adding A0
adding B0 adding B0
created new head created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:eb5a0daa2192 @ changeset: 3:eb5a0daa2192
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c updating to a hidden changeset 471f378eab4c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "A2" $ hg commit --amend -m "A2"
2 new content-divergent changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:65b757b745b9 @ changeset: 3:65b757b745b9
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent
| summary: A2 | summary: A2
$ echo "A0" > A0 $ echo "A0" > A0
$ echo "B0" > B0 $ echo "B0" > B0
$ hg commit -A -m "C0" $ hg commit -A -m "C0"
adding A0 adding A0
adding B0 adding B0
created new head created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 4:eb5a0daa2192 @ changeset: 4:eb5a0daa2192
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit C0 $ mkcommit C0
created new head created new head
Create the cycle Create the cycle
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
Check templates Check templates
--------------- ---------------
$ hg tlog $ hg tlog
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Diverge one of the splitted commit Diverge one of the splitted commit
$ hg up 6 $ hg up 6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg commit --amend -m "Add only B" $ hg commit --amend -m "Add only B"
1 new orphan changesets
$ hg up 6 --hidden $ hg up 6 --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "Add B only" $ hg commit --amend -m "Add B only"
4 new content-divergent changesets
$ hg log -G $ hg log -G
@ changeset: 9:0b997eb7ceee @ changeset: 9:0b997eb7ceee
| tag: tip | tag: tip
| parent: 5:dd800401bd8c | parent: 5:dd800401bd8c
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent

tests/test-obsolete-bundle-strip.t

$ mkcommit 'C-B0' $ mkcommit 'C-B0'
$ hg up 'desc("ROOT")' $ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit 'C-A1' $ mkcommit 'C-A1'
created new head created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete --record-parents `getid 'desc("C-B0")'` $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg up 'desc("ROOT")' $ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log --hidden -G $ hg log --hidden -G
o cf2c22470d67: C-A1 o cf2c22470d67: C-A1
| |
| x 29f93b1df87b: C-B0 | x 29f93b1df87b: C-B0
$ mkcommit 'C-B0' $ mkcommit 'C-B0'
$ hg up 'desc("ROOT")' $ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit 'C-A1' $ mkcommit 'C-A1'
created new head created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete --record-parents `getid 'desc("C-B0")'` $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
obsoleted 1 changesets obsoleted 1 changesets
(it is annoying to create prune with parent data without the changeset, so we strip it after the fact) (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
$ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no
$ hg up 'desc("ROOT")' $ hg up 'desc("ROOT")'
$ hg up 'desc("ROOT")' $ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit 'C-E' $ mkcommit 'C-E'
created new head created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`
$ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
3 new content-divergent changesets
$ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
$ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
1 new content-divergent changesets
$ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`
### Exclusive markers ### ### Exclusive markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg
3 new content-divergent changesets
### Backup markers ### ### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
### Exclusive markers ### ### Exclusive markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg
3 new content-divergent changesets
### Backup markers ### ### Backup markers ###
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

tests/test-obsolete-changeset-exchange.t

$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5
$ hg pull ../other $ hg pull ../other
pulling from ../other pulling from ../other
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads) added 1 changesets with 0 changes to 1 files (+1 heads)
1 new phase-divergent changesets
new changesets f89bcc95eba5 new changesets f89bcc95eba5
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
check that bundle is not affected check that bundle is not affected
$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg
1 changesets found 1 changesets found
$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5

tests/test-obsolete-distributed.t

adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
new changesets d33b0a3a6464:ef908e42ce65 new changesets d33b0a3a6464:ef908e42ce65
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 'desc("c_A")' $ hg up 'desc("c_A")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m 'c_A1' $ hg commit --amend -m 'c_A1'
1 new orphan changesets
$ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase
rebasing 2:ef908e42ce65 "c_B0" rebasing 2:ef908e42ce65 "c_B0"
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m 'c_B1' $ hg commit --amend -m 'c_B1'
$ hg log -G $ hg log -G
@ 5:956063ac4557 c_B1 @ 5:956063ac4557 c_B1
| |
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
3 new obsolescence markers 3 new obsolescence markers
new changesets 5b5708a437f2:956063ac4557 new changesets 5b5708a437f2:956063ac4557
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 'desc("c_A")' $ hg up 'desc("c_A")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m 'c_A2' $ hg commit --amend -m 'c_A2'
1 new orphan changesets
$ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase
rebasing 2:956063ac4557 "c_B1" rebasing 2:956063ac4557 "c_B1"
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m 'c_B2' $ hg commit --amend -m 'c_B2'
$ hg log -G $ hg log -G
@ 5:77ae25d99ff0 c_B2 @ 5:77ae25d99ff0 c_B2
| |

tests/test-obsolete-divergent.t

----------------- -----------------
A_1 have two direct and divergent successors A_1 and A_1 A_1 have two direct and divergent successors A_1 and A_1
$ newcase direct $ newcase direct
$ hg debugobsolete `getid A_0` `getid A_1` $ hg debugobsolete `getid A_0` `getid A_1`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2` $ hg debugobsolete `getid A_0` `getid A_2`
2 new content-divergent changesets
$ hg log -G --hidden $ hg log -G --hidden
* 3:392fd25390da A_2 * 3:392fd25390da A_2
| |
| * 2:82623d38b9ba A_1 | * 2:82623d38b9ba A_1
|/ |/
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
|/ |/
@ 0:d20a80d4def3 base @ 0:d20a80d4def3 base
indirect divergence with known changeset indirect divergence with known changeset
------------------------------------------- -------------------------------------------
$ newcase indirect_known $ newcase indirect_known
$ hg debugobsolete `getid A_0` `getid A_1` $ hg debugobsolete `getid A_0` `getid A_1`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2` $ hg debugobsolete `getid A_0` `getid A_2`
2 new content-divergent changesets
$ mkcommit A_3 $ mkcommit A_3
created new head created new head
$ hg debugobsolete `getid A_2` `getid A_3` $ hg debugobsolete `getid A_2` `getid A_3`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 4:01f36c5a8fda A_3 @ 4:01f36c5a8fda A_3
| |
| x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
indirect divergence with known changeset indirect divergence with known changeset
------------------------------------------- -------------------------------------------
$ newcase indirect_unknown $ newcase indirect_unknown
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2` $ hg debugobsolete `getid A_0` `getid A_2`
2 new content-divergent changesets
$ hg log -G --hidden $ hg log -G --hidden
* 3:392fd25390da A_2 * 3:392fd25390da A_2
| |
| * 2:82623d38b9ba A_1 | * 2:82623d38b9ba A_1
|/ |/
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
|/ |/
@ 0:d20a80d4def3 base @ 0:d20a80d4def3 base
divergence that converge again is not divergence anymore divergence that converge again is not divergence anymore
----------------------------------------------------- -----------------------------------------------------
$ newcase converged_divergence $ newcase converged_divergence
$ hg debugobsolete `getid A_0` `getid A_1` $ hg debugobsolete `getid A_0` `getid A_1`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2` $ hg debugobsolete `getid A_0` `getid A_2`
2 new content-divergent changesets
$ mkcommit A_3 $ mkcommit A_3
created new head created new head
$ hg debugobsolete `getid A_1` `getid A_3` $ hg debugobsolete `getid A_1` `getid A_3`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid A_2` `getid A_3` $ hg debugobsolete `getid A_2` `getid A_3`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 4:01f36c5a8fda A_3 @ 4:01f36c5a8fda A_3
created new head created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
obsoleted 1 changesets obsoleted 1 changesets
$ mkcommit A_9; hg up 0 $ mkcommit A_9; hg up 0
created new head created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid A_5` `getid A_9` $ hg debugobsolete `getid A_5` `getid A_9`
4 new content-divergent changesets
$ hg log -G --hidden $ hg log -G --hidden
* 10:bed64f5d2f5a A_9 * 10:bed64f5d2f5a A_9
| |
| * 9:14608b260df8 A_8 | * 9:14608b260df8 A_8
|/ |/
| * 8:7ae126973a96 A_7 | * 8:7ae126973a96 A_7
|/ |/
| x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
> with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'):
> mapping = {node('desc(B1)'): [node('desc(B3)')], > mapping = {node('desc(B1)'): [node('desc(B3)')],
> node('desc(B3)'): [node('desc(B4)')]} > node('desc(B3)'): [node('desc(B4)')]}
> scmutil.cleanupnodes(repo, mapping, 'test') > scmutil.cleanupnodes(repo, mapping, 'test')
> EOF > EOF
$ rm .hg/localtags $ rm .hg/localtags
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
2 new content-divergent changesets
$ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
@ 5:1a2a9b5b0030 B2 content-divergent @ 5:1a2a9b5b0030 B2 content-divergent
| |
| * 4:70d5a63ca112 B4 content-divergent | * 4:70d5a63ca112 B4 content-divergent
| | | |
| o 1:48b9aae0607f Z | o 1:48b9aae0607f Z
| |
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg debugobsolete $ hg debugobsolete
a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'}
ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'}

tests/test-obsolete.t

$ hg debugrevspec 'rev(6)' $ hg debugrevspec 'rev(6)'
$ hg debugrevspec 'rev(4)' $ hg debugrevspec 'rev(4)'
$ hg debugrevspec 'null' $ hg debugrevspec 'null'
-1 -1
Check that public changeset are not accounted as obsolete: Check that public changeset are not accounted as obsolete:
$ hg --hidden phase --public 2 $ hg --hidden phase --public 2
1 new phase-divergent changesets
$ hg log -G $ hg log -G
@ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
| |
| o 2:245bde4270cd (public) [ ] add original_c | o 2:245bde4270cd (public) [ ] add original_c
|/ |/
o 1:7c3bad9141dc (public) [ ] add b o 1:7c3bad9141dc (public) [ ] add b
| |
o 0:1f0dee641bb7 (public) [ ] add a o 0:1f0dee641bb7 (public) [ ] add a
o 0:1f0dee641bb7 (public) [ ] add a o 0:1f0dee641bb7 (public) [ ] add a
$ hg up 'desc("n3w_3_c")' $ hg up 'desc("n3w_3_c")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit original_d $ mkcommit original_d
$ mkcommit original_e $ mkcommit original_e
$ hg debugobsolete --record-parents `getid original_d` -d '0 0' $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete | grep `getid original_d` $ hg debugobsolete | grep `getid original_d`
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg log -r 'obsolete()' $ hg log -r 'obsolete()'
4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
$ hg summary $ hg summary
parent: 5:cda648ca50f5 tip (orphan) parent: 5:cda648ca50f5 tip (orphan)
add original_e add original_e
branch: default branch: default
$ hg push ../tmpf -f # -f because be push unstable too $ hg push ../tmpf -f # -f because be push unstable too
pushing to ../tmpf pushing to ../tmpf
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 6 changesets with 6 changes to 6 files (+1 heads) added 6 changesets with 6 changes to 6 files (+1 heads)
7 new obsolescence markers 7 new obsolescence markers
1 new orphan changesets
no warning displayed no warning displayed
$ hg push ../tmpf $ hg push ../tmpf
pushing to ../tmpf pushing to ../tmpf
searching for changes searching for changes
no changes found no changes found
[1] [1]
$ rm hg.pid access.log errors.log $ rm hg.pid access.log errors.log
#endif #endif
Several troubles on the same changeset (create an unstable and bumped changeset) Several troubles on the same changeset (create an unstable and bumped changeset)
$ hg debugobsolete `getid obsolete_e` $ hg debugobsolete `getid obsolete_e`
obsoleted 1 changesets obsoleted 1 changesets
2 new orphan changesets
$ hg debugobsolete `getid original_c` `getid babar` $ hg debugobsolete `getid original_c` `getid babar`
1 new phase-divergent changesets
$ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
changeset: 7:50c51b361e60 changeset: 7:50c51b361e60
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
instability: orphan, phase-divergent instability: orphan, phase-divergent
summary: add babar summary: add babar
$ hg init repo-issue-nativerevs-pending-changes $ hg init repo-issue-nativerevs-pending-changes
$ cd repo-issue-nativerevs-pending-changes $ cd repo-issue-nativerevs-pending-changes
$ mkcommit a $ mkcommit a
$ mkcommit b $ mkcommit b
$ hg up ".^" $ hg up ".^"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo aa > a $ echo aa > a
$ hg amendtransient $ hg amendtransient
1 new orphan changesets
[1, 2] [1, 2]
Test cache consistency for the visible filter Test cache consistency for the visible filter
1) We want to make sure that the cached filtered revs are invalidated when 1) We want to make sure that the cached filtered revs are invalidated when
bookmarks change bookmarks change
$ cd .. $ cd ..
$ cat >$TESTTMP/test_extension.py << EOF $ cat >$TESTTMP/test_extension.py << EOF
> from __future__ import absolute_import, print_function > from __future__ import absolute_import, print_function

tests/test-push-checkheads-partial-C2.t

new changesets d73caddc5533 new changesets d73caddc5533
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg log -G --hidden $ hg log -G --hidden
@ f6082bc4ffef (draft): A1 @ f6082bc4ffef (draft): A1
| |
| * d73caddc5533 (draft): B0 | * d73caddc5533 (draft): B0
| | | |
| x 8aaa48160adc (draft): A0 | x 8aaa48160adc (draft): A0
|/ |/
o 1e4be0697311 (public): root o 1e4be0697311 (public): root

tests/test-push-checkheads-partial-C4.t

new changesets d73caddc5533 new changesets d73caddc5533
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0 $ mkcommit C0
created new head created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg debugobsolete --record-parents `getid "desc(A0)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 0f88766e02d6 (draft): C0 @ 0f88766e02d6 (draft): C0
| |
| * d73caddc5533 (draft): B0 | * d73caddc5533 (draft): B0
| | | |
| x 8aaa48160adc (draft): A0 | x 8aaa48160adc (draft): A0
|/ |/
o 1e4be0697311 (public): root o 1e4be0697311 (public): root

tests/test-push-checkheads-pruned-B2.t

new changesets d73caddc5533 new changesets d73caddc5533
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg debugobsolete --record-parents `getid "desc(B0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ f6082bc4ffef (draft): A1 @ f6082bc4ffef (draft): A1
| |
| x d73caddc5533 (draft): B0 | x d73caddc5533 (draft): B0
| | | |
| x 8aaa48160adc (draft): A0 | x 8aaa48160adc (draft): A0

tests/test-push-checkheads-pruned-B3.t

new changesets d73caddc5533 new changesets d73caddc5533
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg debugobsolete --record-parents `getid "desc(A0)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1 @ 25c56d33e4c4 (draft): B1
| |
| x d73caddc5533 (draft): B0 | x d73caddc5533 (draft): B0
| | | |
| x 8aaa48160adc (draft): A0 | x 8aaa48160adc (draft): A0

tests/test-push-checkheads-pruned-B4.t

new changesets d73caddc5533 new changesets d73caddc5533
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0 $ mkcommit C0
created new head created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg debugobsolete --record-parents `getid "desc(A0)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg debugobsolete --record-parents `getid "desc(B0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 0f88766e02d6 (draft): C0 @ 0f88766e02d6 (draft): C0
| |
| x d73caddc5533 (draft): B0 | x d73caddc5533 (draft): B0
| | | |
| x 8aaa48160adc (draft): A0 | x 8aaa48160adc (draft): A0

tests/test-push-checkheads-pruned-B5.t

new changesets d73caddc5533:821fb21d0dd2 new changesets d73caddc5533:821fb21d0dd2
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg debugobsolete --record-parents `getid "desc(A0)"`
obsoleted 1 changesets obsoleted 1 changesets
2 new orphan changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(C0)"` $ hg debugobsolete --record-parents `getid "desc(C0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1 @ 25c56d33e4c4 (draft): B1
| |
| x 821fb21d0dd2 (draft): C0 | x 821fb21d0dd2 (draft): C0

tests/test-push-checkheads-pruned-B8.t

created new head created new head
$ mkcommit B1 $ mkcommit B1
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit A2 $ mkcommit A2
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B1)"` $ hg debugobsolete --record-parents `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ c1f8d089020f (draft): A2 @ c1f8d089020f (draft): A2

tests/test-push-checkheads-superceed-A2.t

(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ mkcommit B1 $ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 262c8c798096 (draft): B1 @ 262c8c798096 (draft): B1
| |
o f6082bc4ffef (draft): A1 o f6082bc4ffef (draft): A1
| |
| x d73caddc5533 (draft): B0 | x d73caddc5533 (draft): B0

tests/test-push-checkheads-superceed-A3.t

(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ mkcommit A1 $ mkcommit A1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ c1c7524e9488 (draft): A1 @ c1c7524e9488 (draft): A1
| |
o 25c56d33e4c4 (draft): B1 o 25c56d33e4c4 (draft): B1
| |
| x d73caddc5533 (draft): B0 | x d73caddc5533 (draft): B0

tests/test-push-checkheads-superceed-A6.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg up 'desc(C0)' $ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ d70a1f75a020 (draft): B1 @ d70a1f75a020 (draft): B1
| |
| o f6082bc4ffef (draft): A1 | o f6082bc4ffef (draft): A1
| | | |
o | 0f88766e02d6 (draft): C0 o | 0f88766e02d6 (draft): C0

tests/test-push-checkheads-superceed-A7.t

1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1 @ 25c56d33e4c4 (draft): B1
| |
| o a0802eb7fc1b (draft): A1 | o a0802eb7fc1b (draft): A1
| | | |
| o 0f88766e02d6 (draft): C0 | o 0f88766e02d6 (draft): C0

tests/test-push-checkheads-unpushed-D2.t

new changesets d73caddc5533 new changesets d73caddc5533
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg debugobsolete --record-parents `getid "desc(B0)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0 $ mkcommit C0
created new head created new head
$ hg log -G --hidden $ hg log -G --hidden
@ 0f88766e02d6 (draft): C0 @ 0f88766e02d6 (draft): C0

tests/test-push-checkheads-unpushed-D3.t

$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg up '0' $ hg up '0'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1 @ 25c56d33e4c4 (draft): B1
| |
| o f6082bc4ffef (draft): A1 | o f6082bc4ffef (draft): A1
|/ |/
| x d73caddc5533 (draft): B0 | x d73caddc5533 (draft): B0

tests/test-push-checkheads-unpushed-D4.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
created new head created new head
$ hg up 'desc(C0)' $ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ d70a1f75a020 (draft): B1 @ d70a1f75a020 (draft): B1
| |
| o f6082bc4ffef (draft): A1 | o f6082bc4ffef (draft): A1
| | | |
o | 0f88766e02d6 (draft): C0 o | 0f88766e02d6 (draft): C0

tests/test-push-checkheads-unpushed-D5.t

1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1 $ mkcommit A1
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit B1 $ mkcommit B1
created new head created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log -G --hidden $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1 @ 25c56d33e4c4 (draft): B1
| |
| o a0802eb7fc1b (draft): A1 | o a0802eb7fc1b (draft): A1
| | | |
| o 0f88766e02d6 (draft): C0 | o 0f88766e02d6 (draft): C0
pushing to $TESTTMP/D5/server pushing to $TESTTMP/D5/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ cd ../.. $ cd ../..

tests/test-push-race.t

pulling from ./client-racy pulling from ./client-racy
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
new changesets 720c5163ecf6 new changesets 720c5163ecf6
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull $ hg -R ./client-other pull
pulling from ssh://user@dummy/server pulling from ssh://user@dummy/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
new changesets 720c5163ecf6 new changesets 720c5163ecf6
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull $ hg -R ./client-racy pull
pulling from ssh://user@dummy/server pulling from ssh://user@dummy/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
1 new orphan changesets
new changesets a98a47d8b85b new changesets a98a47d8b85b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg -R server debugobsolete $ hg -R server debugobsolete
b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg -R server graph $ hg -R server graph
o 720c5163ecf6 C-V (default) o 720c5163ecf6 C-V (default)
| |
(new topo branch obsoleting that same head) (new topo branch obsoleting that same head)
$ hg -R client-other/ up 'desc("C-Q")' $ hg -R client-other/ up 'desc("C-Q")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo bbb >> client-other/a $ echo bbb >> client-other/a
$ hg -R client-other/ branch --force default $ hg -R client-other/ branch --force default
marked working directory as branch default marked working directory as branch default
$ hg -R client-other/ commit -m "C-W" $ hg -R client-other/ commit -m "C-W"
1 new orphan changesets
created new head created new head
$ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'` $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
$ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'` $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
$ hg -R client-other debugobsolete $ID_V $ID_W $ hg -R client-other debugobsolete $ID_V $ID_W
obsoleted 1 changesets obsoleted 1 changesets
(continue the same head) (continue the same head)
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 0 changes to 1 files (+1 heads) remote: added 1 changesets with 0 changes to 1 files (+1 heads)
remote: 1 new obsolescence markers remote: 1 new obsolescence markers
remote: obsoleted 1 changesets remote: obsoleted 1 changesets
remote: 1 new orphan changesets
$ release $TESTTMP/watchfile $ release $TESTTMP/watchfile
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes

tests/test-rebase-dest.t

> B2 D F > B2 D F
> | |/ # rebase: B -> B2 > | |/ # rebase: B -> B2
> N C # amend: E -> E2 > N C # amend: E -> E2
> | | # amend: E2 -> E3 > | | # amend: E2 -> E3
> M B # rebase: F -> F2 > M B # rebase: F -> F2
> \| # amend: I -> I2 > \| # amend: I -> I2
> A > A
> EOF > EOF
6 new orphan changesets
rebasing 16:5c432343bf59 "J" (J tip) rebasing 16:5c432343bf59 "J" (J tip)
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 "C" (C)
rebasing 6:f585351a92f8 "D" (D) rebasing 6:f585351a92f8 "D" (D)
rebasing 10:ffebc37c5d0b "E3" (E3) rebasing 10:ffebc37c5d0b "E3" (E3)
rebasing 13:fb184bcfeee8 "F2" (F2) rebasing 13:fb184bcfeee8 "F2" (F2)
rebasing 11:dc838ab4c0da "G" (G) rebasing 11:dc838ab4c0da "G" (G)
o 22: 174f63d574a8 G o 22: 174f63d574a8 G
| |

tests/test-rebase-obsolete.t

5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
More complex case where part of the rebase set were already rebased More complex case where part of the rebase set were already rebased
$ hg rebase --rev 'desc(D)' --dest 'desc(H)' $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
rebasing 9:08483444fef9 "D" rebasing 9:08483444fef9 "D"
1 new orphan changesets
$ hg debugobsolete $ hg debugobsolete
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
$ hg log -G $ hg log -G
@ 11:4596109a6a43 D @ 11:4596109a6a43 D
| |
Test that rewriting leaving instability behind is allowed Test that rewriting leaving instability behind is allowed
--------------------------------------------------------------------- ---------------------------------------------------------------------
$ hg log -r 'children(8)' $ hg log -r 'children(8)'
9:cf44d2f5a9f4 D (no-eol) 9:cf44d2f5a9f4 D (no-eol)
$ hg rebase -r 8 $ hg rebase -r 8
rebasing 8:e273c5e7d2d2 "C" rebasing 8:e273c5e7d2d2 "C"
1 new orphan changesets
$ hg log -G $ hg log -G
o 11:0d8f238b634c C o 11:0d8f238b634c C
| |
o 10:7c6027df6a99 B o 10:7c6027df6a99 B
| |
| * 9:cf44d2f5a9f4 D | * 9:cf44d2f5a9f4 D
| | | |
| x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c) | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c)
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
(actual test) (actual test)
$ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
rebasing 9:4bde274eefcf "I" (tip) rebasing 9:4bde274eefcf "I" (tip)
1 new orphan changesets
$ hg log -G $ hg log -G
@ 12:acd174b7ab39 I @ 12:acd174b7ab39 I
| |
o 11:6c11a6218c97 H o 11:6c11a6218c97 H
| |
| o 10:b5313c85b22e D | o 10:b5313c85b22e D
|/ |/
| * 8:53a6a128b2b7 M | * 8:53a6a128b2b7 M
Test hidden changesets in the rebase set (issue4504) Test hidden changesets in the rebase set (issue4504)
$ hg up --hidden 9 $ hg up --hidden 9
updating to a hidden changeset 4bde274eefcf updating to a hidden changeset 4bde274eefcf
3 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo J > J $ echo J > J
$ hg add J $ hg add J
$ hg commit -m J $ hg commit -m J
1 new orphan changesets
$ hg debugobsolete `hg log --rev . -T '{node}'` $ hg debugobsolete `hg log --rev . -T '{node}'`
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
rebasing 9:4bde274eefcf "I" rebasing 9:4bde274eefcf "I"
rebasing 13:06edfc82198f "J" (tip) rebasing 13:06edfc82198f "J" (tip)
2 new content-divergent changesets
$ hg log -G $ hg log -G
@ 15:5ae8a643467b J @ 15:5ae8a643467b J
| |
* 14:9ad579b4a5de I * 14:9ad579b4a5de I
| |
| * 12:acd174b7ab39 I | * 12:acd174b7ab39 I
| | | |
| o 11:6c11a6218c97 H | o 11:6c11a6218c97 H
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ hg up 14 -C $ hg up 14 -C
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "K" > K $ echo "K" > K
$ hg add K $ hg add K
$ hg commit --amend -m "K" $ hg commit --amend -m "K"
1 new orphan changesets
$ echo "L" > L $ echo "L" > L
$ hg add L $ hg add L
$ hg commit -m "L" $ hg commit -m "L"
$ hg up '.^' $ hg up '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "M" > M $ echo "M" > M
$ hg add M $ hg add M
$ hg commit --amend -m "M" $ hg commit --amend -m "M"
1 new orphan changesets
$ hg log -G $ hg log -G
@ 18:bfaedf8eb73b M @ 18:bfaedf8eb73b M
| |
| * 17:97219452e4bd L | * 17:97219452e4bd L
| | | |
| x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b) | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b)
|/ |/
| * 15:5ae8a643467b J | * 15:5ae8a643467b J
| | | |
o | 1:42ccdea3bb16 B o | 1:42ccdea3bb16 B
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True $ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True
note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K" note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K"
rebasing 15:5ae8a643467b "J" rebasing 15:5ae8a643467b "J"
1 new orphan changesets
$ cd .. $ cd ..
Skip obsolete changeset even with multiple hops Skip obsolete changeset even with multiple hops
----------------------------------------------- -----------------------------------------------
setup setup
$ hg commit --amend -m B1 $ hg commit --amend -m B1
$ hg commit --amend -m B2 $ hg commit --amend -m B2
$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
updating to a hidden changeset a8b11f55fb19 updating to a hidden changeset a8b11f55fb19
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo C > C $ echo C > C
$ hg add C $ hg add C
$ hg commit -m C $ hg commit -m C
1 new orphan changesets
$ hg log -G $ hg log -G
@ 4:212cb178bcbb C @ 4:212cb178bcbb C
| |
| o 3:261e70097290 B2 | o 3:261e70097290 B2
| | | |
x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290) x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290)
|/ |/
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
Rebase finds its way in a chain of marker Rebase finds its way in a chain of marker
$ hg rebase -d 'desc(B2)' $ hg rebase -d 'desc(B2)'
note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
rebasing 4:212cb178bcbb "C" (tip) rebasing 4:212cb178bcbb "C" (tip)
Even when the chain include missing node Even when the chain include missing node
$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
updating to a hidden changeset a8b11f55fb19 updating to a hidden changeset a8b11f55fb19
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo D > D $ echo D > D
$ hg add D $ hg add D
$ hg commit -m D $ hg commit -m D
1 new orphan changesets
$ hg --hidden strip -r 'desc(B1)' $ hg --hidden strip -r 'desc(B1)'
saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
$ hg log -G $ hg log -G
@ 5:1a79b7535141 D @ 5:1a79b7535141 D
| |
| o 4:ff2c4d47b71d C | o 4:ff2c4d47b71d C
| | | |
| o 2:261e70097290 B2 | o 2:261e70097290 B2
o | 4:ff2c4d47b71d C o | 4:ff2c4d47b71d C
|/ |/
o 2:261e70097290 B2 o 2:261e70097290 B2
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg rebase -d 6 -r "4::" $ hg rebase -d 6 -r "4::"
rebasing 4:ff2c4d47b71d "C" rebasing 4:ff2c4d47b71d "C"
note: not rebasing 7:360bbaa7d3ce "O", it has no successor note: not rebasing 7:360bbaa7d3ce "O", it has no successor
rebasing 8:8d47583e023f "P" (tip) rebasing 8:8d47583e023f "P" (tip)
If all the changeset to be rebased are obsolete and present in the destination, we If all the changeset to be rebased are obsolete and present in the destination, we
should display a friendly error message should display a friendly error message
$ hg add bar $ hg add bar
$ hg commit --amend -m "10'" $ hg commit --amend -m "10'"
$ hg up 10 --hidden $ hg up 10 --hidden
updating to a hidden changeset 121d9e3bc4c6 updating to a hidden changeset 121d9e3bc4c6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "bar" > foo $ echo "bar" > foo
$ hg add foo $ hg add foo
$ hg commit -m "bar foo" $ hg commit -m "bar foo"
1 new orphan changesets
$ hg log -G $ hg log -G
@ 14:73568ab6879d bar foo @ 14:73568ab6879d bar foo
| |
| o 13:77d874d096a2 10' | o 13:77d874d096a2 10'
| | | |
| | o 12:3eb461388009 john doe | | o 12:3eb461388009 john doe
| |/ | |/
x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2) x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
| |
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
With experimental.evolution.allowdivergence=True, rebase can create divergence With experimental.evolution.allowdivergence=True, rebase can create divergence
$ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
rebasing 10:121d9e3bc4c6 "P" rebasing 10:121d9e3bc4c6 "P"
rebasing 14:73568ab6879d "bar foo" (tip) rebasing 14:73568ab6879d "bar foo" (tip)
2 new content-divergent changesets
$ hg summary $ hg summary
parent: 16:61bd55f69bc4 tip parent: 16:61bd55f69bc4 tip
bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 8 draft phases: 8 draft
content-divergent: 2 changesets content-divergent: 2 changesets
$ printf "dummy" > K $ printf "dummy" > K
$ hg add K $ hg add K
$ hg commit -m "dummy change" $ hg commit -m "dummy change"
$ printf "dummy" > L $ printf "dummy" > L
$ hg add L $ hg add L
$ hg commit -m "dummy change" $ hg commit -m "dummy change"
$ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg log -G -r 16:: $ hg log -G -r 16::
@ 21:7bdc8a87673d dummy change @ 21:7bdc8a87673d dummy change
| |
x 20:8b31da3c4919 dummy change (rewritten as 18:601db7a18f51) x 20:8b31da3c4919 dummy change (rewritten as 18:601db7a18f51)
| |
o 19:b82fb57ea638 willconflict second version o 19:b82fb57ea638 willconflict second version
| |
> d' d # replace: d -> d' > d' d # replace: d -> d'
> \ / > \ /
> c > c
> | > |
> x b > x b
> \| > \|
> a > a
> EOF > EOF
1 new orphan changesets
$ hg log -G -r 'a':: $ hg log -G -r 'a'::
* 7:1143e9adc121 f * 7:1143e9adc121 f
| |
| o 6:d60ebfa0f1cb e | o 6:d60ebfa0f1cb e
| | | |
| o 5:027ad6c5830d d' | o 5:027ad6c5830d d'
| | | |
x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d) x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d)
$ hg rebase -r 'c'::'f' -d 'x' $ hg rebase -r 'c'::'f' -d 'x'
abort: this rebase will cause divergences from: 76be324c128b abort: this rebase will cause divergences from: 76be324c128b
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [255]
$ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x' $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 "c" (c)
rebasing 4:76be324c128b "d" (d) rebasing 4:76be324c128b "d" (d)
rebasing 7:1143e9adc121 "f" (f tip) rebasing 7:1143e9adc121 "f" (f tip)
1 new orphan changesets
2 new content-divergent changesets
$ hg log -G -r 'a':: -T instabilities $ hg log -G -r 'a':: -T instabilities
o 10:e1744ea07510 f o 10:e1744ea07510 f
| |
* 9:e2b36ea9a0a0 d (content-divergent) * 9:e2b36ea9a0a0 d (content-divergent)
| |
o 8:6a0376de376e c o 8:6a0376de376e c
| |
| x 7:1143e9adc121 f | x 7:1143e9adc121 f
$ hg strip -r 8: $ hg strip -r 8:
(Not skipping obsoletes means that divergence is allowed.) (Not skipping obsoletes means that divergence is allowed.)
$ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x' $ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 "c" (c)
rebasing 4:76be324c128b "d" (d) rebasing 4:76be324c128b "d" (d)
rebasing 7:1143e9adc121 "f" (f tip) rebasing 7:1143e9adc121 "f" (f tip)
1 new orphan changesets
2 new content-divergent changesets
$ hg strip -r 0: $ hg strip -r 0:
Similar test on a more complex graph Similar test on a more complex graph
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> g > g
> | > |
> f e > f e
> | | > | |
> e' d # replace: e -> e' > e' d # replace: e -> e'
> \ / > \ /
> c > c
> | > |
> x b > x b
> \| > \|
> a > a
> EOF > EOF
1 new orphan changesets
$ hg log -G -r 'a': $ hg log -G -r 'a':
* 8:2876ce66c6eb g * 8:2876ce66c6eb g
| |
| o 7:3ffec603ab53 f | o 7:3ffec603ab53 f
| | | |
x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea) x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
| | | |
| o 5:63324dc512ea e' | o 5:63324dc512ea e'
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F > F
> /| > /|
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets
$ hg rebase -d B -s D $ hg rebase -d B -s D
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
rebasing 4:66f1a38021c9 "F" (F tip) rebasing 4:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
o 5:50e9d60b99c6 F o 5:50e9d60b99c6 F
|\ |\
| | x 4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6) | | x 4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6)
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F > F
> /| > /|
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets
$ hg rebase -d B -s E $ hg rebase -d B -s E
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
rebasing 4:66f1a38021c9 "F" (F tip) rebasing 4:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
o 5:aae1787dacee F o 5:aae1787dacee F
|\ |\
| | x 4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee) | | x 4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee)
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets
$ hg rebase -d C -s D $ hg rebase -d C -s D
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
o 6:0913febf6439 F o 6:0913febf6439 F
|\ |\
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets
$ hg rebase -d C -s E $ hg rebase -d C -s E
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
o 6:c6ab0cc6d220 F o 6:c6ab0cc6d220 F
|\ |\
+---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220) +---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220)
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets
$ hg rebase -d C -b F $ hg rebase -d C -b F
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 "D" (D)
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: rebase of 5:66f1a38021c9 created no changes to commit note: rebase of 5:66f1a38021c9 created no changes to commit
$ hg log -G $ hg log -G
o 6:8f47515dda15 D o 6:8f47515dda15 D
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets
$ hg rebase -d C -b F $ hg rebase -d C -b F
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
rebasing 3:7fb047a69f22 "E" (E) rebasing 3:7fb047a69f22 "E" (E)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: rebase of 5:66f1a38021c9 created no changes to commit note: rebase of 5:66f1a38021c9 created no changes to commit
$ hg log -G $ hg log -G
$ cd p12-succ-in-dest $ cd p12-succ-in-dest
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> E F > E F
> /| /| # replace: A -> C > /| /| # replace: A -> C
> A B C D # replace: B -> D > A B C D # replace: B -> D
> | | > | |
> X Y > X Y
> EOS > EOS
1 new orphan changesets
$ hg rebase -r A+B+E -d F $ hg rebase -r A+B+E -d F
note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C) note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D) note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
rebasing 7:dac5d11c5a7d "E" (E tip) rebasing 7:dac5d11c5a7d "E" (E tip)
abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
[255] [255]
$ cd .. $ cd ..
Rebase a non-clean merge. One parent has successor in destination, the other Rebase a non-clean merge. One parent has successor in destination, the other
parent moves as requested. parent moves as requested.
$ hg init p1-succ-p2-move $ hg init p1-succ-p2-move
$ cd p1-succ-p2-move $ cd p1-succ-p2-move
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D Z > D Z
> /| | # replace: A -> C > /| | # replace: A -> C
> A B C # D/D = D > A B C # D/D = D
> EOS > EOS
1 new orphan changesets
$ hg rebase -r A+B+D -d Z $ hg rebase -r A+B+D -d Z
note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C) note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C)
rebasing 1:fc2b737bb2e5 "B" (B) rebasing 1:fc2b737bb2e5 "B" (B)
rebasing 3:b8ed089c80ad "D" (D) rebasing 3:b8ed089c80ad "D" (D)
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G $ hg log -G
o 6:e4f78693cc88 D o 6:e4f78693cc88 D
$ hg init p1-move-p2-succ $ hg init p1-move-p2-succ
$ cd p1-move-p2-succ $ cd p1-move-p2-succ
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D Z > D Z
> /| | # replace: B -> C > /| | # replace: B -> C
> A B C # D/D = D > A B C # D/D = D
> EOS > EOS
1 new orphan changesets
$ hg rebase -r B+A+D -d Z $ hg rebase -r B+A+D -d Z
rebasing 0:426bada5c675 "A" (A) rebasing 0:426bada5c675 "A" (A)
note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C) note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C)
rebasing 3:b8ed089c80ad "D" (D) rebasing 3:b8ed089c80ad "D" (D)
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G $ hg log -G
o 6:1b355ed94d82 D o 6:1b355ed94d82 D
> |/ > |/
> A > A
> EOS > EOS
$ hg update D1 -q $ hg update D1 -q
$ hg bookmark book -i $ hg bookmark book -i
$ hg rebase -r B+D1 -d E $ hg rebase -r B+D1 -d E
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2) note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2)
1 new orphan changesets
$ hg log -G -T '{desc} {bookmarks}' $ hg log -G -T '{desc} {bookmarks}'
@ B book @ B book
| |
| x D1 | x D1
| | | |
o | E o | E
| | | |
| * C | * C
> B3 B2 # amend: B1 -> B2 -> B3 > B3 B2 # amend: B1 -> B2 -> B3
> |/ # B2 is hidden > |/ # B2 is hidden
> | D > | D
> | |\ > | |\
> | B1 C > | B1 C
> |/ > |/
> A > A
> EOS > EOS
1 new orphan changesets
$ eval `hg tags -T '{tag}={node}\n'` $ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags $ rm .hg/localtags
$ hg rebase -r $D -d $E $ hg rebase -r $D -d $E
rebasing 5:9e62094e4d94 "D" rebasing 5:9e62094e4d94 "D"
$ hg log -G $ hg log -G

tests/test-revset2.t

$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F G > F G
> |/ # split: B -> E, F > |/ # split: B -> E, F
> B C D E # amend: B -> C -> D > B C D E # amend: B -> C -> D
> \|/ | # amend: F -> G > \|/ | # amend: F -> G
> A A Z # amend: A -> Z > A A Z # amend: A -> Z
> EOS > EOS
3 new orphan changesets
3 new content-divergent changesets
$ hg log -r 'successors(Z)' -T '{desc}\n' $ hg log -r 'successors(Z)' -T '{desc}\n'
Z Z
$ hg log -r 'successors(F)' -T '{desc}\n' $ hg log -r 'successors(F)' -T '{desc}\n'
F F
G G

tests/test-show-work.t

Obsolescence information appears in labels. Obsolescence information appears in labels.
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> EOF > EOF
$ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"` $ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"`
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets
$ hg show work --color=debug $ hg show work --color=debug
@ [log.changeset changeset.draft changeset.unstable instability.orphan|32f3] [log.description|commit 3] @ [log.changeset changeset.draft changeset.unstable instability.orphan|32f3] [log.description|commit 3]
x [log.changeset changeset.draft changeset.obsolete|6a75] [log.description|commit 2] x [log.changeset changeset.draft changeset.obsolete|6a75] [log.description|commit 2]
| |
~ ~
$ cd .. $ cd ..

tests/test-split.t

$ cd $TESTTMP/d $ cd $TESTTMP/d
#if obsstore-off #if obsstore-off
$ runsplit -r 1 --no-rebase $ runsplit -r 1 --no-rebase
abort: cannot split changeset with children without rebase abort: cannot split changeset with children without rebase
[255] [255]
#else #else
$ runsplit -r 1 --no-rebase >/dev/null $ runsplit -r 1 --no-rebase >/dev/null
3 new orphan changesets
$ hg bookmark $ hg bookmark
d1 2:b5c5ea414030 d1 2:b5c5ea414030
* d2 3:f4a0a8d004cc * d2 3:f4a0a8d004cc
d3 4:777940761eba d3 4:777940761eba
r1 0:a61bcde8c529 r1 0:a61bcde8c529
r2 7:00eebaf8d2e2 r2 7:00eebaf8d2e2
$ hg glog $ hg glog
> F G1 G2 # amend: G1 -> G2 > F G1 G2 # amend: G1 -> G2
> | | / # prune: F > | | / # prune: F
> C D E > C D E
> \|/ > \|/
> B > B
> | > |
> A > A
> EOS > EOS
2 new orphan changesets
$ eval `hg tags -T '{tag}={node}\n'` $ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags $ rm .hg/localtags
$ hg split $B --config experimental.evolution=createmarkers $ hg split $B --config experimental.evolution=createmarkers
abort: split would leave orphaned changesets behind abort: split would leave orphaned changesets behind
[255] [255]
$ cat > $TESTTMP/messages <<EOF $ cat > $TESTTMP/messages <<EOF
> Split B > Split B
> EOF > EOF

tests/test-strip.t

$ cd $TESTTMP/scmutilcleanup.obsstore $ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> evolution=true > evolution=true
> evolution.track-operation=1 > evolution.track-operation=1
> EOF > EOF
$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
4 new orphan changesets
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
* 12:1473d4b996d1 G2 b-F@divergent3 b-G * 12:1473d4b996d1 G2 b-F@divergent3 b-G
| |
| * 11:d11b3456a873 F2 b-F | * 11:d11b3456a873 F2 b-F
| | | |
| * 8:5cb05ba470a7 H | * 8:5cb05ba470a7 H

tests/test-unamend.t

o 1:29becc82797a Added b o 1:29becc82797a Added b
| |
o 0:18d04c59bb5d Added a o 0:18d04c59bb5d Added a
$ hg up 5 $ hg up 5
2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bar >> f $ echo bar >> f
$ hg amend $ hg amend
3 new orphan changesets
$ hg rebase -s 6 -d . -q $ hg rebase -s 6 -d . -q
$ hg glog $ hg glog
o 23:03ddd6fc5af1 Added things to a and b o 23:03ddd6fc5af1 Added things to a and b
| |
o 22:3e7b64ee157b Added h o 22:3e7b64ee157b Added h
| |
o 21:49635b68477e Added g o 21:49635b68477e Added g
o 0:18d04c59bb5d Added a o 0:18d04c59bb5d Added a
$ hg --config experimental.evolution=createmarkers unamend $ hg --config experimental.evolution=createmarkers unamend
abort: cannot unamend changeset with children abort: cannot unamend changeset with children
[255] [255]
$ hg unamend $ hg unamend
3 new orphan changesets
Trying to unamend a public changeset Trying to unamend a public changeset
$ hg up -C 23 $ hg up -C 23
5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg phase -r . -p $ hg phase -r . -p
1 new phase-divergent changesets
$ hg unamend $ hg unamend
abort: cannot unamend public changesets abort: cannot unamend public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]
Testing whether unamend retains copies or not Testing whether unamend retains copies or not
$ hg status $ hg status

tests/test-uncommit.t

+++ b/files Thu Jan 01 00:00:00 1970 +0000 +++ b/files Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-ab -ab
+abc +abc
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 9:48e5bd7cd583
$ hg uncommit $ hg uncommit
3 new orphan changesets
$ hg status $ hg status
M files M files
A file-abc A file-abc
$ hg heads -T '{rev}:{node} {desc}' $ hg heads -T '{rev}:{node} {desc}'
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol) 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol)
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 9:48e5bd7cd583
$ hg commit -m 'new abc' $ hg commit -m 'new abc'
+++ b/files Thu Jan 01 00:00:00 1970 +0000 +++ b/files Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-a -a
+ab +ab
$ hg bookmark $ hg bookmark
foo 9:48e5bd7cd583 foo 9:48e5bd7cd583
$ hg uncommit file-ab $ hg uncommit file-ab
1 new orphan changesets
$ hg status $ hg status
A file-ab A file-ab
$ hg heads -T '{rev}:{node} {desc}\n' $ hg heads -T '{rev}:{node} {desc}\n'
11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo