merge with stable
A couple of test fix were added on stable.
--- a/hgext/evolve.py Wed Sep 03 23:56:39 2014 +0200
+++ b/hgext/evolve.py Thu Sep 04 09:06:18 2014 +0200
@@ -71,7 +71,6 @@
from mercurial import localrepo
from mercurial.hgweb import hgweb_mod
from mercurial import bundle2
-from mercurial import util
cmdtable = {}
command = cmdutil.command(cmdtable)
@@ -381,7 +380,7 @@
if ui.config('alias', 'grab', None) is None:
if os.name == 'nt':
ui.setconfig('alias', 'grab',
- "! " + util.hgexecutable() + " rebase --dest . --rev && "
+ "! " + util.hgexecutable() + " rebase --dest . --rev $@ && "
+ util.hgexecutable() + " up tip")
else:
ui.setconfig('alias', 'grab',
--- a/tests/test-drop.t Wed Sep 03 23:56:39 2014 +0200
+++ b/tests/test-drop.t Thu Sep 04 09:06:18 2014 +0200
@@ -63,7 +63,7 @@
0 obsmarkers found
search nodes: wall * comb * user * sys * (glob)
1 nodes found
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg (glob)
strip nodes: wall * comb * user * sys * (glob)
$ summary
============ graph ==============
--- a/tests/test-evolve.t Wed Sep 03 23:56:39 2014 +0200
+++ b/tests/test-evolve.t Thu Sep 04 09:06:18 2014 +0200
@@ -447,7 +447,7 @@
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
+ saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg (glob)
$ hg verify
checking changesets
checking manifests
--- a/tests/test-sharing.t Wed Sep 03 23:56:39 2014 +0200
+++ b/tests/test-sharing.t Thu Sep 04 09:06:18 2014 +0200
@@ -106,7 +106,7 @@
This bug fix is finished. We can push it to the public repository.
$ hg push
- pushing to $TESTTMP/public
+ pushing to $TESTTMP/public (glob)
searching for changes
adding changesets
adding manifests
--- a/tests/test-tutorial.t Wed Sep 03 23:56:39 2014 +0200
+++ b/tests/test-tutorial.t Thu Sep 04 09:06:18 2014 +0200
@@ -92,7 +92,7 @@
Its first version is shared with the outside.
$ hg push remote
- pushing to $TESTTMP/remote
+ pushing to $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
@@ -218,7 +218,7 @@
I'll get this remote changeset when pulling
$ hg pull remote
- pulling from $TESTTMP/remote
+ pulling from $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
@@ -397,7 +397,7 @@
we can now push our change:
$ hg push remote
- pushing to $TESTTMP/remote
+ pushing to $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
@@ -517,7 +517,7 @@
is ``true`` by default.
$ hg pull local
- pulling from $TESTTMP/local
+ pulling from $TESTTMP/local (glob)
searching for changes
adding changesets
adding manifests
@@ -575,7 +575,7 @@
I can now exchange mutable changeset between "remote" and "local" repository.
$ hg pull local
- pulling from $TESTTMP/local
+ pulling from $TESTTMP/local (glob)
searching for changes
adding changesets
adding manifests
@@ -636,7 +636,7 @@
When we pull from remote again we get an unstable state!
$ hg pull remote
- pulling from $TESTTMP/remote
+ pulling from $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
@@ -678,7 +678,7 @@
share it with the outside:
$ hg push other
- pushing to $TESTTMP/other
+ pushing to $TESTTMP/other (glob)
searching for changes
abort: push includes unstable changeset: bf1b0d202029!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
@@ -727,7 +727,7 @@
We can push this evolution to remote
$ hg push remote
- pushing to $TESTTMP/remote
+ pushing to $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
@@ -740,7 +740,7 @@
$ cd ../remote
$ hg pull local # we up again to trigger the warning. it was displayed during the push
- pulling from $TESTTMP/local
+ pulling from $TESTTMP/local (glob)
searching for changes
no changes found
pull obsolescence markers
@@ -769,7 +769,7 @@
$ cd ../local
$ hg pull remote
- pulling from $TESTTMP/remote
+ pulling from $TESTTMP/remote (glob)
searching for changes
adding changesets
adding manifests
--- a/tests/test-userguide.t Wed Sep 03 23:56:39 2014 +0200
+++ b/tests/test-userguide.t Thu Sep 04 09:06:18 2014 +0200
@@ -18,7 +18,7 @@
example 2: unsafe amend with plain vanilla Mercurial: the original
commit is stripped
$ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
- saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg
+ saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg (glob)
$ hg log -r 23fe4ac6d3f1
abort: unknown revision '23fe4ac6d3f1'!
[255]