mercurial/hg.py
changeset 18944 a9c443b3b240
parent 18553 b6b9475c563a
child 19313 3b96d6e44a4d
child 19332 0af993732f66
equal deleted inserted replaced
18943:27e8dfc2c338 18944:a9c443b3b240
     7 # GNU General Public License version 2 or any later version.
     7 # GNU General Public License version 2 or any later version.
     8 
     8 
     9 from i18n import _
     9 from i18n import _
    10 from lock import release
    10 from lock import release
    11 from node import hex, nullid
    11 from node import hex, nullid
    12 import localrepo, bundlerepo, httppeer, sshpeer, statichttprepo, bookmarks
    12 import localrepo, bundlerepo, unionrepo, httppeer, sshpeer, statichttprepo
    13 import lock, util, extensions, error, node, scmutil, phases, url
    13 import bookmarks, lock, util, extensions, error, node, scmutil, phases, url
    14 import cmdutil, discovery
    14 import cmdutil, discovery
    15 import merge as mergemod
    15 import merge as mergemod
    16 import verify as verifymod
    16 import verify as verifymod
    17 import errno, os, shutil
    17 import errno, os, shutil
    18 
    18 
    62         u.fragment = None
    62         u.fragment = None
    63     return str(u), (branch, branches or [])
    63     return str(u), (branch, branches or [])
    64 
    64 
    65 schemes = {
    65 schemes = {
    66     'bundle': bundlerepo,
    66     'bundle': bundlerepo,
       
    67     'union': unionrepo,
    67     'file': _local,
    68     'file': _local,
    68     'http': httppeer,
    69     'http': httppeer,
    69     'https': httppeer,
    70     'https': httppeer,
    70     'ssh': sshpeer,
    71     'ssh': sshpeer,
    71     'static-http': statichttprepo,
    72     'static-http': statichttprepo,