progress: get the extremely verbose output out of default debug
When the progress extension is not enabled, each call to 'ui.progress' used to
issue a debug message. This results is a very verbose output and often redundant
in tests. Dropping it makes tests less volatile to factor they do not meant to
test.
We had to alter the sed trick in 'test-rename-merge2.t'. Sed is used to drop all
output from a certain point and hidding the progress output remove its anchor.
So we anchor on something else.
--- a/mercurial/ui.py Fri May 15 11:52:39 2015 +0800
+++ b/mercurial/ui.py Sat May 09 23:40:40 2015 -0700
@@ -902,7 +902,7 @@
termination.
'''
- if pos is None or not self.debugflag:
+ if pos is None or not self.configbool('progress', 'debug'):
return
if unit:
--- a/tests/test-acl.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-acl.t Sat May 09 23:40:40 2015 -0700
@@ -91,33 +91,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
updating the branch cache
listing keys for "phases"
@@ -151,33 +133,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: changes have source "push" - skipping
@@ -214,33 +178,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -287,33 +233,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -357,33 +285,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -432,33 +342,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
@@ -504,33 +396,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -581,33 +455,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -655,33 +511,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
@@ -731,33 +569,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
@@ -811,33 +631,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "wilma"
@@ -894,33 +696,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
@@ -972,33 +756,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "betty"
@@ -1061,33 +827,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
@@ -1144,33 +892,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -1223,33 +953,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -1304,33 +1016,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -1384,33 +1078,15 @@
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: foo/Bar/file.txt 1/3 files (33.33%)
- bundling: foo/file.txt 2/3 files (66.67%)
- bundling: quux/file.py 3/3 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
- manifests: 1/3 chunks (33.33%)
- manifests: 2/3 chunks (66.67%)
- manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
- files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
- files: 2/3 chunks (66.67%)
adding quux/file.py revisions
- files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
@@ -1504,41 +1180,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
@@ -1590,41 +1242,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
@@ -1674,41 +1302,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
@@ -1754,41 +1358,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
@@ -1828,41 +1408,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
@@ -1919,41 +1475,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
@@ -2009,41 +1541,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
@@ -2088,41 +1596,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
@@ -2172,41 +1656,17 @@
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
- bundling: 1/4 changesets (25.00%)
- bundling: 2/4 changesets (50.00%)
- bundling: 3/4 changesets (75.00%)
- bundling: 4/4 changesets (100.00%)
- bundling: 1/4 manifests (25.00%)
- bundling: 2/4 manifests (50.00%)
- bundling: 3/4 manifests (75.00%)
- bundling: 4/4 manifests (100.00%)
- bundling: abc.txt 1/4 files (25.00%)
- bundling: foo/Bar/file.txt 2/4 files (50.00%)
- bundling: foo/file.txt 3/4 files (75.00%)
- bundling: quux/file.py 4/4 files (100.00%)
adding changesets
- changesets: 1 chunks
add changeset ef1ea85a6374
- changesets: 2 chunks
add changeset f9cafe1212c8
- changesets: 3 chunks
add changeset 911600dab2ae
- changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
- manifests: 1/4 chunks (25.00%)
- manifests: 2/4 chunks (50.00%)
- manifests: 3/4 chunks (75.00%)
- manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
- files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
- files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
- files: 3/4 chunks (75.00%)
adding quux/file.py revisions
- files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
--- a/tests/test-archive.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-archive.t Sat May 09 23:40:40 2015 -0700
@@ -145,7 +145,7 @@
test/baz/bletch
test/foo
- $ hg archive --debug -t tbz2 -X baz test.tar.bz2
+ $ hg archive --debug -t tbz2 -X baz test.tar.bz2 --config progress.debug=true
archiving: 0/4 files (0.00%)
archiving: .hgsub 1/4 files (25.00%)
archiving: .hgsubstate 2/4 files (50.00%)
--- a/tests/test-bundle.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-bundle.t Sat May 09 23:40:40 2015 -0700
@@ -629,7 +629,7 @@
== bundling
- $ hg bundle bundle.hg part --debug
+ $ hg bundle bundle.hg part --debug --config progress.debug=true
query 1; heads
searching for changes
all remote heads known locally
--- a/tests/test-bundle2-format.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-bundle2-format.t Sat May 09 23:40:40 2015 -0700
@@ -336,7 +336,7 @@
bundling debug
- $ hg bundle2 --debug --param 'e|! 7/=babar%#==tutu' --param simple ../out.hg2
+ $ hg bundle2 --debug --param 'e|! 7/=babar%#==tutu' --param simple ../out.hg2 --config progress.debug=true
start emission of HG20 stream
bundle parameter: e%7C%21%207/=babar%25%23%3D%3Dtutu simple
start of parts
@@ -349,7 +349,7 @@
unbundling debug
- $ hg statbundle2 --debug < ../out.hg2
+ $ hg statbundle2 --debug --config progress.debug=true < ../out.hg2
start processing of HG20 stream
reading bundle2 stream parameters
ignoring unknown parameter 'e|! 7/'
@@ -383,7 +383,7 @@
Test part
=================
- $ hg bundle2 --parts ../parts.hg2 --debug
+ $ hg bundle2 --parts ../parts.hg2 --debug --config progress.debug=true
start emission of HG20 stream
bundle parameter:
start of parts
@@ -436,7 +436,7 @@
payload: 0 bytes
parts count: 7
- $ hg statbundle2 --debug < ../parts.hg2
+ $ hg statbundle2 --debug --config progress.debug=true < ../parts.hg2
start processing of HG20 stream
reading bundle2 stream parameters
options count: 0
@@ -515,7 +515,7 @@
Process the bundle
- $ hg unbundle2 --debug < ../parts.hg2
+ $ hg unbundle2 --debug --config progress.debug=true < ../parts.hg2
start processing of HG20 stream
reading bundle2 stream parameters
start extraction of bundle2 parts
@@ -704,7 +704,7 @@
@ 0:3903775176ed draft test a
- $ hg bundle2 --debug --rev '8+7+5+4' ../rev.hg2
+ $ hg bundle2 --debug --config progress.debug=true --rev '8+7+5+4' ../rev.hg2
4 changesets found
list of changesets:
32af7686d403cf45b5d95f2d70cebea587ac806a
--- a/tests/test-clone.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-clone.t Sat May 09 23:40:40 2015 -0700
@@ -64,7 +64,7 @@
No update, with debug option:
#if hardlink
- $ hg --debug clone -U . ../c
+ $ hg --debug clone -U . ../c --config progress.debug=true
linking: 1
linking: 2
linking: 3
--- a/tests/test-convert-filemap.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-convert-filemap.t Sat May 09 23:40:40 2015 -0700
@@ -438,7 +438,7 @@
$ hg ci -m 'merging something'
$ cd ..
$ echo "53792d18237d2b64971fa571936869156655338d 6d955580116e82c4b029bd30f321323bae71a7f0" >> branchpruning-hg2/.hg/shamap
- $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug
+ $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug --config progress.debug=true
run hg source pre-conversion action
run hg sink pre-conversion action
scanning source...
--- a/tests/test-convert-svn-encoding.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-convert-svn-encoding.t Sat May 09 23:40:40 2015 -0700
@@ -10,7 +10,7 @@
Convert while testing all possible outputs
- $ hg --debug convert svn-repo A-hg
+ $ hg --debug convert svn-repo A-hg --config progress.debug=1
initializing destination A-hg repository
reparent to file://*/svn-repo (glob)
run hg sink pre-conversion action
--- a/tests/test-copy-move-merge.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-copy-move-merge.t Sat May 09 23:40:40 2015 -0700
@@ -35,13 +35,11 @@
preserving a for resolve of c
removing a
b: remote moved from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
premerge successful
c: remote moved from a -> m
- updating: c 2/2 files (100.00%)
picked tool 'internal:merge' for c (binary False symlink False)
merging a and c to c
my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
--- a/tests/test-double-merge.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-double-merge.t Sat May 09 23:40:40 2015 -0700
@@ -38,13 +38,11 @@
preserving foo for resolve of bar
preserving foo for resolve of foo
bar: remote copied from foo -> m
- updating: bar 1/2 files (50.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging foo and bar to bar
my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
premerge successful
foo: versions differ -> m
- updating: foo 2/2 files (100.00%)
picked tool 'internal:merge' for foo (binary False symlink False)
merging foo
my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
--- a/tests/test-graft.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-graft.t Sat May 09 23:40:40 2015 -0700
@@ -154,7 +154,6 @@
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
preserving b for resolve of b
b: local copied/moved from a -> m
- updating: b 1/1 files (100.00%)
picked tool 'internal:merge' for b (binary False symlink False)
merging b and a to b
my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
@@ -170,7 +169,6 @@
ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
e: remote is newer -> g
getting e
- updating: e 1/1 files (100.00%)
b: remote unchanged -> k
committing files:
e
@@ -184,10 +182,8 @@
preserving e for resolve of e
d: remote is newer -> g
getting d
- updating: d 1/2 files (50.00%)
b: remote unchanged -> k
e: versions differ -> m
- updating: e 2/2 files (100.00%)
picked tool 'internal:merge' for e (binary False symlink False)
merging e
my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
--- a/tests/test-hardlinks.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-hardlinks.t Sat May 09 23:40:40 2015 -0700
@@ -57,7 +57,7 @@
Create hardlinked clone r2:
- $ hg clone -U --debug r1 r2
+ $ hg clone -U --debug r1 r2 --config progress.debug=true
linking: 1
linking: 2
linking: 3
--- a/tests/test-issue1802.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-issue1802.t Sat May 09 23:40:40 2015 -0700
@@ -58,7 +58,6 @@
branchmerge: True, force: False, partial: False
ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
a: update permissions -> e
- updating: a 1/1 files (100.00%)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-issue522.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-issue522.t Sat May 09 23:40:40 2015 -0700
@@ -33,7 +33,6 @@
ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
foo: remote is newer -> g
getting foo
- updating: foo 1/1 files (100.00%)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-issue672.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-issue672.t Sat May 09 23:40:40 2015 -0700
@@ -36,10 +36,8 @@
ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
1: other deleted -> r
removing 1
- updating: 1 1/2 files (50.00%)
1a: remote created -> g
getting 1a
- updating: 1a 2/2 files (100.00%)
2: remote unchanged -> k
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -68,7 +66,6 @@
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
preserving 1a for resolve of 1a
1a: local copied/moved from 1 -> m
- updating: 1a 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1a and 1 to 1a
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
@@ -92,7 +89,6 @@
preserving 1 for resolve of 1a
removing 1
1a: remote moved from 1 -> m
- updating: 1a 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
--- a/tests/test-largefiles-misc.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-largefiles-misc.t Sat May 09 23:40:40 2015 -0700
@@ -663,7 +663,7 @@
$ hg -R clone2 cat -r 1 clone2/.hglf/b
89e6c98d92887913cadf06b2adb97f26cde4849b
- $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug
+ $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
comparing with $TESTTMP/issue3651/src (glob)
query 1; heads
searching for changes
@@ -718,7 +718,7 @@
c801c9cfe94400963fcb683246217d5db77f9a9a
$ hg -R clone2 cat -r 4 clone2/.hglf/b
13f9ed0898e315bf59dc2973fec52037b6f441a2
- $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug
+ $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
comparing with $TESTTMP/issue3651/src (glob)
query 1; heads
searching for changes
@@ -770,7 +770,7 @@
largefiles to upload (2 entities):
b
- $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug
+ $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
comparing with $TESTTMP/issue3651/src (glob)
query 1; heads
searching for changes
--- a/tests/test-largefiles-wireproto.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-largefiles-wireproto.t Sat May 09 23:40:40 2015 -0700
@@ -264,7 +264,7 @@
largefiles pulled on update - no server side problems:
$ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
- $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache
+ $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache --config progress.debug=true
resolving manifests
branchmerge: False, force: False, partial: False
ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
--- a/tests/test-merge-commit.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-merge-commit.t Sat May 09 23:40:40 2015 -0700
@@ -73,7 +73,6 @@
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
preserving bar for resolve of bar
bar: versions differ -> m
- updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
@@ -160,7 +159,6 @@
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
preserving bar for resolve of bar
bar: versions differ -> m
- updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
--- a/tests/test-merge-criss-cross.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-merge-criss-cross.t Sat May 09 23:40:40 2015 -0700
@@ -82,9 +82,7 @@
preserving f2 for resolve of f2
f1: remote is newer -> g
getting f1
- updating: f1 1/2 files (50.00%)
f2: versions differ -> m
- updating: f2 2/2 files (100.00%)
picked tool 'internal:dump' for f2 (binary False symlink False)
merging f2
my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c
@@ -151,7 +149,6 @@
f1: remote is newer -> g
getting f1
- updating: f1 1/1 files (100.00%)
f2: remote unchanged -> k
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -194,7 +191,6 @@
f2: remote is newer -> g
getting f2
- updating: f2 1/1 files (100.00%)
f1: remote unchanged -> k
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -259,7 +255,6 @@
f1: remote is newer -> g
getting f1
- updating: f1 1/1 files (100.00%)
f2: remote unchanged -> k
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-merge-types.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-merge-types.t Sat May 09 23:40:40 2015 -0700
@@ -36,7 +36,6 @@
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
preserving a for resolve of a
a: versions differ -> m
- updating: a 1/1 files (100.00%)
picked tool 'internal:merge' for a (binary False symlink True)
merging a
my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
@@ -70,7 +69,6 @@
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
a: versions differ -> m
- updating: a 1/1 files (100.00%)
picked tool 'internal:merge' for a (binary False symlink True)
merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
@@ -104,7 +102,6 @@
ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
preserving a for resolve of a
a: versions differ -> m
- updating: a 1/1 files (100.00%)
(couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
picked tool ':prompt' for a (binary False symlink True)
no tool found to merge a
--- a/tests/test-merge7.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-merge7.t Sat May 09 23:40:40 2015 -0700
@@ -86,7 +86,6 @@
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
preserving test.txt for resolve of test.txt
test.txt: versions differ -> m
- updating: test.txt 1/1 files (100.00%)
picked tool 'internal:merge' for test.txt (binary False symlink False)
merging test.txt
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
--- a/tests/test-push-warn.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-push-warn.t Sat May 09 23:40:40 2015 -0700
@@ -40,7 +40,6 @@
query 1; heads
searching for changes
taking quick initial sample
- searching: 2 queries
query 2; still undecided: 1, sample size is: 1
2 total queries
listing keys for "phases"
--- a/tests/test-rebase-conflicts.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-rebase-conflicts.t Sat May 09 23:40:40 2015 -0700
@@ -223,7 +223,6 @@
ignoring null merge rebase of 6
ignoring null merge rebase of 8
rebasing 9:e31216eec445 "more changes to f1"
- rebasing: 9:e31216eec445 5/6 changesets (83.33%)
future parents are 2 and -1
rebase status stored
update to 2:4bc80088dc6b
@@ -232,10 +231,8 @@
ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
f2.txt: other deleted -> r
removing f2.txt
- updating: f2.txt 1/2 files (50.00%)
f1.txt: remote created -> g
getting f1.txt
- updating: f1.txt 2/2 files (100.00%)
merge against 9:e31216eec445
detach base 8:8e4e2c1a07ae
searching for copies back to rev 3
@@ -244,14 +241,12 @@
ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
f1.txt: remote is newer -> g
getting f1.txt
- updating: f1.txt 1/1 files (100.00%)
committing files:
f1.txt
committing manifest
committing changelog
rebased as 19c888675e13
rebasing 10:2f2496ddf49d "merge" (tip)
- rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
future parents are 11 and 7
rebase status stored
already in target
@@ -263,7 +258,6 @@
ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
f1.txt: remote is newer -> g
getting f1.txt
- updating: f1.txt 1/1 files (100.00%)
committing files:
f1.txt
committing manifest
@@ -276,50 +270,27 @@
ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
f1.txt: other deleted -> r
removing f1.txt
- updating: f1.txt 1/2 files (50.00%)
f2.txt: remote created -> g
getting f2.txt
- updating: f2.txt 2/2 files (100.00%)
3 changesets found
list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
e31216eec445e44352c5f01588856059466a24c9
2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: f1.txt 1/1 files (100.00%)
saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
3 changesets found
list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
19c888675e133ab5dff84516926a65672eaf04d9
2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
- bundling: 1/3 changesets (33.33%)
- bundling: 2/3 changesets (66.67%)
- bundling: 3/3 changesets (100.00%)
- bundling: 1/3 manifests (33.33%)
- bundling: 2/3 manifests (66.67%)
- bundling: 3/3 manifests (100.00%)
- bundling: f1.txt 1/1 files (100.00%)
adding branch
adding changesets
- changesets: 1 chunks
add changeset 4c9fbe56a16f
- changesets: 2 chunks
add changeset 19c888675e13
- changesets: 3 chunks
add changeset 2a7f09cac94c
adding manifests
- manifests: 1/2 chunks (50.00%)
- manifests: 2/2 chunks (100.00%)
- manifests: 3/2 chunks (150.00%)
adding file changes
adding f1.txt revisions
- files: 1/1 chunks (100.00%)
added 2 changesets with 2 changes to 1 files
invalid branchheads cache (served): tip differs
rebase completed
--- a/tests/test-relink.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-relink.t Sat May 09 23:40:40 2015 -0700
@@ -70,7 +70,7 @@
relink
- $ hg relink --debug | fix_path
+ $ hg relink --debug --config progress.debug=true | fix_path
relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
tip has 2 files, estimated total number of files: 3
collecting: 00changelog.i 1/3 files (33.33%)
--- a/tests/test-rename-dir-merge.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-rename-dir-merge.t Sat May 09 23:40:40 2015 -0700
@@ -43,14 +43,11 @@
removing a/a
a/b: other deleted -> r
removing a/b
- updating: a/b 2/5 files (40.00%)
b/a: remote created -> g
getting b/a
b/b: remote created -> g
getting b/b
- updating: b/b 4/5 files (80.00%)
b/c: remote directory rename - move from a/c -> dm
- updating: b/c 5/5 files (100.00%)
moving a/c to b/c (glob)
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -89,7 +86,6 @@
branchmerge: True, force: False, partial: False
ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb
b/c: local directory rename - get from a/c -> dg
- updating: b/c 1/1 files (100.00%)
getting a/c to b/c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-rename-merge1.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-rename-merge1.t Sat May 09 23:40:40 2015 -0700
@@ -40,9 +40,7 @@
removing a
b2: remote created -> g
getting b2
- updating: b2 1/2 files (50.00%)
b: remote moved from a -> m
- updating: b 2/2 files (100.00%)
picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
@@ -181,7 +179,6 @@
ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
newfile: remote created -> g
getting newfile
- updating: newfile 1/1 files (100.00%)
note: possible conflict - file was deleted and renamed to:
newfile
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rename-merge2.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-rename-merge2.t Sat May 09 23:40:40 2015 -0700
@@ -90,13 +90,11 @@
preserving rev for resolve of rev
a: remote unchanged -> k
b: remote copied from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
@@ -128,15 +126,12 @@
preserving rev for resolve of rev
a: remote is newer -> g
getting a
- updating: a 1/3 files (33.33%)
b: local copied/moved from a -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
@@ -168,13 +163,11 @@
preserving rev for resolve of rev
removing a
b: remote moved from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
premerge successful
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -204,13 +197,11 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: local copied/moved from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
@@ -240,9 +231,7 @@
preserving rev for resolve of rev
b: remote created -> g
getting b
- updating: b 1/2 files (50.00%)
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
@@ -271,7 +260,6 @@
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
preserving rev for resolve of rev
rev: versions differ -> m
- updating: rev 1/1 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
@@ -301,12 +289,9 @@
preserving rev for resolve of rev
a: other deleted -> r
removing a
- updating: a 1/3 files (33.33%)
b: remote created -> g
getting b
- updating: b 2/3 files (66.67%)
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -334,7 +319,6 @@
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
preserving rev for resolve of rev
rev: versions differ -> m
- updating: rev 1/1 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
@@ -360,14 +344,12 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: both renamed from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
@@ -402,9 +384,7 @@
preserving rev for resolve of rev
c: remote created -> g
getting c
- updating: c 1/2 files (50.00%)
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
@@ -434,14 +414,12 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: both created -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
@@ -469,16 +447,13 @@
preserving rev for resolve of rev
a: other deleted -> r
removing a
- updating: a 1/3 files (33.33%)
b: both created -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -505,16 +480,13 @@
preserving rev for resolve of rev
a: remote is newer -> g
getting a
- updating: a 1/3 files (33.33%)
b: both created -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
@@ -542,16 +514,13 @@
preserving rev for resolve of rev
a: other deleted -> r
removing a
- updating: a 1/3 files (33.33%)
b: both created -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -578,16 +547,13 @@
preserving rev for resolve of rev
a: remote is newer -> g
getting a
- updating: a 1/3 files (33.33%)
b: both created -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
@@ -615,14 +581,12 @@
preserving rev for resolve of rev
a: remote unchanged -> k
b: both created -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
@@ -652,16 +616,13 @@
preserving rev for resolve of rev
a: prompt recreating -> g
getting a
- updating: a 1/3 files (33.33%)
b: both created -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
@@ -690,16 +651,13 @@
preserving b for resolve of b
preserving rev for resolve of rev
a: prompt keep -> a
- updating: a 1/3 files (33.33%)
b: both created -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -730,14 +688,12 @@
preserving rev for resolve of rev
removing a
b: remote moved from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
@@ -767,14 +723,12 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: local copied/moved from a -> m
- updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m
- updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
@@ -810,15 +764,12 @@
preserving rev for resolve of rev
c: remote created -> g
getting c
- updating: c 1/3 files (33.33%)
b: local copied/moved from a -> m
- updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
premerge successful
rev: versions differ -> m
- updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
@@ -875,7 +826,7 @@
$ mkdir 7 8
$ echo m > 7/f
$ echo m > 8/f
- $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^updating:/,$d' 2> /dev/null
+ $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^ 0\/f: both created -> m/,$d' 2> /dev/null
searching for copies back to rev 1
unmatched files in local:
5/g
--- a/tests/test-setdiscovery.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-setdiscovery.t Sat May 09 23:40:40 2015 -0700
@@ -14,13 +14,13 @@
> hg -R a debugdiscovery b --verbose --old
> echo
> echo "% -- a -> b set"
- > hg -R a debugdiscovery b --verbose --debug
+ > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true
> echo
> echo "% -- b -> a tree"
- > hg -R b debugdiscovery a --verbose --old
+ > hg -R b debugdiscovery a --verbose --old --config
> echo
> echo "% -- b -> a set"
- > hg -R b debugdiscovery a --verbose --debug
+ > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true
> cd ..
> }
@@ -305,7 +305,7 @@
updating to branch b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg -R a debugdiscovery b --debug --verbose
+ $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true
comparing with b
query 1; heads
searching for changes
--- a/tests/test-subrepo-svn.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-subrepo-svn.t Sat May 09 23:40:40 2015 -0700
@@ -551,7 +551,7 @@
Test archive
- $ hg archive -S ../archive-all --debug
+ $ hg archive -S ../archive-all --debug --config progress.debug=true
archiving: 0/2 files (0.00%)
archiving: .hgsub 1/2 files (50.00%)
archiving: .hgsubstate 2/2 files (100.00%)
@@ -563,7 +563,7 @@
archiving (s): 1/2 files (50.00%)
archiving (s): 2/2 files (100.00%)
- $ hg archive -S ../archive-exclude --debug -X **old
+ $ hg archive -S ../archive-exclude --debug --config progress.debug=true -X **old
archiving: 0/2 files (0.00%)
archiving: .hgsub 1/2 files (50.00%)
archiving: .hgsubstate 2/2 files (100.00%)
--- a/tests/test-subrepo.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-subrepo.t Sat May 09 23:40:40 2015 -0700
@@ -260,7 +260,6 @@
branchmerge: True, force: False, partial: False
ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
.hgsubstate: versions differ -> m
- updating: .hgsubstate 1/1 files (100.00%)
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
getting subrepo t
@@ -269,7 +268,6 @@
ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a
t: remote is newer -> g
getting t
- updating: t 1/1 files (100.00%)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg debugsub
@@ -288,7 +286,6 @@
branchmerge: True, force: False, partial: False
ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
.hgsubstate: versions differ -> m
- updating: .hgsubstate 1/1 files (100.00%)
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
subrepo t: both sides changed
subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
@@ -300,7 +297,6 @@
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
preserving t for resolve of t
t: versions differ -> m
- updating: t 1/1 files (100.00%)
picked tool 'internal:merge' for t (binary False symlink False)
merging t
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
--- a/tests/test-up-local-change.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-up-local-change.t Sat May 09 23:40:40 2015 -0700
@@ -49,9 +49,7 @@
preserving a for resolve of a
b: remote created -> g
getting b
- updating: b 1/2 files (50.00%)
a: versions differ -> m
- updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
@@ -72,9 +70,7 @@
preserving a for resolve of a
b: other deleted -> r
removing b
- updating: b 1/2 files (50.00%)
a: versions differ -> m
- updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
@@ -103,9 +99,7 @@
preserving a for resolve of a
b: remote created -> g
getting b
- updating: b 1/2 files (50.00%)
a: versions differ -> m
- updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
--- a/tests/test-update-reverse.t Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-update-reverse.t Sat May 09 23:40:40 2015 -0700
@@ -72,10 +72,8 @@
removing side1
side2: other deleted -> r
removing side2
- updating: side2 2/3 files (66.67%)
main: remote created -> g
getting main
- updating: main 3/3 files (100.00%)
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ ls