[PATCH] clonebundle: update hook arguments (BC)

Martin von Zweigbergk martinvonz at google.com
Tue Jun 20 23:28:58 UTC 2017


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1497935677 25200
#      Mon Jun 19 22:14:37 2017 -0700
# Node ID 8dd6087bc108e13f7da4e7f8419dd726cbb790ee
# Parent  6d79e9109908c2cb468c9eeaf8869aa1926fbea8
clonebundle: update hook arguments (BC)

By calling applybundle() with 'clonebundles' and the url instead of
calling processbundle(), the hooks will get different arguments:
HG_SOURCE will be 'clonebundles' instead of 'bundle2' and HG_URL will
be the url instead of 'bundle2'. This is consistent with the bundle1
behavior and seems like a bug fix, but I'm marking it BC anyway.

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1997,7 +1997,7 @@
             cg = readbundle(ui, fh, 'stream')
 
             if isinstance(cg, bundle2.unbundle20):
-                bundle2.processbundle(repo, cg, lambda: tr)
+                bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
             elif isinstance(cg, streamclone.streamcloneapplier):
                 cg.apply(repo)
             else:


More information about the Mercurial-devel mailing list