[PATCH 1 of 4 main-line-of-work] progress: get the extremely verbose output out of default debug
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Sat May 16 01:45:34 UTC 2015
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1431240040 25200
# Sat May 09 23:40:40 2015 -0700
# Node ID 586e9b4b542a3bbaef92a6f93c4da89f91fc6933
# Parent 2f34746c27dfd9d4ff51c1f0081526438ded0c04
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.
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -900,11 +900,11 @@ class ui(object):
All topics should be marked closed by setting pos to None at
termination.
'''
- if pos is None or not self.debugflag:
+ if pos is None or not self.configbool('progress', 'debug'):
return
if unit:
unit = ' ' + unit
if item:
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -89,37 +89,19 @@ Extension disabled for lack of a hook
3 changesets found
list of changesets:
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"
try to push obsolete markers to remote
repository tip rolled back to revision 0 (undo push)
@@ -149,37 +131,19 @@ Extension disabled for lack of acl.sourc
3 changesets found
list of changesets:
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
updating the branch cache
listing keys for "phases"
@@ -212,37 +176,19 @@ No [acl.allow]/[acl.deny]
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -285,37 +231,19 @@ Empty [acl.allow]
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -355,37 +283,19 @@ fred is allowed inside foo/
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -430,37 +340,19 @@ Empty [acl.deny]
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -502,37 +394,19 @@ fred is allowed inside foo/, but not foo
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -579,37 +453,19 @@ fred is allowed inside foo/, but not foo
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -653,37 +509,19 @@ fred is allowed inside foo/, but not foo
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -729,37 +567,19 @@ barney is allowed everywhere
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -809,37 +629,19 @@ wilma can change files with a .txt exten
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -892,37 +694,19 @@ file specified by acl.config does not ex
3 changesets found
list of changesets:
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"
error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config'
transaction abort!
@@ -970,37 +754,19 @@ betty is allowed inside foo/ by a acl.co
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1059,37 +825,19 @@ acl.config can set only [acl.allow]/[acl
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1142,37 +890,19 @@ fred is always allowed
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1221,37 +951,19 @@ no one is allowed inside foo/Bar/
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1302,37 +1014,19 @@ OS-level groups
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1382,37 +1076,19 @@ OS-level groups
3 changesets found
list of changesets:
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1502,45 +1178,21 @@ No branch acls specified
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
@@ -1588,45 +1240,21 @@ Branch acl deny test
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user astro
@@ -1672,45 +1300,21 @@ Branch acl empty allow test
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches enabled, 0 entries for user astro
acl: acl.deny.branches not enabled
@@ -1752,45 +1356,21 @@ Branch acl allow other
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches enabled, 0 entries for user astro
acl: acl.deny.branches not enabled
@@ -1826,45 +1406,21 @@ Branch acl allow other
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches enabled, 1 entries for user george
acl: acl.deny.branches not enabled
@@ -1917,45 +1473,21 @@ push foobar into the remote
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches enabled, 1 entries for user george
acl: acl.deny.branches not enabled
@@ -2007,45 +1539,21 @@ Branch acl conflicting deny
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user george
@@ -2086,45 +1594,21 @@ User 'astro' must not be denied
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 0 entries for user astro
@@ -2170,45 +1654,21 @@ Non-astro users must be denied
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
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"
acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user george
diff --git a/tests/test-archive.t b/tests/test-archive.t
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -143,11 +143,11 @@ test that we reject unsafe patterns
test/.hgsubstate
test/bar
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%)
archiving: bar 3/4 files (75.00%)
archiving: foo 4/4 files (100.00%)
diff --git a/tests/test-bundle.t b/tests/test-bundle.t
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -627,11 +627,11 @@ bundle single branch
1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
057f4db07f61970e1c11e83be79e9d08adc4dc31
== 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
2 changesets found
list of changesets:
diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t
--- a/tests/test-bundle2-format.t
+++ b/tests/test-bundle2-format.t
@@ -334,11 +334,11 @@ Test unknown mandatory option
Test debug output
---------------------------------------------------
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
end of bundle
@@ -347,11 +347,11 @@ file content is ok
$ cat ../out.hg2
HG20\x00\x00\x00)e%7C%21%207/=babar%25%23%3D%3Dtutu simple\x00\x00\x00\x00 (no-eol) (esc)
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/'
ignoring unknown parameter 'simple'
options count: 2
@@ -381,11 +381,11 @@ bad parameter name
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
bundle part: "test:empty"
bundle part: "test:empty"
@@ -434,11 +434,11 @@ Test part
mandatory: 0
advisory: 0
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
start extraction of bundle2 parts
part header size: 17
@@ -513,11 +513,11 @@ Test part
Test actual unbundling of test part
=======================================
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
part header size: 17
part type: "test:empty"
@@ -702,11 +702,11 @@ Support for changegroup
o 1:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits at gmail.com> A
@ 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
9520eea781bcca16c1e15acc0ba14335a0e8e5ba
eea13746799a9e0bfd88f29d3c2e9dc9389f524f
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -62,11 +62,11 @@ Invalid dest '' must abort:
[255]
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
linking: 4
linking: 5
diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
--- a/tests/test-convert-filemap.t
+++ b/tests/test-convert-filemap.t
@@ -436,11 +436,11 @@ Test rebuilding of map with unknown revi
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ 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...
scanning: 1 revisions
sorting...
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -33,17 +33,15 @@
ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
preserving a for resolve of b
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 at add3f11052fa+ other b at 17c05bb7fcb6 ancestor a at 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 at add3f11052fa+ other c at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
premerge successful
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-double-merge.t b/tests/test-double-merge.t
--- a/tests/test-double-merge.t
+++ b/tests/test-double-merge.t
@@ -36,17 +36,15 @@ we get conflicts that shouldn't be there
branchmerge: True, force: False, partial: False
ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
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 at 6a0df1dad128+ other bar at 484bf6903104 ancestor foo at 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 at 6a0df1dad128+ other foo at 484bf6903104 ancestor foo at e6dc8efe11cc
premerge successful
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -152,11 +152,10 @@ Graft out of order, skipping a merge and
resolving manifests
branchmerge: True, force: True, partial: False
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 at ef0ef43d49e7+ other a at 5d205f8b35b6 ancestor a at 68795b066622
premerge successful
committing files:
@@ -168,11 +167,10 @@ Graft out of order, skipping a merge and
resolving manifests
branchmerge: True, force: True, partial: False
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
committing manifest
committing changelog
@@ -182,14 +180,12 @@ Graft out of order, skipping a merge and
branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
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 at 1905859650ec+ other e at 9c233e8e184d ancestor e at 68795b066622
warning: conflicts during merge.
merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -55,11 +55,11 @@ Prepare repo r1:
1 r1/.hg/store/undo.phaseroots
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
linking: 4
linking: 5
diff --git a/tests/test-issue1802.t b/tests/test-issue1802.t
--- a/tests/test-issue1802.t
+++ b/tests/test-issue1802.t
@@ -56,11 +56,10 @@ Simulate a Windows merge:
b
resolving manifests
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)
Simulate a Windows commit:
diff --git a/tests/test-issue522.t b/tests/test-issue522.t
--- a/tests/test-issue522.t
+++ b/tests/test-issue522.t
@@ -31,11 +31,10 @@ revision.
resolving manifests
branchmerge: True, force: False, partial: False
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)
$ hg debugstate | grep foo
m 0 -2 unset foo
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -34,14 +34,12 @@ http://mercurial.selenic.com/bts/issue67
resolving manifests
branchmerge: True, force: False, partial: False
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)
$ hg ci -m merge1 # 3
@@ -66,11 +64,10 @@ http://mercurial.selenic.com/bts/issue67
resolving manifests
branchmerge: True, force: False, partial: False
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 at e327dca35ac8+ other 1 at 746e9549ea96 ancestor 1 at 81f4b099af3d
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -90,11 +87,10 @@ http://mercurial.selenic.com/bts/issue67
branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
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 at 746e9549ea96+ other 1a at e327dca35ac8 ancestor 1 at 81f4b099af3d
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-largefiles-misc.t b/tests/test-largefiles-misc.t
--- a/tests/test-largefiles-misc.t
+++ b/tests/test-largefiles-misc.t
@@ -654,11 +654,11 @@ check messages when there are files to u
b1
b2
$ 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
all remote heads known locally
1:1acbe71ce432
@@ -708,11 +708,11 @@ check messages when there are files to u
$ hg -R clone2 cat -r 3 clone2/.hglf/b
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
all remote heads known locally
1:1acbe71ce432
@@ -759,11 +759,11 @@ and #5 refer it.
4:233f12ada4ae
5:036794ea641c
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
all remote heads known locally
2:6095d0695d70
diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t
--- a/tests/test-largefiles-wireproto.t
+++ b/tests/test-largefiles-wireproto.t
@@ -262,11 +262,11 @@ largefiles pulled on update - a largefil
verified contents of 1 revisions of 1 largefiles
$ hg -R http-clone up -Cqr null
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
.hglf/f1: remote created -> g
getting .hglf/f1
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -71,11 +71,10 @@ This should use bar at rev2 as the ancestor
resolving manifests
branchmerge: True, force: False, partial: False
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 at 2263c1be0967+ other bar at 0555950ead28 ancestor bar at 0f2ff26688b9
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -158,11 +157,10 @@ This should use bar at rev2 as the ancestor
resolving manifests
branchmerge: True, force: False, partial: False
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 at 2263c1be0967+ other bar at 3ffa6b9e35f0 ancestor bar at 0f2ff26688b9
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t
+++ b/tests/test-merge-criss-cross.t
@@ -80,13 +80,11 @@ Criss cross merging
branchmerge: True, force: False, partial: False
ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
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 at 3b08d01b0ab5+ other f2 at adfe50279922 ancestor f2 at 40494bf2444c
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -149,11 +147,10 @@ Redo merge with merge.preferancestor="*"
f2: picking 'keep' action
end of auction
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)
$ head *
@@ -192,11 +189,10 @@ The other way around:
f2: picking 'get' action
end of auction
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)
$ head *
@@ -257,11 +253,10 @@ Verify how the output looks and and how
f2: picking 'keep' action
end of auction
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)
$ cd ..
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -34,11 +34,10 @@ Symlink is local parent, executable is o
resolving manifests
branchmerge: True, force: False, partial: False
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 at 521a1e40188f+ other a at 3574f3e69b1c ancestor a at c334dc3be0da
warning: internal :merge cannot merge symlinks for a
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -68,11 +67,10 @@ Symlink is other parent, executable is l
resolving manifests
branchmerge: True, force: False, partial: False
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 at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
warning: internal :merge cannot merge symlinks for a
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -102,11 +100,10 @@ Update to link with local change should
resolving manifests
branchmerge: False, force: False, partial: False
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
keep (l)ocal or take (o)ther? l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -84,11 +84,10 @@ pull and merge from test-a again
resolving manifests
branchmerge: True, force: False, partial: False
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 at 50c3a7e29886+ other test.txt at 40d11a4173a8 ancestor test.txt at 96b70246a118
warning: conflicts during merge.
merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -38,11 +38,10 @@ Specifying a revset that evaluates to nu
$ hg push --debug ../a
pushing to ../a
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"
checking for updated bookmarks
listing keys for "bookmarks"
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -221,39 +221,34 @@ Check that the right ancestors is used w
ignoring null merge rebase of 3
ignoring null merge rebase of 4
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
resolving manifests
branchmerge: False, force: True, partial: False
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
resolving manifests
branchmerge: True, force: True, partial: False
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
merge against 10:2f2496ddf49d
detach base 9:e31216eec445
@@ -261,11 +256,10 @@ Check that the right ancestors is used w
resolving manifests
branchmerge: True, force: True, partial: False
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
committing changelog
rebased as 2a7f09cac94c
@@ -274,54 +268,31 @@ Check that the right ancestors is used w
resolving manifests
branchmerge: False, force: False, partial: False
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
updating the branch cache
truncating cache/rbc-revs-v1 to 72
diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -68,11 +68,11 @@ clone and pull to break links
$ $PYTHON -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')"
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%)
collecting: 00manifest.i 2/3 files (66.67%)
collecting: a.i 3/3 files (100.00%)
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -41,18 +41,15 @@
ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740
a/a: other deleted -> r
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)
$ echo a/* b/*
@@ -87,11 +84,10 @@
pending file src: 'a/c' -> dst: 'b/c'
resolving manifests
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)
$ echo a/* b/*
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -38,13 +38,11 @@
ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
preserving a for resolve of b
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 at 044f8520aeeb+ other b at 85c198ef2f6c ancestor a at af1939970a1c
premerge successful
note: possible conflict - a2 was renamed multiple times to:
@@ -179,11 +177,10 @@ Check for issue3074
resolving manifests
branchmerge: True, force: False, partial: False
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
(branch merge, don't forget to commit)
$ hg status
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -88,17 +88,15 @@ args:
ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
preserving a for resolve of b
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 at e300d1c794ec+ other b at 4ce40f5aca24 ancestor a at 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 at e300d1c794ec+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -126,19 +124,16 @@ args:
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
preserving b for resolve of b
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 at 86a2aa42fc76+ other a at f4db7e329e71 ancestor a at 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 at 86a2aa42fc76+ other rev at f4db7e329e71 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * (glob)
merge tool returned: 0
@@ -166,17 +161,15 @@ args:
ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
preserving a for resolve of b
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 at e300d1c794ec+ other b at bdb19105162a ancestor a at 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 at e300d1c794ec+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -202,17 +195,15 @@ args:
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
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 at 02963e448370+ other a at f4db7e329e71 ancestor a at 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 at 02963e448370+ other rev at f4db7e329e71 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -238,13 +229,11 @@ args:
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
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 at 94b33a1b7f2d+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -269,11 +258,10 @@ args:
resolving manifests
branchmerge: True, force: False, partial: False
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 at 86a2aa42fc76+ other rev at 97c705ade336 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -299,16 +287,13 @@ args:
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
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 at 94b33a1b7f2d+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -332,11 +317,10 @@ args:
resolving manifests
branchmerge: True, force: False, partial: False
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 at 02963e448370+ other rev at 97c705ade336 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -358,18 +342,16 @@ args:
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
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 at 62e7bf090eba+ other b at 49b6d8032493 ancestor a at 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 at 62e7bf090eba+ other rev at 49b6d8032493 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -400,13 +382,11 @@ m "um a c" "um x c" " " "10 do merg
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
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 at 02963e448370+ other rev at fe905ef2c33e ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -432,18 +412,16 @@ m "um a c" "um x c" " " "10 do merg
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
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 at 86a2aa42fc76+ other b at af30c7647fc7 ancestor b at 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 at 86a2aa42fc76+ other rev at af30c7647fc7 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -467,20 +445,17 @@ m "um a c" "um x c" " " "10 do merg
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
preserving b for resolve of b
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 at 59318016310c+ other b at bdb19105162a ancestor b at 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 at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -503,20 +478,17 @@ m "um a c" "um x c" " " "10 do merg
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
preserving b for resolve of b
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 at 86a2aa42fc76+ other b at 8dbce441892a ancestor b at 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 at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -540,20 +512,17 @@ m "um a c" "um x c" " " "10 do merg
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
preserving b for resolve of b
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 at 59318016310c+ other b at bdb19105162a ancestor b at 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 at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -576,20 +545,17 @@ m "um a c" "um x c" " " "10 do merg
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
preserving b for resolve of b
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 at 86a2aa42fc76+ other b at 8dbce441892a ancestor b at 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 at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -613,18 +579,16 @@ m "um a c" "um x c" " " "10 do merg
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
preserving b for resolve of b
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 at 0b76e65c8289+ other b at 4ce40f5aca24 ancestor b at 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 at 0b76e65c8289+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -650,20 +614,17 @@ m "um a c" "um x c" " " "10 do merg
use (c)hanged version or leave (d)eleted? c
preserving b for resolve of b
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 at 02963e448370+ other b at 8dbce441892a ancestor b at 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 at 02963e448370+ other rev at 8dbce441892a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -688,20 +649,17 @@ m "um a c" "um x c" " " "10 do merg
local changed a which remote deleted
use (c)hanged version or (d)elete? c
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 at 0b76e65c8289+ other b at bdb19105162a ancestor b at 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 at 0b76e65c8289+ other rev at bdb19105162a ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -728,18 +686,16 @@ m "um a c" "um x c" " " "10 do merg
ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
preserving a for resolve of b
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 at e300d1c794ec+ other b at 49b6d8032493 ancestor a at 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 at e300d1c794ec+ other rev at 49b6d8032493 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -765,18 +721,16 @@ m "um a c" "um x c" " " "10 do merg
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
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 at 62e7bf090eba+ other a at f4db7e329e71 ancestor a at 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 at 62e7bf090eba+ other rev at f4db7e329e71 ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -808,19 +762,16 @@ m "nm a b" "um x a" " " "22 get a,
ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
preserving b for resolve of b
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 at 02963e448370+ other a at 2b958612230f ancestor a at 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 at 02963e448370+ other rev at 2b958612230f ancestor rev at 924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -873,11 +824,11 @@ 8 f (f) f f "remote differs from
$ hg ci -Aqm "m2"
$ hg up -qr1
$ 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
6/g
unmatched files in other:
diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t
+++ b/tests/test-setdiscovery.t
@@ -12,17 +12,17 @@ Function to test discovery between two r
> echo
> echo "% -- a -> b tree"
> 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 ..
> }
Small superset:
@@ -303,11 +303,11 @@ One with >200 heads, which used to use u
adding file changes
added 304 changesets with 0 changes to 0 files
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
taking quick initial sample
searching: 2 queries
diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -546,11 +546,11 @@ First, create that condition in the repo
(leaving bookmark other)
$ test -f recreated/somethingold
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%)
archiving (obstruct): 0/1 files (0.00%)
archiving (obstruct): 1/1 files (100.00%)
@@ -558,11 +558,11 @@ Test archive
archiving (recreated): 1/1 files (100.00%)
archiving (s): 0/2 files (0.00%)
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%)
archiving (obstruct): 0/1 files (0.00%)
archiving (obstruct): 1/1 files (100.00%)
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -253,20 +253,18 @@ merge tests
searching for copies back to rev 2
resolving manifests
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
resolving manifests
branchmerge: False, force: False, partial: False
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
path s
source s
@@ -281,11 +279,10 @@ merge tests
searching for copies back to rev 2
resolving manifests
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)
(M)erge, keep (l)ocal or keep (r)emote? m
merging subrepo t
@@ -293,11 +290,10 @@ merge tests
resolving manifests
branchmerge: True, force: False, partial: False
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 at 20a0db6fbf6c+ other t at 7af322bc1198 ancestor t at 6747d179aa9a
warning: conflicts during merge.
merging t incomplete! (edit conflicts, then use 'hg resolve --mark')
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -47,13 +47,11 @@
branchmerge: False, force: False, partial: False
ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
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 at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * (glob)
merge tool returned: 0
@@ -70,13 +68,11 @@
branchmerge: False, force: False, partial: False
ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
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 at 1e71731e6fbb+ other a at c19d34741b0a ancestor a at 1e71731e6fbb
launching merge tool: true *$TESTTMP/r2/a* * (glob)
merge tool returned: 0
@@ -101,13 +97,11 @@
branchmerge: False, force: False, partial: False
ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
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 at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * (glob)
merge tool returned: 0
diff --git a/tests/test-update-reverse.t b/tests/test-update-reverse.t
--- a/tests/test-update-reverse.t
+++ b/tests/test-update-reverse.t
@@ -70,14 +70,12 @@
ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
side1: other deleted -> r
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
a
main
More information about the Mercurial-devel
mailing list