From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Mon, 6 Feb 2023 23:37:49 +0100
Subject: Handle 'remote:' output in test cases

---
 tests/test-branch-bookmark-suffix.t | 1 +
 tests/test-conflict-1.t             | 1 +
 tests/test-conflict-2.t             | 1 +
 tests/test-convergedmerge.t         | 1 +
 tests/test-empty-working-tree.t     | 1 +
 tests/test-extra.t                  | 2 ++
 tests/test-file-removal.t           | 1 +
 tests/test-git-tags.t               | 4 ++++
 tests/test-gitignore-share.t        | 1 +
 tests/test-hg-author.t              | 8 ++++++++
 tests/test-hg-branch.t              | 2 ++
 tests/test-hg-tags.t                | 1 +
 tests/test-invalid-refs.t           | 1 +
 tests/test-merge.t                  | 1 +
 tests/test-multiple-remotes.t       | 2 ++
 tests/test-octopus.t                | 1 +
 tests/test-orphan-tags.t            | 2 ++
 tests/test-phases-draft.t           | 1 +
 tests/test-phases-public.t          | 2 ++
 tests/test-pull-after-rebase.t      | 1 +
 tests/test-push-authors.t           | 1 +
 tests/test-push-detached.t          | 2 ++
 tests/test-push-missing-commit.t    | 1 +
 tests/test-push-phases.t            | 1 +
 tests/test-push-to-head.t           | 3 +++
 tests/test-push.t                   | 4 ++++
 tests/test-renames.t                | 1 +
 tests/test-subrepos-syntax.t        | 1 +
 tests/test-subrepos.t               | 2 ++
 tests/test-tree-decomposition.t     | 1 +
 30 files changed, 52 insertions(+)

diff --git a/tests/test-branch-bookmark-suffix.t b/tests/test-branch-bookmark-suffix.t
index 8a58770..f354bd0 100644
--- a/tests/test-branch-bookmark-suffix.t
+++ b/tests/test-branch-bookmark-suffix.t
@@ -47,6 +47,7 @@ Load commonly used test logic
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 2 commits with 2 trees and 2 blobs
   adding reference refs/heads/branch1
   adding reference refs/heads/branch2
diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t
index e878e6a..8e1df19 100644
--- a/tests/test-conflict-1.t
+++ b/tests/test-conflict-1.t
@@ -49,6 +49,7 @@ resolve using first parent
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 4 commits with 3 trees and 3 blobs
   adding reference refs/heads/master
   $ cd ..
diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t
index 4136169..dd3ac88 100644
--- a/tests/test-conflict-2.t
+++ b/tests/test-conflict-2.t
@@ -49,6 +49,7 @@ resolve using second parent
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 4 commits with 3 trees and 3 blobs
   adding reference refs/heads/master
   $ cd ..
diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t
index ba5f6aa..94eab2a 100644
--- a/tests/test-convergedmerge.t
+++ b/tests/test-convergedmerge.t
@@ -51,6 +51,7 @@ Load commonly used test logic
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 5 commits with 3 trees and 3 blobs
   adding reference refs/heads/master
   $ cd ..
diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t
index b642b0e..03219ba 100644
--- a/tests/test-empty-working-tree.t
+++ b/tests/test-empty-working-tree.t
@@ -27,6 +27,7 @@ Load commonly used test logic
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 0 blobs
   adding reference refs/heads/master
   $ cd ..
diff --git a/tests/test-extra.t b/tests/test-extra.t
index 0f0ac65..d186e10 100644
--- a/tests/test-extra.t
+++ b/tests/test-extra.t
@@ -58,6 +58,7 @@ Make sure legacy extra (in commit message, after '--HG--') doesn't break
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 3 commits with 3 trees and 0 blobs
   adding reference refs/heads/b1
 
@@ -98,6 +99,7 @@ Test some nutty filenames
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 3 commits with 3 trees and 0 blobs
   adding reference refs/heads/b2
   adding reference refs/heads/b3
diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t
index 3b8df95..fd73883 100644
--- a/tests/test-file-removal.t
+++ b/tests/test-file-removal.t
@@ -171,6 +171,7 @@ make sure that only beta is in the manifest
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 9 commits with 8 trees and 5 blobs
   adding reference refs/heads/master
 
diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t
index eac86fb..9596d98 100644
--- a/tests/test-git-tags.t
+++ b/tests/test-git-tags.t
@@ -133,6 +133,7 @@ Create a git tag from hg
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   adding reference refs/tags/alpha
@@ -170,6 +171,7 @@ Verify that amending commits known to remotes doesn't break anything
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -236,6 +238,7 @@ Create a git tag from hg, but pointing to a new commit:
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   adding reference refs/tags/gamma
@@ -272,6 +275,7 @@ Try to overwrite an annotated tag:
   warning: not overwriting annotated tag 'beta'
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   $ hg tags
diff --git a/tests/test-gitignore-share.t b/tests/test-gitignore-share.t
index 371a23e..fe166fe 100644
--- a/tests/test-gitignore-share.t
+++ b/tests/test-gitignore-share.t
@@ -22,6 +22,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   adding reference refs/heads/master
   $ cd ..
diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t
index 81dbcdd..17e9161 100644
--- a/tests/test-hg-author.t
+++ b/tests/test-hg-author.t
@@ -31,6 +31,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -40,6 +41,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -50,6 +52,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -60,6 +63,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -70,6 +74,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -80,6 +85,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -90,6 +96,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -100,6 +107,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t
index dc705c7..a14f2e2 100644
--- a/tests/test-hg-branch.t
+++ b/tests/test-hg-branch.t
@@ -28,6 +28,7 @@ Load commonly used test logic
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 0 blobs
   updating reference refs/heads/master
 
@@ -38,6 +39,7 @@ Load commonly used test logic
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 0 blobs
   updating reference refs/heads/master
 
diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t
index 43dc412..e68c54b 100644
--- a/tests/test-hg-tags.t
+++ b/tests/test-hg-tags.t
@@ -28,6 +28,7 @@ Load commonly used test logic
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   adding reference refs/tags/alpha
diff --git a/tests/test-invalid-refs.t b/tests/test-invalid-refs.t
index 2f33fd5..5a19463 100644
--- a/tests/test-invalid-refs.t
+++ b/tests/test-invalid-refs.t
@@ -35,6 +35,7 @@ Load commonly used test logic
   warning: not exporting bookmark 'epsil*on' due to invalid name
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 3 commits with 3 trees and 3 blobs
   adding reference refs/heads/delt#a
   updating reference refs/heads/master
diff --git a/tests/test-merge.t b/tests/test-merge.t
index 83bd5ce..a91db9e 100644
--- a/tests/test-merge.t
+++ b/tests/test-merge.t
@@ -44,6 +44,7 @@ clear the cache to be sure it is regenerated correctly
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 4 commits with 4 trees and 3 blobs
   adding reference refs/heads/beta
   adding reference refs/heads/master
diff --git a/tests/test-multiple-remotes.t b/tests/test-multiple-remotes.t
index 5abb2d5..40401f5 100644
--- a/tests/test-multiple-remotes.t
+++ b/tests/test-multiple-remotes.t
@@ -56,11 +56,13 @@ Load commonly used test logic
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
diff --git a/tests/test-octopus.t b/tests/test-octopus.t
index 3d22839..b9fdd9a 100644
--- a/tests/test-octopus.t
+++ b/tests/test-octopus.t
@@ -112,6 +112,7 @@ Load commonly used test logic
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 8 commits with 8 trees and 6 blobs
   adding reference refs/heads/branch1
   adding reference refs/heads/branch2
diff --git a/tests/test-orphan-tags.t b/tests/test-orphan-tags.t
index 36ac506..3fb2376 100644
--- a/tests/test-orphan-tags.t
+++ b/tests/test-orphan-tags.t
@@ -101,6 +101,8 @@ them (#358)
   list of commits:
   e12852326ef72772e9696b008ad6546b5266ff13
   adding objects
+  remote: counting objects: 5, done.
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 0 blobs
   unchanged reference default::refs/heads/master => GIT:996e5084
   adding reference default::refs/tags/the_tag => GIT:e4338156
diff --git a/tests/test-phases-draft.t b/tests/test-phases-draft.t
index 7c63e99..a79c651 100644
--- a/tests/test-phases-draft.t
+++ b/tests/test-phases-draft.t
@@ -56,6 +56,7 @@ pushing without hggit.usephases does not publish local changesets
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   $ hg phase -r master
diff --git a/tests/test-phases-public.t b/tests/test-phases-public.t
index 6dc31f8..8897349 100644
--- a/tests/test-phases-public.t
+++ b/tests/test-phases-public.t
@@ -151,6 +151,7 @@ actually pushed
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   adding reference refs/heads/not-pushed
   $ hg phase -r 'all() - master' > $TESTTMP/after
@@ -162,6 +163,7 @@ actually pushed
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
   $ hg phase -r 'all() - master' > $TESTTMP/after
diff --git a/tests/test-pull-after-rebase.t b/tests/test-pull-after-rebase.t
index e149c4d..ad503db 100644
--- a/tests/test-pull-after-rebase.t
+++ b/tests/test-pull-after-rebase.t
@@ -66,6 +66,7 @@ Clone it and rebase the branch
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/branch
   $ cd ..
diff --git a/tests/test-push-authors.t b/tests/test-push-authors.t
index ea5ac50..936c315 100644
--- a/tests/test-push-authors.t
+++ b/tests/test-push-authors.t
@@ -75,6 +75,7 @@ Push it!
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 6 commits with 6 trees and 1 blobs
   adding reference refs/heads/master
 
diff --git a/tests/test-push-detached.t b/tests/test-push-detached.t
index 2c82353..0840f05 100644
--- a/tests/test-push-detached.t
+++ b/tests/test-push-detached.t
@@ -63,6 +63,8 @@ symref, should publish it.
   searching for changes
   1 commits found
   adding objects
+  remote: counting objects: 5, done.
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference default::refs/heads/master => GIT:0f378ab6
   publishing remote HEAD
diff --git a/tests/test-push-missing-commit.t b/tests/test-push-missing-commit.t
index ae49721..110248c 100644
--- a/tests/test-push-missing-commit.t
+++ b/tests/test-push-missing-commit.t
@@ -59,6 +59,7 @@ try to follow the hint:
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
diff --git a/tests/test-push-phases.t b/tests/test-push-phases.t
index 1415eb1..75a97ba 100644
--- a/tests/test-push-phases.t
+++ b/tests/test-push-phases.t
@@ -29,6 +29,7 @@ Create two commits, one secret:
   warning: not exporting secret bookmark 'secret'
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   adding reference refs/heads/master
   $ cd ..
diff --git a/tests/test-push-to-head.t b/tests/test-push-to-head.t
index 117a413..aff2502 100644
--- a/tests/test-push-to-head.t
+++ b/tests/test-push-to-head.t
@@ -30,6 +30,7 @@ The output is confusing, and this even more-so:
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   remote: error: refusing to update checked out branch: refs/heads/master
   remote: error: By default, updating the current branch in a non-bare repository
   remote: is denied, because it will make the index and work tree inconsistent
@@ -51,6 +52,7 @@ The output is confusing, and this even more-so:
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   remote: error: refusing to update checked out branch: refs/heads/master
   remote: error: By default, updating the current branch in a non-bare repository
   remote: is denied, because it will make the index and work tree inconsistent
@@ -75,6 +77,7 @@ This is a bit more sensible:
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   remote: error: refusing to update checked out branch: refs/heads/master
   remote: error: By default, updating the current branch in a non-bare repository
   remote: is denied, because it will make the index and work tree inconsistent
diff --git a/tests/test-push.t b/tests/test-push.t
index f8568a2..e40d5df 100644
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -33,6 +33,7 @@ Load commonly used test logic
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   adding reference refs/heads/beta
 
@@ -110,6 +111,7 @@ this should also fail
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 1 blobs
   updating reference refs/heads/master
 
@@ -132,6 +134,7 @@ hg-git issue103 -- directories can lose information at hg-git export time
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 2 trees and 0 blobs
   updating reference refs/heads/master
 
@@ -142,6 +145,7 @@ hg-git issue103 -- directories can lose information at hg-git export time
   pushing to $TESTTMP/gitrepo
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 2 trees and 0 blobs
   updating reference refs/heads/master
   $ hg log -r master
diff --git a/tests/test-renames.t b/tests/test-renames.t
index fd1f3ec..bed0e9a 100644
--- a/tests/test-renames.t
+++ b/tests/test-renames.t
@@ -371,6 +371,7 @@ Make a new commit with a copy and a rename in Mercurial
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 2 commits with 2 trees and 3 blobs
   updating reference refs/heads/master
 
diff --git a/tests/test-subrepos-syntax.t b/tests/test-subrepos-syntax.t
index 19f997f..a01a0e6 100644
--- a/tests/test-subrepos-syntax.t
+++ b/tests/test-subrepos-syntax.t
@@ -60,6 +60,7 @@ comments and [subpaths] in .hgsub
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 0 blobs
   updating reference refs/heads/master
   $ cd ..
diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t
index c3e5ac5..e7e6c90 100644
--- a/tests/test-subrepos.t
+++ b/tests/test-subrepos.t
@@ -79,6 +79,7 @@ hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored
   pushing to $TESTTMP/repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 2 trees and 1 blobs
   updating reference refs/heads/master
   $ cd ..
@@ -158,6 +159,7 @@ pull shall bring .hgsub entry which was added to the git repo
   no changes made to subrepo hgsub since last push to $TESTTMP/hgsub
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 1 commits with 1 trees and 0 blobs
   updating reference refs/heads/master
   $ cd ..
diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t
index 6f7804f..aaf90fe 100644
--- a/tests/test-tree-decomposition.t
+++ b/tests/test-tree-decomposition.t
@@ -44,6 +44,7 @@ Load commonly used test logic
   pushing to ../repo.git
   searching for changes
   adding objects
+  remote: found 0 deltas to reuse
   added 3 commits with 6 trees and 3 blobs
   adding reference refs/heads/master
   $ cd ..