It was a little tricky in hg.clone(), since there was a local "revs"
variable defined there, but "rev" was never used after "revs", so I
just overwrote it.
Note that clonewithshare() should also have its "rev" argument renamed
to "revs", but I'll leave that to someone else.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/mq.py (2 lines) | |||
| M | mercurial/commands.py (2 lines) | |||
| M | mercurial/hg.py (19 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz |
| try: | try: | ||||
| qbase = sr.lookup('qbase') | qbase = sr.lookup('qbase') | ||||
| except error.RepoError: | except error.RepoError: | ||||
| pass | pass | ||||
| ui.note(_('cloning main repository\n')) | ui.note(_('cloning main repository\n')) | ||||
| sr, dr = hg.clone(ui, opts, sr.url(), dest, | sr, dr = hg.clone(ui, opts, sr.url(), dest, | ||||
| pull=opts.get('pull'), | pull=opts.get('pull'), | ||||
| rev=destrev, | revs=destrev, | ||||
| update=False, | update=False, | ||||
| stream=opts.get('uncompressed')) | stream=opts.get('uncompressed')) | ||||
| ui.note(_('cloning patch repository\n')) | ui.note(_('cloning patch repository\n')) | ||||
| hg.clone(ui, opts, opts.get('patches') or patchdir(sr), patchdir(dr), | hg.clone(ui, opts, opts.get('patches') or patchdir(sr), patchdir(dr), | ||||
| pull=opts.get('pull'), update=not opts.get('noupdate'), | pull=opts.get('pull'), update=not opts.get('noupdate'), | ||||
| stream=opts.get('uncompressed')) | stream=opts.get('uncompressed')) | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if opts.get('noupdate') and opts.get('updaterev'): | if opts.get('noupdate') and opts.get('updaterev'): | ||||
| raise error.Abort(_("cannot specify both --noupdate and --updaterev")) | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) | ||||
| r = hg.clone(ui, opts, source, dest, | r = hg.clone(ui, opts, source, dest, | ||||
| pull=opts.get('pull'), | pull=opts.get('pull'), | ||||
| stream=opts.get('stream') or opts.get('uncompressed'), | stream=opts.get('stream') or opts.get('uncompressed'), | ||||
| rev=opts.get('rev'), | revs=opts.get('rev'), | ||||
| update=opts.get('updaterev') or not opts.get('noupdate'), | update=opts.get('updaterev') or not opts.get('noupdate'), | ||||
| branch=opts.get('branch'), | branch=opts.get('branch'), | ||||
| shareopts=opts.get('shareopts')) | shareopts=opts.get('shareopts')) | ||||
| return r is None | return r is None | ||||
| @command('^commit|ci', | @command('^commit|ci', | ||||
| [('A', 'addremove', None, | [('A', 'addremove', None, | ||||
| ui.status(_('(sharing from existing pooled repository %s)\n') % | ui.status(_('(sharing from existing pooled repository %s)\n') % | ||||
| basename) | basename) | ||||
| else: | else: | ||||
| ui.status(_('(sharing from new pooled repository %s)\n') % basename) | ui.status(_('(sharing from new pooled repository %s)\n') % basename) | ||||
| # Always use pull mode because hardlinks in share mode don't work | # Always use pull mode because hardlinks in share mode don't work | ||||
| # well. Never update because working copies aren't necessary in | # well. Never update because working copies aren't necessary in | ||||
| # share mode. | # share mode. | ||||
| clone(ui, peeropts, source, dest=sharepath, pull=True, | clone(ui, peeropts, source, dest=sharepath, pull=True, | ||||
| rev=rev, update=False, stream=stream) | revs=rev, update=False, stream=stream) | ||||
| # Resolve the value to put in [paths] section for the source. | # Resolve the value to put in [paths] section for the source. | ||||
| if islocal(source): | if islocal(source): | ||||
| defaultpath = os.path.abspath(util.urllocalpath(source)) | defaultpath = os.path.abspath(util.urllocalpath(source)) | ||||
| else: | else: | ||||
| defaultpath = source | defaultpath = source | ||||
| sharerepo = repository(ui, path=sharepath) | sharerepo = repository(ui, path=sharepath) | ||||
| """copy a cache from srcrepo to destcachedir (if it exists)""" | """copy a cache from srcrepo to destcachedir (if it exists)""" | ||||
| srcbranchcache = srcrepo.vfs.join('cache/%s' % fname) | srcbranchcache = srcrepo.vfs.join('cache/%s' % fname) | ||||
| dstbranchcache = os.path.join(dstcachedir, fname) | dstbranchcache = os.path.join(dstcachedir, fname) | ||||
| if os.path.exists(srcbranchcache): | if os.path.exists(srcbranchcache): | ||||
| if not os.path.exists(dstcachedir): | if not os.path.exists(dstcachedir): | ||||
| os.mkdir(dstcachedir) | os.mkdir(dstcachedir) | ||||
| util.copyfile(srcbranchcache, dstbranchcache) | util.copyfile(srcbranchcache, dstbranchcache) | ||||
| def clone(ui, peeropts, source, dest=None, pull=False, rev=None, | def clone(ui, peeropts, source, dest=None, pull=False, revs=None, | ||||
| update=True, stream=False, branch=None, shareopts=None): | update=True, stream=False, branch=None, shareopts=None): | ||||
| """Make a copy of an existing repository. | """Make a copy of an existing repository. | ||||
| Create a copy of an existing repository in a new directory. The | Create a copy of an existing repository in a new directory. The | ||||
| source and destination are URLs, as passed to the repository | source and destination are URLs, as passed to the repository | ||||
| function. Returns a pair of repository peers, the source and | function. Returns a pair of repository peers, the source and | ||||
| newly created destination. | newly created destination. | ||||
| name of source repository) | name of source repository) | ||||
| pull: always pull from source repository, even in local case or if the | pull: always pull from source repository, even in local case or if the | ||||
| server prefers streaming | server prefers streaming | ||||
| stream: stream raw data uncompressed from repository (fast over | stream: stream raw data uncompressed from repository (fast over | ||||
| LAN, slow over WAN) | LAN, slow over WAN) | ||||
| rev: revision to clone up to (implies pull=True) | revs: revision to clone up to (implies pull=True) | ||||
| update: update working directory after clone completes, if | update: update working directory after clone completes, if | ||||
| destination is local repository (True means update to default rev, | destination is local repository (True means update to default rev, | ||||
| anything else is treated as a revision) | anything else is treated as a revision) | ||||
| branch: branches to clone | branch: branches to clone | ||||
| shareopts: dict of options to control auto sharing behavior. The "pool" key | shareopts: dict of options to control auto sharing behavior. The "pool" key | ||||
| activates auto sharing mode and defines the directory for stores. The | activates auto sharing mode and defines the directory for stores. The | ||||
| "mode" key determines how to construct the directory name of the shared | "mode" key determines how to construct the directory name of the shared | ||||
| repository. "identity" means the name is derived from the node of the first | repository. "identity" means the name is derived from the node of the first | ||||
| changeset in the repository. "remote" means the name is derived from the | changeset in the repository. "remote" means the name is derived from the | ||||
| remote's path/URL. Defaults to "identity." | remote's path/URL. Defaults to "identity." | ||||
| """ | """ | ||||
| if isinstance(source, bytes): | if isinstance(source, bytes): | ||||
| origsource = ui.expandpath(source) | origsource = ui.expandpath(source) | ||||
| source, branches = parseurl(origsource, branch) | source, branches = parseurl(origsource, branch) | ||||
| srcpeer = peer(ui, peeropts, source) | srcpeer = peer(ui, peeropts, source) | ||||
| else: | else: | ||||
| srcpeer = source.peer() # in case we were called with a localrepo | srcpeer = source.peer() # in case we were called with a localrepo | ||||
| branches = (None, branch or []) | branches = (None, branch or []) | ||||
| origsource = source = srcpeer.url() | origsource = source = srcpeer.url() | ||||
| rev, checkout = addbranchrevs(srcpeer, srcpeer, branches, rev) | revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs) | ||||
| if dest is None: | if dest is None: | ||||
| dest = defaultdest(source) | dest = defaultdest(source) | ||||
| if dest: | if dest: | ||||
| ui.status(_("destination directory: %s\n") % dest) | ui.status(_("destination directory: %s\n") % dest) | ||||
| else: | else: | ||||
| dest = ui.expandpath(dest) | dest = ui.expandpath(dest) | ||||
| sharepath = os.path.join( | sharepath = os.path.join( | ||||
| sharepool, node.hex(hashlib.sha1(source).digest())) | sharepool, node.hex(hashlib.sha1(source).digest())) | ||||
| else: | else: | ||||
| raise error.Abort(_('unknown share naming mode: %s') % | raise error.Abort(_('unknown share naming mode: %s') % | ||||
| sharenamemode) | sharenamemode) | ||||
| if sharepath: | if sharepath: | ||||
| return clonewithshare(ui, peeropts, sharepath, source, srcpeer, | return clonewithshare(ui, peeropts, sharepath, source, srcpeer, | ||||
| dest, pull=pull, rev=rev, update=update, | dest, pull=pull, rev=revs, update=update, | ||||
| stream=stream) | stream=stream) | ||||
| srclock = destlock = cleandir = None | srclock = destlock = cleandir = None | ||||
| srcrepo = srcpeer.local() | srcrepo = srcpeer.local() | ||||
| try: | try: | ||||
| abspath = origsource | abspath = origsource | ||||
| if islocal(origsource): | if islocal(origsource): | ||||
| abspath = os.path.abspath(util.urllocalpath(origsource)) | abspath = os.path.abspath(util.urllocalpath(origsource)) | ||||
| if islocal(dest): | if islocal(dest): | ||||
| cleandir = dest | cleandir = dest | ||||
| copy = False | copy = False | ||||
| if (srcrepo and srcrepo.cancopy() and islocal(dest) | if (srcrepo and srcrepo.cancopy() and islocal(dest) | ||||
| and not phases.hassecret(srcrepo)): | and not phases.hassecret(srcrepo)): | ||||
| copy = not pull and not rev | copy = not pull and not revs | ||||
| if copy: | if copy: | ||||
| try: | try: | ||||
| # we use a lock here because if we race with commit, we | # we use a lock here because if we race with commit, we | ||||
| # can end up with extra data in the cloned revlogs that's | # can end up with extra data in the cloned revlogs that's | ||||
| # not pointed to by changesets, thus causing verify to | # not pointed to by changesets, thus causing verify to | ||||
| # fail | # fail | ||||
| srclock = srcrepo.lock(wait=False) | srclock = srcrepo.lock(wait=False) | ||||
| # only pass ui when no srcrepo | # only pass ui when no srcrepo | ||||
| except OSError as inst: | except OSError as inst: | ||||
| if inst.errno == errno.EEXIST: | if inst.errno == errno.EEXIST: | ||||
| cleandir = None | cleandir = None | ||||
| raise error.Abort(_("destination '%s' already exists") | raise error.Abort(_("destination '%s' already exists") | ||||
| % dest) | % dest) | ||||
| raise | raise | ||||
| revs = None | if revs: | ||||
| if rev: | |||||
| if not srcpeer.capable('lookup'): | if not srcpeer.capable('lookup'): | ||||
| raise error.Abort(_("src repository does not support " | raise error.Abort(_("src repository does not support " | ||||
| "revision lookup and so doesn't " | "revision lookup and so doesn't " | ||||
| "support clone by revision")) | "support clone by revision")) | ||||
| revs = [srcpeer.lookup(r) for r in rev] | revs = [srcpeer.lookup(r) for r in revs] | ||||
| checkout = revs[0] | checkout = revs[0] | ||||
| else: | |||||
| revs = None | |||||
| local = destpeer.local() | local = destpeer.local() | ||||
| if local: | if local: | ||||
| u = util.url(abspath) | u = util.url(abspath) | ||||
| defaulturl = bytes(u) | defaulturl = bytes(u) | ||||
| local.ui.setconfig('paths', 'default', defaulturl, 'clone') | local.ui.setconfig('paths', 'default', defaulturl, 'clone') | ||||
| if not stream: | if not stream: | ||||
| if pull: | if pull: | ||||
| stream = False | stream = False | ||||