Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 22390:e2806b8613ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changegroup: rename bundle-related functions and classes Functions like getbundle and classes like unbundle10 really manipulate changegroups and not bundles. A HG10 bundle is the same as a changegroup plus a small header, but this is no longer the case for a HG2X bundle, so it's better to separate the names a bit.
author Sune Foldager <cryo@cyanite.org>
date Tue, 02 Sep 2014 12:11:36 +0200
parents f58b41f6708b
children 6f63c47cbb86
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Aug 19 01:13:10 2014 +0200
+++ b/mercurial/commands.py	Tue Sep 02 12:11:36 2014 +0200
@@ -1159,8 +1159,8 @@
                                "a destination"))
         common = [repo.lookup(rev) for rev in base]
         heads = revs and map(repo.lookup, revs) or revs
-        cg = changegroup.getbundle(repo, 'bundle', heads=heads, common=common,
-                                   bundlecaps=bundlecaps)
+        cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
+                                         common=common, bundlecaps=bundlecaps)
         outgoing = None
     else:
         dest = ui.expandpath(dest or 'default-push', dest or 'default')
@@ -1172,7 +1172,8 @@
                                                 onlyheads=heads,
                                                 force=opts.get('force'),
                                                 portable=True)
-        cg = changegroup.getlocalbundle(repo, 'bundle', outgoing, bundlecaps)
+        cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
+                                             bundlecaps)
     if not cg:
         scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
         return 1