--- a/hgext/evolve.py Fri Jan 04 12:42:43 2013 +0100
+++ b/hgext/evolve.py Fri Jan 04 12:43:22 2013 +0100
@@ -437,7 +437,7 @@
if ui.config('alias', 'olog', None) is None:
ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden")
if ui.config('alias', 'odiff', None) is None:
- ui.setconfig('alias', 'odiff', "diff --rev 'limit(precursors(.),1)' --rev .")
+ ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
# - "troubles" method on changectx
--- a/tests/test-amend.t Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-amend.t Fri Jan 04 12:43:22 2013 +0100
@@ -30,7 +30,6 @@
foo
$ hg branches
foo 2:a34b93d251e4
- default 0:07f494440405 (inactive)
$ glog
@ 2@foo(draft) adda
@@ -91,7 +90,6 @@
marked working directory as branch default
(branches are permanent and global, did you want a bookmark?)
$ hg ci -m resetbranch
- created new head
$ hg branch --force foo
marked working directory as branch foo
(branches are permanent and global, did you want a bookmark?)
--- a/tests/test-evolve.t Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-evolve.t Fri Jan 04 12:43:22 2013 +0100
@@ -233,17 +233,13 @@
$ hg phase --public 0 -v
phase changed for 1 changesets
- $ hg amend -c 2
+ $ hg amend -c 4
abort: cannot amend non ancestor changeset
[255]
(amend of on ancestors)
- $ hg amend -c 2
- abort: cannot amend non ancestor changeset
- [255]
-
$ hg amend --note 'french looks better'
1 new unstable changesets
$ hg log
@@ -298,7 +294,7 @@
phase change turning obsolete changeset public issue a bumped warning
- $ hg phase --public 7
+ $ hg phase --hidden --public 7
1 new bumped changesets
all solving bumped troubled
@@ -326,7 +322,7 @@
|
o 0 : base - test
- $ hg diff -r 9 -r 8
+ $ hg diff --hidden -r 9 -r 8
$ hg diff -r 9^ -r 9
diff --git a/main-file-1 b/main-file-1
--- a/main-file-1
@@ -393,6 +389,9 @@
checking files
3 files, 4 changesets, 4 total revisions
$ hg --config extensions.hgext.mq= strip 'extinct()'
+ abort: empty revision set
+ [255]
+ $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'
saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg
$ hg verify
checking changesets
--- a/tests/test-obsolete.t Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-obsolete.t Fri Jan 04 12:43:22 2013 +0100
@@ -4,8 +4,6 @@
> allow_push = *
> [phases]
> publish=False
- > [alias]
- > odiff=diff --rev 'limit(precursors(.),1)' --rev .
> [extensions]
> hgext.rebase=
> EOF
@@ -16,7 +14,7 @@
> hg ci -m "add $1"
> }
$ getid() {
- > hg id --debug -ir "$1"
+ > hg id --hidden --debug -ir "$1"
> }
$ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
@@ -120,7 +118,7 @@
- 0d3f46688ccc
4
- 725c380fe99b
- $ hg up 3 -q
+ $ hg up --hidden 3 -q
Working directory parent is obsolete
$ mkcommit d # 5 (on 3)
1 new unstable changesets
@@ -194,7 +192,7 @@
- 7c3bad9141dc
0
- 1f0dee641bb7
- $ hg up 3 -q
+ $ hg up --hidden 3 -q
Working directory parent is obsolete
$ mkcommit obsol_d # 6
created new head
@@ -250,7 +248,7 @@
no changes found
[1]
- $ hg up -q .^ # 3
+ $ hg up --hidden -q .^ # 3
Working directory parent is obsolete
$ mkcommit "obsol_d'" # 7
created new head
@@ -337,7 +335,7 @@
Test rollback support
- $ hg up .^ -q # 3
+ $ hg up --hidden .^ -q # 3
Working directory parent is obsolete
$ mkcommit "obsol_d''"
created new head
@@ -374,7 +372,7 @@
add obsol_c'
branch: default
commit: 1 deleted, 2 unknown (clean)
- update: 4 new changesets, 4 branch heads (merge)
+ update: 2 new changesets, 2 branch heads (merge)
unstable: 1 changesets
$ qlog
6
@@ -493,8 +491,6 @@
should not rebase extinct changeset
#excluded 'whole rebase set is extinct and ignored.' message not in core
- $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase'
- nothing to rebase
$ hg rebase -b '3' -d 4 --traceback
2 new divergent changesets
$ hg log -G --template='{rev} - {node|short} {desc}\n'
@@ -535,7 +531,7 @@
(make an obsolete changeset public)
$ cd local
- $ hg phase --public 11
+ $ hg phase --hidden --public 11
1 new bumped changesets
$ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
@ 12 - (draft) 6db5e282cb91 add obsol_d'''
@@ -639,7 +635,7 @@
add obsolet_conflicting_d
branch: default
commit: (clean)
- update: (9|11) new changesets, (9|10) branch heads \(merge\) (re)
+ update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
bumped: 1 changesets
$ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
$ hg log -r 'conflicting()'
--- a/tests/test-stabilize-result.t Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-stabilize-result.t Fri Jan 04 12:43:22 2013 +0100
@@ -130,7 +130,7 @@
Make precursors public
- $ hg phase --public 8
+ $ hg phase --hidden --public 8
1 new bumped changesets
$ glog
@ 12:15c83af6f3a3@default(draft) bk:[] newer a
@@ -186,7 +186,6 @@
> conflict
> EOF
$ hg ci -m 'More addition'
- created new head
$ glog
@ 15:7391601a4bfa@default(draft) bk:[] More addition
|
@@ -202,7 +201,7 @@
$ echo 'babar' >> a
$ hg amend
- $ hg up 15
+ $ hg up --hidden 15
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Working directory parent is obsolete
$ mv a a.old
@@ -229,7 +228,7 @@
Stabilize It
- $ hg evolve -qn
+ $ hg evolve -qn --traceback
hg update -c 3883461cc228 &&
hg merge 4754d61bc2db &&
hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
@@ -266,7 +265,7 @@
More addition
branch: default
commit: (clean)
- update: 19 new changesets, 14 branch heads (merge)
+ update: 2 new changesets, 2 branch heads (merge)
$ hg export .
# HG changeset patch
# User test
@@ -292,7 +291,7 @@
Check conflicting during conflicting resolution
-------------------------------------------------
- $ hg up 15
+ $ hg up --hidden 15
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Working directory parent is obsolete
$ echo 'gotta break' >> a
--- a/tests/test-tutorial.t Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-tutorial.t Fri Jan 04 12:43:22 2013 +0100
@@ -220,7 +220,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads .' to see heads, 'hg merge' to merge)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
I now have a new heads. Note that this remote head is immutable
@@ -568,7 +568,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads .' to see heads, 'hg merge' to merge)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
1 new unstable changesets
--- a/tests/test-uncommit.t Fri Jan 04 12:42:43 2013 +0100
+++ b/tests/test-uncommit.t Fri Jan 04 12:43:22 2013 +0100
@@ -236,7 +236,7 @@
Test phase is preserved, no local changes
- $ hg up -C 3
+ $ hg up -C 3 --hidden
8 files updated, 0 files merged, 1 files removed, 0 files unresolved
Working directory parent is obsolete
$ hg --config extensions.purge= purge
@@ -280,7 +280,7 @@
Test --all
- $ hg up -C 3
+ $ hg up -C 3 --hidden
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Working directory parent is obsolete
$ hg --config extensions.purge= purge