mercurial/unionrepo.py
author Denis Laxalde <denis.laxalde@logilab.fr>
Wed, 04 Oct 2017 15:27:43 +0200
changeset 34854 39b094e4ae2c
parent 34219 21fc747e1bc5
child 37497 1541e1a8e87d
permissions -rw-r--r--
revset: extract a parsefollowlinespattern helper function We'll need the same logic in forthcoming changeset to handle --line-range option in 'hg log' command. The function lives in scmutil.py (rather than util.py) as it uses match and pathutil modules.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     1
# unionrepo.py - repository class for viewing union of repository changesets
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     2
#
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     3
# Derived from bundlerepo.py
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     4
# Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com>
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     5
# Copyright 2013 Unity Technologies, Mads Kiilerich <madski@unity3d.com>
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     6
#
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     7
# This software may be used and distributed according to the terms of the
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     8
# GNU General Public License version 2 or any later version.
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     9
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    10
"""Repository class for "in-memory pull" of one local repository to another,
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    11
allowing operations like diff and log with revsets.
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    12
"""
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    13
25988
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    14
from __future__ import absolute_import
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    15
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    16
from .i18n import _
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    17
from .node import nullid
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    18
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    19
from . import (
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    20
    changelog,
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    21
    cmdutil,
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26230
diff changeset
    22
    error,
25988
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    23
    filelog,
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    24
    localrepo,
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    25
    manifest,
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    26
    mdiff,
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    27
    pathutil,
30519
20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd()
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30374
diff changeset
    28
    pycompat,
25988
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    29
    revlog,
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    30
    util,
31242
854f9188e354 vfs: use 'vfs' module directly in 'mercurial.unionrepo'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30743
diff changeset
    31
    vfs as vfsmod,
25988
83f220c7d6f0 unionrepo: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24835
diff changeset
    32
)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    33
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    34
class unionrevlog(revlog.revlog):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    35
    def __init__(self, opener, indexfile, revlog2, linkmapper):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    36
        # How it works:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    37
        # To retrieve a revision, we just need to know the node id so we can
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    38
        # look it up in revlog2.
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    39
        #
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    40
        # To differentiate a rev in the second revlog from a rev in the revlog,
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    41
        # we check revision against repotiprev.
31242
854f9188e354 vfs: use 'vfs' module directly in 'mercurial.unionrepo'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30743
diff changeset
    42
        opener = vfsmod.readonlyvfs(opener)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    43
        revlog.revlog.__init__(self, opener, indexfile)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    44
        self.revlog2 = revlog2
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    45
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    46
        n = len(self)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    47
        self.repotiprev = n - 1
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    48
        self.bundlerevs = set() # used by 'bundle()' revset expression
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    49
        for rev2 in self.revlog2:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    50
            rev = self.revlog2.index[rev2]
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    51
            # rev numbers - in revlog2, very different from self.rev
26230
6b16a3538c20 unionrepo: take delta base in account with building unified revlog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25988
diff changeset
    52
            _start, _csize, _rsize, base, linkrev, p1rev, p2rev, node = rev
27433
12f727a5b434 changegroup: add flags field to cg3 delta header
Mike Edgar <adgar@google.com>
parents: 26587
diff changeset
    53
            flags = _start & 0xFFFF
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    54
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    55
            if linkmapper is None: # link is to same revlog
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    56
                assert linkrev == rev2 # we never link back
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    57
                link = n
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    58
            else: # rev must be mapped from repo2 cl to unified cl by linkmapper
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    59
                link = linkmapper(linkrev)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    60
26230
6b16a3538c20 unionrepo: take delta base in account with building unified revlog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25988
diff changeset
    61
            if linkmapper is not None: # link is to same revlog
6b16a3538c20 unionrepo: take delta base in account with building unified revlog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25988
diff changeset
    62
                base = linkmapper(base)
6b16a3538c20 unionrepo: take delta base in account with building unified revlog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25988
diff changeset
    63
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    64
            if node in self.nodemap:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    65
                # this happens for the common revlog revisions
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    66
                self.bundlerevs.add(self.nodemap[node])
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    67
                continue
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    68
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    69
            p1node = self.revlog2.node(p1rev)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    70
            p2node = self.revlog2.node(p2rev)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    71
27433
12f727a5b434 changegroup: add flags field to cg3 delta header
Mike Edgar <adgar@google.com>
parents: 26587
diff changeset
    72
            e = (flags, None, None, base,
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    73
                 link, self.rev(p1node), self.rev(p2node), node)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    74
            self.index.insert(-1, e)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    75
            self.nodemap[node] = n
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    76
            self.bundlerevs.add(n)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    77
            n += 1
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    78
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    79
    def _chunk(self, rev):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    80
        if rev <= self.repotiprev:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    81
            return revlog.revlog._chunk(self, rev)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    82
        return self.revlog2._chunk(self.node(rev))
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    83
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    84
    def revdiff(self, rev1, rev2):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    85
        """return or calculate a delta between two revisions"""
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    86
        if rev1 > self.repotiprev and rev2 > self.repotiprev:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    87
            return self.revlog2.revdiff(
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    88
                self.revlog2.rev(self.node(rev1)),
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    89
                self.revlog2.rev(self.node(rev2)))
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    90
        elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
    91
            return self.baserevdiff(rev1, rev2)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    92
31724
f1e0446e804c unionrepo: avoid unnecessary node -> rev conversion
Jun Wu <quark@fb.com>
parents: 31242
diff changeset
    93
        return mdiff.textdiff(self.revision(rev1), self.revision(rev2))
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    94
30743
2df983125d37 revlog: add 'raw' argument to revision and _addrevision
Remi Chaintron <remi@fb.com>
parents: 30519
diff changeset
    95
    def revision(self, nodeorrev, raw=False):
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    96
        """return an uncompressed revision of a given node or revision
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    97
        number.
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    98
        """
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
    99
        if isinstance(nodeorrev, int):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   100
            rev = nodeorrev
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   101
            node = self.node(rev)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   102
        else:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   103
            node = nodeorrev
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   104
            rev = self.rev(node)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   105
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   106
        if node == nullid:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   107
            return ""
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   108
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   109
        if rev > self.repotiprev:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   110
            text = self.revlog2.revision(node)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   111
            self._cache = (node, rev, text)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   112
        else:
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   113
            text = self.baserevision(rev)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   114
            # already cached
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   115
        return text
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   116
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   117
    def baserevision(self, nodeorrev):
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   118
        # Revlog subclasses may override 'revision' method to modify format of
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   119
        # content retrieved from revlog. To use unionrevlog with such class one
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   120
        # needs to override 'baserevision' and make more specific call here.
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   121
        return revlog.revlog.revision(self, nodeorrev)
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   122
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   123
    def baserevdiff(self, rev1, rev2):
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   124
        # Exists for the same purpose as baserevision.
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   125
        return revlog.revlog.revdiff(self, rev1, rev2)
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   126
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   127
    def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   128
        raise NotImplementedError
34219
21fc747e1bc5 revlog: update signature of dummy addgroup() in bundlerepo and unionrepo
Yuya Nishihara <yuya@tcha.org>
parents: 33182
diff changeset
   129
    def addgroup(self, deltas, transaction, addrevisioncb=None):
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   130
        raise NotImplementedError
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   131
    def strip(self, rev, minlink):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   132
        raise NotImplementedError
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   133
    def checksize(self):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   134
        raise NotImplementedError
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   135
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   136
class unionchangelog(unionrevlog, changelog.changelog):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   137
    def __init__(self, opener, opener2):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   138
        changelog.changelog.__init__(self, opener)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   139
        linkmapper = None
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   140
        changelog2 = changelog.changelog(opener2)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   141
        unionrevlog.__init__(self, opener, self.indexfile, changelog2,
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   142
                             linkmapper)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   143
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   144
    def baserevision(self, nodeorrev):
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   145
        # Although changelog doesn't override 'revision' method, some extensions
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   146
        # may replace this class with another that does. Same story with
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   147
        # manifest and filelog classes.
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   148
        return changelog.changelog.revision(self, nodeorrev)
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   149
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   150
    def baserevdiff(self, rev1, rev2):
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   151
        return changelog.changelog.revdiff(self, rev1, rev2)
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   152
30374
f2d146d1e8d6 manifest: add unionmanifestlog support
Durham Goode <durham@fb.com>
parents: 30218
diff changeset
   153
class unionmanifest(unionrevlog, manifest.manifestrevlog):
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   154
    def __init__(self, opener, opener2, linkmapper):
30374
f2d146d1e8d6 manifest: add unionmanifestlog support
Durham Goode <durham@fb.com>
parents: 30218
diff changeset
   155
        manifest.manifestrevlog.__init__(self, opener)
f2d146d1e8d6 manifest: add unionmanifestlog support
Durham Goode <durham@fb.com>
parents: 30218
diff changeset
   156
        manifest2 = manifest.manifestrevlog(opener2)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   157
        unionrevlog.__init__(self, opener, self.indexfile, manifest2,
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   158
                             linkmapper)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   159
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   160
    def baserevision(self, nodeorrev):
30374
f2d146d1e8d6 manifest: add unionmanifestlog support
Durham Goode <durham@fb.com>
parents: 30218
diff changeset
   161
        return manifest.manifestrevlog.revision(self, nodeorrev)
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   162
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   163
    def baserevdiff(self, rev1, rev2):
30374
f2d146d1e8d6 manifest: add unionmanifestlog support
Durham Goode <durham@fb.com>
parents: 30218
diff changeset
   164
        return manifest.manifestrevlog.revdiff(self, rev1, rev2)
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   165
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   166
class unionfilelog(unionrevlog, filelog.filelog):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   167
    def __init__(self, opener, path, opener2, linkmapper, repo):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   168
        filelog.filelog.__init__(self, opener, path)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   169
        filelog2 = filelog.filelog(opener2, path)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   170
        unionrevlog.__init__(self, opener, self.indexfile, filelog2,
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   171
                             linkmapper)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   172
        self._repo = repo
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   173
19630
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   174
    def baserevision(self, nodeorrev):
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   175
        return filelog.filelog.revision(self, nodeorrev)
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   176
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   177
    def baserevdiff(self, rev1, rev2):
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   178
        return filelog.filelog.revdiff(self, rev1, rev2)
bb67f630b335 unionrevlog: extract 'baserevision' and 'baserevdiff' methods
Wojciech Lopata <lopek@fb.com>
parents: 18944
diff changeset
   179
24118
76f6ae06ddf5 revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents: 24003
diff changeset
   180
    def iscensored(self, rev):
76f6ae06ddf5 revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents: 24003
diff changeset
   181
        """Check if a revision is censored."""
76f6ae06ddf5 revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents: 24003
diff changeset
   182
        if rev <= self.repotiprev:
76f6ae06ddf5 revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents: 24003
diff changeset
   183
            return filelog.filelog.iscensored(self, rev)
27723
bf86e3e87123 unionrepo: fix wrong rev being checked in iscensored (issue5024)
Sean Farley <sean@farley.io>
parents: 26587
diff changeset
   184
        node = self.node(rev)
bf86e3e87123 unionrepo: fix wrong rev being checked in iscensored (issue5024)
Sean Farley <sean@farley.io>
parents: 26587
diff changeset
   185
        return self.revlog2.iscensored(self.revlog2.rev(node))
24118
76f6ae06ddf5 revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents: 24003
diff changeset
   186
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   187
class unionpeer(localrepo.localpeer):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   188
    def canpush(self):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   189
        return False
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   190
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   191
class unionrepository(localrepo.localrepository):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   192
    def __init__(self, ui, path, path2):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   193
        localrepo.localrepository.__init__(self, ui, path)
20790
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents: 19630
diff changeset
   194
        self.ui.setconfig('phases', 'publish', False, 'unionrepo')
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   195
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   196
        self._url = 'union:%s+%s' % (util.expandpath(path),
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   197
                                     util.expandpath(path2))
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   198
        self.repo2 = localrepo.localrepository(ui, path2)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   199
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   200
    @localrepo.unfilteredpropertycache
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   201
    def changelog(self):
23878
37a92908a382 localrepo: remove all external users of localrepo.sopener
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 20790
diff changeset
   202
        return unionchangelog(self.svfs, self.repo2.svfs)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   203
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   204
    def _clrev(self, rev2):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   205
        """map from repo2 changelog rev to temporary rev in self.changelog"""
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   206
        node = self.repo2.changelog.node(rev2)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   207
        return self.changelog.rev(node)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   208
30218
1767723f71cf manifest: move manifest creation to a helper function
Durham Goode <durham@fb.com>
parents: 28222
diff changeset
   209
    def _constructmanifest(self):
23878
37a92908a382 localrepo: remove all external users of localrepo.sopener
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 20790
diff changeset
   210
        return unionmanifest(self.svfs, self.repo2.svfs,
28222
b966e35aad78 unionrepo: properly handle hidden linkrev in revlog (issue5070)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27750
diff changeset
   211
                             self.unfiltered()._clrev)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   212
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   213
    def url(self):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   214
        return self._url
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   215
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   216
    def file(self, f):
23878
37a92908a382 localrepo: remove all external users of localrepo.sopener
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 20790
diff changeset
   217
        return unionfilelog(self.svfs, f, self.repo2.svfs,
28222
b966e35aad78 unionrepo: properly handle hidden linkrev in revlog (issue5070)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27750
diff changeset
   218
                            self.unfiltered()._clrev, self)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   219
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   220
    def close(self):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   221
        self.repo2.close()
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   222
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   223
    def cancopy(self):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   224
        return False
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   225
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   226
    def peer(self):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   227
        return unionpeer(self)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   228
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   229
    def getcwd(self):
30519
20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd()
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30374
diff changeset
   230
        return pycompat.getcwd() # always outside the repo
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   231
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   232
def instance(ui, path, create):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   233
    if create:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26230
diff changeset
   234
        raise error.Abort(_('cannot create new union repository'))
33182
634997248c97 configitems: register the 'bundle.mainreporoot' config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 31724
diff changeset
   235
    parentpath = ui.config("bundle", "mainreporoot")
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   236
    if not parentpath:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   237
        # try to find the correct path to the working directory repo
30519
20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd()
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30374
diff changeset
   238
        parentpath = cmdutil.findrepo(pycompat.getcwd())
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   239
        if parentpath is None:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   240
            parentpath = ''
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   241
    if parentpath:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   242
        # Try to make the full path relative so we get a nice, short URL.
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   243
        # In particular, we don't want temp dir names in test outputs.
30519
20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd()
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30374
diff changeset
   244
        cwd = pycompat.getcwd()
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   245
        if parentpath == cwd:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   246
            parentpath = ''
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   247
        else:
24835
e4f75c93f073 unionrepo: use pathutil.normasprefix to ensure os.sep at the end of cwd
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24118
diff changeset
   248
            cwd = pathutil.normasprefix(cwd)
18944
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   249
            if parentpath.startswith(cwd):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   250
                parentpath = parentpath[len(cwd):]
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   251
    if path.startswith('union:'):
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   252
        s = path.split(":", 1)[1].split("+", 1)
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   253
        if len(s) == 1:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   254
            repopath, repopath2 = parentpath, s[0]
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   255
        else:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   256
            repopath, repopath2 = s
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   257
    else:
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   258
        repopath, repopath2 = parentpath, path
a9c443b3b240 unionrepo: read-only operations on a union of two localrepos
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
   259
    return unionrepository(ui, repopath, repopath2)