mercurial/hg.py
author Bryan O'Sullivan <bos@serpentine.com>
Sun, 07 Aug 2005 12:43:11 -0800
changeset 870 a82eae840447
parent 839 9c918287d10b
child 871 c2e77581bc84
permissions -rw-r--r--
Teach walk code about absolute paths. The first consequence of this is that absolute and relative paths now all work in the same way. The second is that paths that lie outside the repository now cause an error to be reported, instead of something arbitrary and expensive being done. Internally, all of the serious work is in the util package. The new canonpath function takes an arbitrary path and either returns a canonical path or raises an error. Because it needs to know where the repository root is, it must be fed a repository or dirstate object, which has given commands.matchpats and friends a new parameter to pass along. The util.matcher function uses this to canonicalise globs and relative path names. Meanwhile, I've moved the Abort exception from commands to util, and killed off the redundant util.CommandError exception.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     1
# hg.py - repository classes for mercurial
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     2
#
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     3
# Copyright 2005 Matt Mackall <mpm@selenic.com>
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     4
#
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     5
# This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     6
# of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     7
249
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 247
diff changeset
     8
import sys, struct, os
419
28511fc21073 [PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents: 418
diff changeset
     9
import util
262
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 256
diff changeset
    10
from revlog import *
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 256
diff changeset
    11
from demandload import *
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 256
diff changeset
    12
demandload(globals(), "re lock urllib urllib2 transaction time socket")
765
1e31d97c3d70 Hack to fix missing '/' problem in URLs
mpm@selenic.com
parents: 764
diff changeset
    13
demandload(globals(), "tempfile httprangereader bdiff urlparse")
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
    14
demandload(globals(), "bisect select")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    15
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    16
class filelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    17
    def __init__(self, opener, path):
144
ea9188538222 Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents: 140
diff changeset
    18
        revlog.__init__(self, opener,
786
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    19
                        os.path.join("data", self.encodedir(path + ".i")),
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    20
                        os.path.join("data", self.encodedir(path + ".d")))
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    21
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    22
    # This avoids a collision between a file named foo and a dir named
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    23
    # foo.i or foo.d
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    24
    def encodedir(self, path):
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    25
        path.replace(".hg/", ".hg.hg/")
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    26
        path.replace(".i/", ".i.hg/")
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    27
        path.replace(".d/", ".i.hg/")
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    28
        return path
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    29
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    30
    def decodedir(self, path):
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    31
        path.replace(".d.hg/", ".d/")
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    32
        path.replace(".i.hg/", ".i/")
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    33
        path.replace(".hg.hg/", ".hg/")
902b12d55751 Fix the directory and revlog collision problem
mpm@selenic.com
parents: 785
diff changeset
    34
        return path
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    35
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    36
    def read(self, node):
360
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    37
        t = self.revision(node)
686
d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents: 681
diff changeset
    38
        if not t.startswith('\1\n'):
360
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    39
            return t
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    40
        s = t.find('\1\n', 2)
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    41
        return t[s+2:]
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    42
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    43
    def readmeta(self, node):
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    44
        t = self.revision(node)
686
d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents: 681
diff changeset
    45
        if not t.startswith('\1\n'):
360
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    46
            return t
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    47
        s = t.find('\1\n', 2)
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    48
        mt = t[2:s]
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    49
        for l in mt.splitlines():
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    50
            k, v = l.split(": ", 1)
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    51
            m[k] = v
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    52
        return m
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    53
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    54
    def add(self, text, meta, transaction, link, p1=None, p2=None):
686
d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents: 681
diff changeset
    55
        if meta or text.startswith('\1\n'):
360
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    56
            mt = ""
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    57
            if meta:
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    58
                mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ]
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
    59
            text = "\1\n" + "".join(mt) + "\1\n" + text
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    60
        return self.addrevision(text, transaction, link, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
    61
79
837d473d54d5 Add basic annotation support
mpm@selenic.com
parents: 78
diff changeset
    62
    def annotate(self, node):
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    63
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    64
        def decorate(text, rev):
436
6aeb4fee51f6 Optimize annotate a bit
mpm@selenic.com
parents: 434
diff changeset
    65
            return ([rev] * len(text.splitlines()), text)
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    66
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    67
        def pair(parent, child):
436
6aeb4fee51f6 Optimize annotate a bit
mpm@selenic.com
parents: 434
diff changeset
    68
            for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]):
471
4c7f687e4313 Minor annotate performance tweaks
mpm@selenic.com
parents: 454
diff changeset
    69
                child[0][b1:b2] = parent[0][a1:a2]
4c7f687e4313 Minor annotate performance tweaks
mpm@selenic.com
parents: 454
diff changeset
    70
            return child
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    71
200
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    72
        # find all ancestors
216
201115f2859b hg annotate: actually annotate the given version
mpm@selenic.com
parents: 210
diff changeset
    73
        needed = {node:1}
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    74
        visit = [node]
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    75
        while visit:
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    76
            n = visit.pop(0)
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    77
            for p in self.parents(n):
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    78
                if p not in needed:
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    79
                    needed[p] = 1
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    80
                    visit.append(p)
200
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    81
                else:
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    82
                    # count how many times we'll use this
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    83
                    needed[p] += 1
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    84
200
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    85
        # sort by revision which is a topological order
471
4c7f687e4313 Minor annotate performance tweaks
mpm@selenic.com
parents: 454
diff changeset
    86
        visit = [ (self.rev(n), n) for n in needed.keys() ]
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    87
        visit.sort()
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    88
        hist = {}
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    89
471
4c7f687e4313 Minor annotate performance tweaks
mpm@selenic.com
parents: 454
diff changeset
    90
        for r,n in visit:
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    91
            curr = decorate(self.read(n), self.linkrev(n))
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    92
            for p in self.parents(n):
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    93
                if p != nullid:
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    94
                    curr = pair(hist[p], curr)
200
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    95
                    # trim the history of unneeded revs
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    96
                    needed[p] -= 1
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    97
                    if not needed[p]:
8450c18f2a45 annotate: memory efficiency
mpm@selenic.com
parents: 199
diff changeset
    98
                        del hist[p]
199
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
    99
            hist[n] = curr
2424676edd8c annotate: deal with merges
mpm@selenic.com
parents: 192
diff changeset
   100
436
6aeb4fee51f6 Optimize annotate a bit
mpm@selenic.com
parents: 434
diff changeset
   101
        return zip(hist[n][0], hist[n][1].splitlines(1))
79
837d473d54d5 Add basic annotation support
mpm@selenic.com
parents: 78
diff changeset
   102
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   103
class manifest(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   104
    def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   105
        self.mapcache = None
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   106
        self.listcache = None
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   107
        self.addlist = None
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   108
        revlog.__init__(self, opener, "00manifest.i", "00manifest.d")
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   109
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   110
    def read(self, node):
313
e75ea4662d81 Minor caching improvement for manifest
mpm@selenic.com
parents: 312
diff changeset
   111
        if node == nullid: return {} # don't upset local cache
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   112
        if self.mapcache and self.mapcache[0] == node:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   113
            return self.mapcache[1]
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   114
        text = self.revision(node)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   115
        map = {}
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   116
        flag = {}
25
daa724b27300 Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents: 20
diff changeset
   117
        self.listcache = (text, text.splitlines(1))
daa724b27300 Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents: 20
diff changeset
   118
        for l in self.listcache[1]:
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   119
            (f, n) = l.split('\0')
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   120
            map[f] = bin(n[:40])
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   121
            flag[f] = (n[40:-1] == "x")
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   122
        self.mapcache = (node, map, flag)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   123
        return map
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   124
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   125
    def readflags(self, node):
313
e75ea4662d81 Minor caching improvement for manifest
mpm@selenic.com
parents: 312
diff changeset
   126
        if node == nullid: return {} # don't upset local cache
358
9f4077d7ef6f [PATCH] manifest.readflags performance buglet
mpm@selenic.com
parents: 350
diff changeset
   127
        if not self.mapcache or self.mapcache[0] != node:
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   128
            self.read(node)
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   129
        return self.mapcache[2]
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   130
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   131
    def diff(self, a, b):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   132
        # this is sneaky, as we're not actually using a and b
140
30ef77113872 Minor safety checks to manifest diff
mpm@selenic.com
parents: 118
diff changeset
   133
        if self.listcache and self.addlist and self.listcache[0] == a:
98
3dde7c87e36d Add paranoia to diff code
mpm@selenic.com
parents: 96
diff changeset
   134
            d = mdiff.diff(self.listcache[1], self.addlist, 1)
3dde7c87e36d Add paranoia to diff code
mpm@selenic.com
parents: 96
diff changeset
   135
            if mdiff.patch(a, d) != b:
3dde7c87e36d Add paranoia to diff code
mpm@selenic.com
parents: 96
diff changeset
   136
                sys.stderr.write("*** sortdiff failed, falling back ***\n")
3dde7c87e36d Add paranoia to diff code
mpm@selenic.com
parents: 96
diff changeset
   137
                return mdiff.textdiff(a, b)
3dde7c87e36d Add paranoia to diff code
mpm@selenic.com
parents: 96
diff changeset
   138
            return d
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   139
        else:
44
e825a68d7227 Fix occassional diff bug with manifests
mpm@selenic.com
parents: 40
diff changeset
   140
            return mdiff.textdiff(a, b)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   141
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   142
    def add(self, map, flags, transaction, link, p1=None, p2=None,
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   143
            changed=None):
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   144
        # directly generate the mdiff delta from the data collected during
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   145
        # the bisect loop below
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   146
        def gendelta(delta):
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   147
            i = 0
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   148
            result = []
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   149
            while i < len(delta):
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   150
                start = delta[i][2]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   151
                end = delta[i][3]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   152
                l = delta[i][4]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   153
                if l == None:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   154
                    l = ""
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   155
                while i < len(delta) - 1 and start <= delta[i+1][2] \
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   156
                          and end >= delta[i+1][2]:
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   157
                    if delta[i+1][3] > end:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   158
                        end = delta[i+1][3]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   159
                    if delta[i+1][4]:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   160
                        l += delta[i+1][4]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   161
                    i += 1
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   162
                result.append(struct.pack(">lll", start, end, len(l)) +  l)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   163
                i += 1
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   164
            return result
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   165
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   166
        # apply the changes collected during the bisect loop to our addlist
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   167
        def addlistdelta(addlist, delta):
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   168
            # apply the deltas to the addlist.  start from the bottom up
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   169
            # so changes to the offsets don't mess things up.
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   170
            i = len(delta)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   171
            while i > 0:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   172
                i -= 1
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   173
                start = delta[i][0]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   174
                end = delta[i][1]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   175
                if delta[i][4]:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   176
                    addlist[start:end] = [delta[i][4]]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   177
                else:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   178
                    del addlist[start:end]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   179
            return addlist
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   180
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   181
        # calculate the byte offset of the start of each line in the
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   182
        # manifest
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   183
        def calcoffsets(addlist):
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   184
            offsets = [0] * (len(addlist) + 1)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   185
            offset = 0
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   186
            i = 0
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   187
            while i < len(addlist):
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   188
                offsets[i] = offset
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   189
                offset += len(addlist[i])
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   190
                i += 1
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   191
            offsets[i] = offset
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   192
            return offsets
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   193
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   194
        # if we're using the listcache, make sure it is valid and
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   195
        # parented by the same node we're diffing against
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   196
        if not changed or not self.listcache or not p1 or \
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   197
               self.mapcache[0] != p1:
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   198
            files = map.keys()
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   199
            files.sort()
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   200
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   201
            self.addlist = ["%s\000%s%s\n" %
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   202
                            (f, hex(map[f]), flags[f] and "x" or '')
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   203
                            for f in files]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   204
            cachedelta = None
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   205
        else:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   206
            addlist = self.listcache[1]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   207
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   208
            # find the starting offset for each line in the add list
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   209
            offsets = calcoffsets(addlist)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   210
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   211
            # combine the changed lists into one list for sorting
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   212
            work = [[x, 0] for x in changed[0]]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   213
            work[len(work):] = [[x, 1] for x in changed[1]]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   214
            work.sort()
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   215
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   216
            delta = []
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   217
            bs = 0
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   218
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   219
            for w in work:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   220
                f = w[0]
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   221
                # bs will either be the index of the item or the insert point
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   222
                bs = bisect.bisect(addlist, f, bs)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   223
                if bs < len(addlist):
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   224
                    fn = addlist[bs][:addlist[bs].index('\0')]
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   225
                else:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   226
                    fn = None
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   227
                if w[1] == 0:
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   228
                    l = "%s\000%s%s\n" % (f, hex(map[f]),
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   229
                                          flags[f] and "x" or '')
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   230
                else:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   231
                    l = None
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   232
                start = bs
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   233
                if fn != f:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   234
                    # item not found, insert a new one
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   235
                    end = bs
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   236
                    if w[1] == 1:
713
7c385bd5f993 Added missing newline after two error messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 705
diff changeset
   237
                        sys.stderr.write("failed to remove %s from manifest\n"
7c385bd5f993 Added missing newline after two error messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 705
diff changeset
   238
                                         % f)
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   239
                        sys.exit(1)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   240
                else:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   241
                    # item is found, replace/delete the existing line
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   242
                    end = bs + 1
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   243
                delta.append([start, end, offsets[start], offsets[end], l])
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   244
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   245
            self.addlist = addlistdelta(addlist, delta)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   246
            if self.mapcache[0] == self.tip():
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   247
                cachedelta = "".join(gendelta(delta))
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   248
            else:
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   249
                cachedelta = None
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   250
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   251
        text = "".join(self.addlist)
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   252
        if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text:
713
7c385bd5f993 Added missing newline after two error messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 705
diff changeset
   253
            sys.stderr.write("manifest delta failure\n")
644
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   254
            sys.exit(1)
6ebe118280bd Performance enhancements for manifest.add()
mason@suse.com
parents: 639
diff changeset
   255
        n = self.addrevision(text, transaction, link, p1, p2, cachedelta)
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   256
        self.mapcache = (n, map, flags)
25
daa724b27300 Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents: 20
diff changeset
   257
        self.listcache = (text, self.addlist)
140
30ef77113872 Minor safety checks to manifest diff
mpm@selenic.com
parents: 118
diff changeset
   258
        self.addlist = None
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   259
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   260
        return n
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   261
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   262
class changelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   263
    def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   264
        revlog.__init__(self, opener, "00changelog.i", "00changelog.d")
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   265
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   266
    def extract(self, text):
37
a8811676c85a Move hex/bin bits to revlog
mpm@selenic.com
parents: 33
diff changeset
   267
        if not text:
40
5f87633e1ea2 Date is an int as a string in changelog
mpm@selenic.com
parents: 37
diff changeset
   268
            return (nullid, "", "0", [], "")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   269
        last = text.index("\n\n")
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   270
        desc = text[last + 2:]
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   271
        l = text[:last].splitlines()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   272
        manifest = bin(l[0])
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   273
        user = l[1]
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   274
        date = l[2]
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   275
        files = l[3:]
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   276
        return (manifest, user, date, files, desc)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   277
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   278
    def read(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   279
        return self.extract(self.revision(node))
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   280
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   281
    def add(self, manifest, list, desc, transaction, p1=None, p2=None,
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   282
                  user=None, date=None):
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   283
        date = date or "%d %d" % (time.time(), time.timezone)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   284
        list.sort()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   285
        l = [hex(manifest), user, date] + list + ["", desc]
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   286
        text = "\n".join(l)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   287
        return self.addrevision(text, transaction, self.count(), p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   288
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   289
class dirstate:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   290
    def __init__(self, opener, ui, root):
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   291
        self.opener = opener
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   292
        self.root = root
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   293
        self.dirty = 0
20
a664c2b624cf The actual hg remove fix from Thomas Hein
mpm@selenic.com
parents: 19
diff changeset
   294
        self.ui = ui
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   295
        self.map = None
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   296
        self.pl = None
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   297
        self.copies = {}
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   298
        self.ignorefunc = None
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   299
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   300
    def wjoin(self, f):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   301
        return os.path.join(self.root, f)
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   302
870
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
   303
    def getcwd(self):
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
   304
        cwd = os.getcwd()
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
   305
        if cwd == self.root: return ''
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
   306
        return cwd[len(self.root) + 1:]
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
   307
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   308
    def ignore(self, f):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   309
        if not self.ignorefunc:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   310
            bigpat = []
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   311
            try:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   312
                l = file(self.wjoin(".hgignore"))
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   313
                for pat in l:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   314
                    if pat != "\n":
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   315
                        p = util.pconvert(pat[:-1])
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   316
                        try:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   317
                            r = re.compile(p)
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   318
                        except:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   319
                            self.ui.warn("ignoring invalid ignore"
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   320
                                         + " regular expression '%s'\n" % p)
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   321
                        else:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   322
                            bigpat.append(util.pconvert(pat[:-1]))
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   323
            except IOError: pass
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   324
735
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com>
parents: 730
diff changeset
   325
            if bigpat:
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com>
parents: 730
diff changeset
   326
                s = "(?:%s)" % (")|(?:".join(bigpat))
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com>
parents: 730
diff changeset
   327
                r = re.compile(s)
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com>
parents: 730
diff changeset
   328
                self.ignorefunc = r.search
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com>
parents: 730
diff changeset
   329
            else:
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com>
parents: 730
diff changeset
   330
                self.ignorefunc = util.never
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   331
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   332
        return self.ignorefunc(f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   333
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   334
    def __del__(self):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   335
        if self.dirty:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   336
            self.write()
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   337
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   338
    def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   339
        try:
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   340
            return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   341
        except TypeError:
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   342
            self.read()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   343
            return self[key]
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   344
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   345
    def __contains__(self, key):
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   346
        if not self.map: self.read()
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   347
        return key in self.map
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   348
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   349
    def parents(self):
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   350
        if not self.pl:
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   351
            self.read()
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   352
        return self.pl
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   353
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   354
    def markdirty(self):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   355
        if not self.dirty:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   356
            self.dirty = 1
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   357
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   358
    def setparents(self, p1, p2 = nullid):
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   359
        self.markdirty()
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   360
        self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   361
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   362
    def state(self, key):
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   363
        try:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   364
            return self[key][0]
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   365
        except KeyError:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   366
            return "?"
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   367
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   368
    def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   369
        if self.map is not None: return self.map
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   370
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   371
        self.map = {}
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   372
        self.pl = [nullid, nullid]
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   373
        try:
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   374
            st = self.opener("dirstate").read()
311
3b17056b72dc fix KeyErrors from reading empty dirstate
mpm@selenic.com
parents: 308
diff changeset
   375
            if not st: return
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   376
        except: return
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   377
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   378
        self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   379
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   380
        pos = 40
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   381
        while pos < len(st):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   382
            e = struct.unpack(">cllll", st[pos:pos+17])
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   383
            l = e[4]
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   384
            pos += 17
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   385
            f = st[pos:pos + l]
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   386
            if '\0' in f:
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   387
                f, c = f.split('\0')
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   388
                self.copies[f] = c
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   389
            self.map[f] = e[:4]
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   390
            pos += l
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   391
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   392
    def copy(self, source, dest):
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   393
        self.read()
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   394
        self.markdirty()
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   395
        self.copies[dest] = source
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   396
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   397
    def copied(self, file):
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   398
        return self.copies.get(file, None)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   399
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   400
    def update(self, files, state):
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   401
        ''' current states:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   402
        n  normal
231
15e7c6cee929 add 'm' state to dirstates
mpm@selenic.com
parents: 230
diff changeset
   403
        m  needs merging
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   404
        r  marked for removal
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   405
        a  marked for addition'''
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   406
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   407
        if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   408
        self.read()
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   409
        self.markdirty()
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   410
        for f in files:
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   411
            if state == "r":
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   412
                self.map[f] = ('r', 0, 0, 0)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   413
            else:
253
2da0a56aa1fd Remove invalid state from dirstate
mpm@selenic.com
parents: 251
diff changeset
   414
                s = os.stat(os.path.join(self.root, f))
2da0a56aa1fd Remove invalid state from dirstate
mpm@selenic.com
parents: 251
diff changeset
   415
                self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   416
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   417
    def forget(self, files):
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   418
        if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   419
        self.read()
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   420
        self.markdirty()
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   421
        for f in files:
20
a664c2b624cf The actual hg remove fix from Thomas Hein
mpm@selenic.com
parents: 19
diff changeset
   422
            try:
a664c2b624cf The actual hg remove fix from Thomas Hein
mpm@selenic.com
parents: 19
diff changeset
   423
                del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein
mpm@selenic.com
parents: 19
diff changeset
   424
            except KeyError:
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   425
                self.ui.warn("not in dirstate: %s!\n" % f)
20
a664c2b624cf The actual hg remove fix from Thomas Hein
mpm@selenic.com
parents: 19
diff changeset
   426
                pass
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   427
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   428
    def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   429
        self.map = {}
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   430
        self.markdirty()
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   431
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   432
    def write(self):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   433
        st = self.opener("dirstate", "w")
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 225
diff changeset
   434
        st.write("".join(self.pl))
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   435
        for f, e in self.map.items():
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   436
            c = self.copied(f)
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   437
            if c:
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   438
                f = f + "\0" + c
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   439
            e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f))
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   440
            st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   441
        self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   442
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   443
    def walk(self, files = None, match = util.always):
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   444
        self.read()
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   445
        dc = self.map.copy()
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   446
        # walk all files by default
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   447
        if not files: files = [self.root]
821
72d9bd4841f3 Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents: 820
diff changeset
   448
        known = {'.hg': 1}
72d9bd4841f3 Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents: 820
diff changeset
   449
        def seen(fn):
72d9bd4841f3 Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents: 820
diff changeset
   450
            if fn in known: return True
72d9bd4841f3 Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents: 820
diff changeset
   451
            known[fn] = 1
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   452
        def traverse():
556
f6c6fa15ff70 Move dirstate.uniq to util.unique
mpm@selenic.com
parents: 553
diff changeset
   453
            for f in util.unique(files):
537
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
   454
                f = os.path.join(self.root, f)
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   455
                if os.path.isdir(f):
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   456
                    for dir, subdirs, fl in os.walk(f):
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   457
                        d = dir[len(self.root) + 1:]
820
89985a1b3427 Clean up walk and changes code to use normalised names properly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
   458
                        nd = os.path.normpath(d)
821
72d9bd4841f3 Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents: 820
diff changeset
   459
                        if seen(nd):
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   460
                            subdirs[:] = []
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   461
                            continue
669
8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents: 667
diff changeset
   462
                        for sd in subdirs:
820
89985a1b3427 Clean up walk and changes code to use normalised names properly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
   463
                            ds = os.path.join(nd, sd +'/')
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   464
                            if self.ignore(ds) or not match(ds):
669
8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents: 667
diff changeset
   465
                                subdirs.remove(sd)
822
b678e6d4f92d Attempt to yield names in sorted order when walking.
Bryan O'Sullivan <bos@serpentine.com>
parents: 821
diff changeset
   466
                        subdirs.sort()
b678e6d4f92d Attempt to yield names in sorted order when walking.
Bryan O'Sullivan <bos@serpentine.com>
parents: 821
diff changeset
   467
                        fl.sort()
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   468
                        for fn in fl:
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   469
                            fn = util.pconvert(os.path.join(d, fn))
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   470
                            yield 'f', fn
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   471
                else:
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   472
                    yield 'f', f[len(self.root) + 1:]
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   473
822
b678e6d4f92d Attempt to yield names in sorted order when walking.
Bryan O'Sullivan <bos@serpentine.com>
parents: 821
diff changeset
   474
            ks = dc.keys()
b678e6d4f92d Attempt to yield names in sorted order when walking.
Bryan O'Sullivan <bos@serpentine.com>
parents: 821
diff changeset
   475
            ks.sort()
b678e6d4f92d Attempt to yield names in sorted order when walking.
Bryan O'Sullivan <bos@serpentine.com>
parents: 821
diff changeset
   476
            for k in ks:
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   477
                yield 'm', k
669
8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents: 667
diff changeset
   478
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   479
        # yield only files that match: all in dirstate, others only if
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   480
        # not in .hgignore
669
8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents: 667
diff changeset
   481
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   482
        for src, fn in util.unique(traverse()):
820
89985a1b3427 Clean up walk and changes code to use normalised names properly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
   483
            fn = os.path.normpath(fn)
821
72d9bd4841f3 Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents: 820
diff changeset
   484
            if seen(fn): continue
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   485
            if fn in dc:
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   486
                del dc[fn]
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   487
            elif self.ignore(fn):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   488
                continue
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   489
            if match(fn):
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   490
                yield src, fn
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   491
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   492
    def changes(self, files = None, match = util.always):
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   493
        self.read()
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   494
        dc = self.map.copy()
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   495
        lookup, changed, added, unknown = [], [], [], []
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   496
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   497
        for src, fn in self.walk(files, match):
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   498
            try: s = os.stat(os.path.join(self.root, fn))
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   499
            except: continue
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   500
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   501
            if fn in dc:
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   502
                c = dc[fn]
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   503
                del dc[fn]
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   504
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   505
                if c[0] == 'm':
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   506
                    changed.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   507
                elif c[0] == 'a':
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   508
                    added.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   509
                elif c[0] == 'r':
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   510
                    unknown.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   511
                elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100:
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   512
                    changed.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   513
                elif c[1] != s.st_mode or c[3] != s.st_mtime:
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   514
                    lookup.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   515
            else:
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   516
                if match(fn): unknown.append(fn)
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   517
730
d2dc7663d512 Only walk over files that match our criteria.
Bryan O'Sullivan <bos@serpentine.com>
parents: 726
diff changeset
   518
        return (lookup, changed, added, filter(match, dc.keys()), unknown)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   519
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   520
# used to avoid circular references so destructors work
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   521
def opener(base):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   522
    p = base
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   523
    def o(path, mode="r"):
686
d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents: 681
diff changeset
   524
        if p.startswith("http://"):
15
6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents: 10
diff changeset
   525
            f = os.path.join(p, urllib.quote(path))
372
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents: 363
diff changeset
   526
            return httprangereader.httprangereader(f)
15
6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents: 10
diff changeset
   527
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   528
        f = os.path.join(p, path)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   529
292
09364bcebdf0 Make most file opening binary
mpm@selenic.com
parents: 291
diff changeset
   530
        mode += "b" # for that other OS
09364bcebdf0 Make most file opening binary
mpm@selenic.com
parents: 291
diff changeset
   531
09364bcebdf0 Make most file opening binary
mpm@selenic.com
parents: 291
diff changeset
   532
        if mode[0] != "r":
110
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   533
            try:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   534
                s = os.stat(f)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   535
            except OSError:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   536
                d = os.path.dirname(f)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   537
                if not os.path.isdir(d):
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   538
                    os.makedirs(d)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   539
            else:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents: 109
diff changeset
   540
                if s.st_nlink > 1:
417
f2d1f5fd0179 [PATCH] file type fixes for the other 'OS'
mpm@selenic.com
parents: 416
diff changeset
   541
                    file(f + ".tmp", "wb").write(file(f, "rb").read())
421
43b8da7420a9 [PATCH] rename under the other OS
mpm@selenic.com
parents: 420
diff changeset
   542
                    util.rename(f+".tmp", f)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   543
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   544
        return file(f, mode)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   545
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   546
    return o
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   547
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 495
diff changeset
   548
class RepoError(Exception): pass
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 495
diff changeset
   549
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
   550
class localrepository:
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   551
    def __init__(self, ui, path=None, create=0):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   552
        self.remote = 0
686
d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents: 681
diff changeset
   553
        if path and path.startswith("http://"):
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   554
            self.remote = 1
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   555
            self.path = path
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   556
        else:
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   557
            if not path:
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   558
                p = os.getcwd()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   559
                while not os.path.isdir(os.path.join(p, ".hg")):
420
dbe86d465e09 [PATCH] Repo locator fix for the other `OS'
mpm@selenic.com
parents: 419
diff changeset
   560
                    oldp = p
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   561
                    p = os.path.dirname(p)
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 495
diff changeset
   562
                    if p == oldp: raise RepoError("no repo found")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   563
                path = p
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   564
            self.path = os.path.join(path, ".hg")
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   565
405
99470ae6b424 Check if repository exists
mpm@selenic.com
parents: 402
diff changeset
   566
            if not create and not os.path.isdir(self.path):
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 495
diff changeset
   567
                raise RepoError("repository %s not found" % self.path)
405
99470ae6b424 Check if repository exists
mpm@selenic.com
parents: 402
diff changeset
   568
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   569
        self.root = path
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   570
        self.ui = ui
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   571
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   572
        if create:
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   573
            os.mkdir(self.path)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   574
            os.mkdir(self.join("data"))
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   575
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   576
        self.opener = opener(self.path)
291
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
   577
        self.wopener = opener(self.root)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   578
        self.manifest = manifest(self.opener)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   579
        self.changelog = changelog(self.opener)
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   580
        self.tagscache = None
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   581
        self.nodetagscache = None
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   582
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   583
        if not self.remote:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   584
            self.dirstate = dirstate(self.opener, ui, self.root)
337
c3d873ef4b31 Add support for .hg/hgrc file
mpm@selenic.com
parents: 330
diff changeset
   585
            try:
c3d873ef4b31 Add support for .hg/hgrc file
mpm@selenic.com
parents: 330
diff changeset
   586
                self.ui.readconfig(self.opener("hgrc"))
c3d873ef4b31 Add support for .hg/hgrc file
mpm@selenic.com
parents: 330
diff changeset
   587
            except IOError: pass
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   588
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   589
    def hook(self, name, **args):
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   590
        s = self.ui.config("hooks", name)
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   591
        if s:
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   592
            self.ui.note("running hook %s: %s\n" % (name, s))
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   593
            old = {}
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   594
            for k, v in args.items():
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   595
                k = k.upper()
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   596
                old[k] = os.environ.get(k, None)
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   597
                os.environ[k] = v
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   598
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   599
            r = os.system(s)
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   600
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   601
            for k, v in old.items():
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   602
                if v != None:
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   603
                    os.environ[k] = v
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   604
                else:
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   605
                    del os.environ[k]
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   606
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   607
            if r:
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   608
                self.ui.warn("abort: %s hook failed with status %d!\n" %
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   609
                             (name, r))
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   610
                return False
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   611
        return True
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   612
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   613
    def tags(self):
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   614
        '''return a mapping of tag to node'''
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
   615
        if not self.tagscache:
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   616
            self.tagscache = {}
609
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   617
            def addtag(self, k, n):
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   618
                try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   619
                    bin_n = bin(n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   620
                except TypeError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   621
                    bin_n = ''
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   622
                self.tagscache[k.strip()] = bin_n
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   623
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
   624
            try:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   625
                # read each head of the tags file, ending with the tip
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   626
                # and add each tag found to the map, with "newer" ones
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   627
                # taking precedence
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
   628
                fl = self.file(".hgtags")
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   629
                h = fl.heads()
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   630
                h.reverse()
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   631
                for r in h:
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   632
                    for l in fl.revision(r).splitlines():
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
   633
                        if l:
385
e9e1efd5291c Fixed problems with extra spaces around tags in .hgtags
Thomas Arendsen Hein <thomas@intevation.de>
parents: 383
diff changeset
   634
                            n, k = l.split(" ", 1)
609
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   635
                            addtag(self, k, n)
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
   636
            except KeyError:
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
   637
                pass
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   638
609
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   639
            try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   640
                f = self.opener("localtags")
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   641
                for l in f:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   642
                    n, k = l.split(" ", 1)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   643
                    addtag(self, k, n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   644
            except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents: 608
diff changeset
   645
                pass
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   646
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   647
            self.tagscache['tip'] = self.changelog.tip()
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   648
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   649
        return self.tagscache
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   650
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   651
    def tagslist(self):
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   652
        '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   653
        l = []
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 471
diff changeset
   654
        for t, n in self.tags().items():
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   655
            try:
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   656
                r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   657
            except:
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   658
                r = -2 # sort to the beginning of the list if unknown
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   659
            l.append((r,t,n))
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   660
        l.sort()
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   661
        return [(t,n) for r,t,n in l]
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   662
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   663
    def nodetags(self, node):
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   664
        '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   665
        if not self.nodetagscache:
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   666
            self.nodetagscache = {}
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   667
            for t,n in self.tags().items():
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   668
                self.nodetagscache.setdefault(n,[]).append(t)
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   669
        return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   670
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   671
    def lookup(self, key):
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
   672
        try:
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 337
diff changeset
   673
            return self.tags()[key]
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
   674
        except KeyError:
658
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
   675
            try:
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
   676
                return self.changelog.lookup(key)
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
   677
            except:
f8098ae9f5b6 Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents: 657
diff changeset
   678
                raise RepoError("unknown revision '%s'" % key)
67
a182f2561c8e Add tag support
mpm@selenic.com
parents: 65
diff changeset
   679
634
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
   680
    def dev(self):
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
   681
        if self.remote: return -1
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
   682
        return os.stat(self.path).st_dev
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
   683
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   684
    def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   685
        return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   686
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   687
    def wjoin(self, f):
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   688
        return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   689
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   690
    def file(self, f):
192
5d8553352d2e Changes to network protocol
mpm@selenic.com
parents: 191
diff changeset
   691
        if f[0] == '/': f = f[1:]
144
ea9188538222 Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents: 140
diff changeset
   692
        return filelog(self.opener, f)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   693
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 624
diff changeset
   694
    def getcwd(self):
870
a82eae840447 Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents: 839
diff changeset
   695
        return self.dirstate.getcwd()
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 624
diff changeset
   696
291
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
   697
    def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
   698
        return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
   699
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   700
    def transaction(self):
251
3fd8fc14b12f backup dirstate for undo
mpm@selenic.com
parents: 249
diff changeset
   701
        # save dirstate for undo
263
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
   702
        try:
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
   703
            ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
   704
        except IOError:
e8eb427c6d71 Fix empty repository transaction bug
mpm@selenic.com
parents: 262
diff changeset
   705
            ds = ""
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   706
        self.opener("journal.dirstate", "w").write(ds)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   707
785
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   708
        def after():
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   709
            util.rename(self.join("journal"), self.join("undo"))
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   710
            util.rename(self.join("journal.dirstate"),
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   711
                        self.join("undo.dirstate"))
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   712
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   713
        return transaction.transaction(self.ui.warn, self.opener,
46a8dd3145cc Fix undo after aborted commit bug
mpm@selenic.com
parents: 781
diff changeset
   714
                                       self.join("journal"), after)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   715
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   716
    def recover(self):
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
   717
        lock = self.lock()
557
b9fee419a1bd recover: the journal is named 'journal'
mpm@selenic.com
parents: 556
diff changeset
   718
        if os.path.exists(self.join("journal")):
501
7ea1c88792bf Better messages for rollback and undo
mpm@selenic.com
parents: 499
diff changeset
   719
            self.ui.status("rolling back interrupted transaction\n")
557
b9fee419a1bd recover: the journal is named 'journal'
mpm@selenic.com
parents: 556
diff changeset
   720
            return transaction.rollback(self.opener, self.join("journal"))
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   721
        else:
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   722
            self.ui.warn("no interrupted transaction available\n")
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   723
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   724
    def undo(self):
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
   725
        lock = self.lock()
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   726
        if os.path.exists(self.join("undo")):
501
7ea1c88792bf Better messages for rollback and undo
mpm@selenic.com
parents: 499
diff changeset
   727
            self.ui.status("rolling back last transaction\n")
262
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 256
diff changeset
   728
            transaction.rollback(self.opener, self.join("undo"))
251
3fd8fc14b12f backup dirstate for undo
mpm@selenic.com
parents: 249
diff changeset
   729
            self.dirstate = None
421
43b8da7420a9 [PATCH] rename under the other OS
mpm@selenic.com
parents: 420
diff changeset
   730
            util.rename(self.join("undo.dirstate"), self.join("dirstate"))
251
3fd8fc14b12f backup dirstate for undo
mpm@selenic.com
parents: 249
diff changeset
   731
            self.dirstate = dirstate(self.opener, self.ui, self.root)
163
f38c90953c2c Make undo and recover friendlier
mpm@selenic.com
parents: 162
diff changeset
   732
        else:
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 207
diff changeset
   733
            self.ui.warn("no undo information available\n")
162
5dcbe4d9a30c Implement recover and undo commands
mpm@selenic.com
parents: 161
diff changeset
   734
161
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   735
    def lock(self, wait = 1):
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   736
        try:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   737
            return lock.lock(self.join("lock"), 0)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   738
        except lock.LockHeld, inst:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   739
            if wait:
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   740
                self.ui.warn("waiting for lock held by %s\n" % inst.args[0])
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   741
                return lock.lock(self.join("lock"), wait)
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   742
            raise inst
0b4c5cb953d9 Simply repository locking
mpm@selenic.com
parents: 155
diff changeset
   743
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   744
    def rawcommit(self, files, text, user, date, p1=None, p2=None):
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   745
        orig_parent = self.dirstate.parents()[0] or nullid
452
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents: 442
diff changeset
   746
        p1 = p1 or self.dirstate.parents()[0] or nullid
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents: 442
diff changeset
   747
        p2 = p2 or self.dirstate.parents()[1] or nullid
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   748
        c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   749
        c2 = self.changelog.read(p2)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   750
        m1 = self.manifest.read(c1[0])
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   751
        mf1 = self.manifest.readflags(c1[0])
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   752
        m2 = self.manifest.read(c2[0])
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   753
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   754
        if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   755
            update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   756
        else:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   757
            update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   758
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   759
        tr = self.transaction()
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   760
        mm = m1.copy()
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   761
        mfm = mf1.copy()
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   762
        linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   763
        for f in files:
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   764
            try:
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   765
                t = self.wfile(f).read()
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
   766
                tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   767
                r = self.file(f)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   768
                mfm[f] = tm
360
10519e4cbd02 filelog: add metadata support
mpm@selenic.com
parents: 358
diff changeset
   769
                mm[f] = r.add(t, {}, tr, linkrev,
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   770
                              m1.get(f, nullid), m2.get(f, nullid))
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   771
                if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   772
                    self.dirstate.update([f], "n")
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   773
            except IOError:
314
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
   774
                try:
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
   775
                    del mm[f]
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
   776
                    del mfm[f]
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   777
                    if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   778
                        self.dirstate.forget([f])
314
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
   779
                except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
   780
                    # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents: 313
diff changeset
   781
                    pass
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   782
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   783
        mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 588
diff changeset
   784
        user = user or self.ui.username()
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
   785
        n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   786
        tr.close()
442
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   787
        if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak
mpm@selenic.com
parents: 441
diff changeset
   788
            self.dirstate.setparents(n, nullid)
203
0b486b5e0796 hg rawcommit command
mpm@selenic.com
parents: 200
diff changeset
   789
813
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 786
diff changeset
   790
    def commit(self, files = None, text = "", user = None, date = None,
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 786
diff changeset
   791
               match = util.always):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   792
        commit = []
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   793
        remove = []
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   794
        if files:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   795
            for f in files:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   796
                s = self.dirstate.state(f)
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   797
                if s in 'nmai':
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   798
                    commit.append(f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   799
                elif s == 'r':
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   800
                    remove.append(f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   801
                else:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   802
                    self.ui.warn("%s not tracked!\n" % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   803
        else:
813
80fd2958235a Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 786
diff changeset
   804
            (c, a, d, u) = self.changes(match = match)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   805
            commit = c + a
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   806
            remove = d
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   807
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   808
        if not commit and not remove:
151
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
   809
            self.ui.status("nothing changed\n")
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
   810
            return
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
   811
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   812
        if not self.hook("precommit"):
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   813
            return 1
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   814
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   815
        p1, p2 = self.dirstate.parents()
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   816
        c1 = self.changelog.read(p1)
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   817
        c2 = self.changelog.read(p2)
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   818
        m1 = self.manifest.read(c1[0])
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   819
        mf1 = self.manifest.readflags(c1[0])
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   820
        m2 = self.manifest.read(c2[0])
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
   821
        lock = self.lock()
151
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
   822
        tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit
mpm@selenic.com
parents: 149
diff changeset
   823
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   824
        # check in files
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   825
        new = {}
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   826
        linkrev = self.changelog.count()
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   827
        commit.sort()
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   828
        for f in commit:
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
   829
            self.ui.note(f + "\n")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   830
            try:
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
   831
                mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False))
418
0446f698d38e Minor tweak to binary mode patch
mpm@selenic.com
parents: 417
diff changeset
   832
                t = self.wfile(f).read()
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   833
            except IOError:
667
31a9aa890016 A number of minor fixes to problems that pychecker found.
mark.williamson@cl.cam.ac.uk
parents: 660
diff changeset
   834
                self.ui.warn("trouble committing %s!\n" % f)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   835
                raise
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   836
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   837
            meta = {}
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   838
            cp = self.dirstate.copied(f)
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   839
            if cp:
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   840
                meta["copy"] = cp
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   841
                meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
575
7f5ce4bbdd7b More whitespace cleanups
mpm@selenic.com
parents: 566
diff changeset
   842
                self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"]))
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   843
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   844
            r = self.file(f)
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   845
            fp1 = m1.get(f, nullid)
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   846
            fp2 = m2.get(f, nullid)
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   847
            new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   848
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   849
        # update manifest
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   850
        m1.update(new)
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents: 415
diff changeset
   851
        for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents: 415
diff changeset
   852
            if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents: 415
diff changeset
   853
                del m1[f]
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   854
        mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0],
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   855
                               (new, remove))
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   856
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   857
        # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   858
        new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   859
        new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   860
288
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   861
        if not text:
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   862
            edittext = "\n" + "HG: manifest hash %s\n" % hex(mn)
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   863
            edittext += "".join(["HG: changed %s\n" % f for f in new])
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   864
            edittext += "".join(["HG: removed %s\n" % f for f in remove])
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   865
            edittext = self.ui.edit(edittext)
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   866
            if not edittext.rstrip():
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   867
                return 1
97c87ac6d7a4 commit: edit text fixups
mpm@selenic.com
parents: 287
diff changeset
   868
            text = edittext
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   869
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 588
diff changeset
   870
        user = user or self.ui.username()
317
b18ce742566a hg commit: user and date options
mpm@selenic.com
parents: 314
diff changeset
   871
        n = self.changelog.add(mn, new, text, tr, p1, p2, user, date)
487
2ad41189bee5 Add initial hook support
mpm@selenic.com
parents: 484
diff changeset
   872
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   873
        tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   874
229
1b11da6ee69e teach commit about dirstate.parents()
mpm@selenic.com
parents: 228
diff changeset
   875
        self.dirstate.setparents(n)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   876
        self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   877
        self.dirstate.forget(remove)
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   878
660
2c83350784c3 Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents: 659
diff changeset
   879
        if not self.hook("commit", node=hex(n)):
2c83350784c3 Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents: 659
diff changeset
   880
            return 1
2c83350784c3 Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents: 659
diff changeset
   881
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   882
    def walk(self, node = None, files = [], match = util.always):
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   883
        if node:
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   884
            for fn in self.manifest.read(self.changelog.read(node)[0]):
820
89985a1b3427 Clean up walk and changes code to use normalised names properly.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
   885
                if match(fn): yield 'm', fn
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   886
        else:
726
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   887
            for src, fn in self.dirstate.walk(files, match):
809a870a0e73 Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   888
                yield src, fn
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   889
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   890
    def changes(self, node1 = None, node2 = None, files = [],
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   891
                match = util.always):
566
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
   892
        mf2, u = None, []
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   893
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   894
        def fcmp(fn, mf):
291
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
   895
            t1 = self.wfile(fn).read()
29
4d3a5dcb6972 Make diffdir take a revision argument
mpm@selenic.com
parents: 25
diff changeset
   896
            t2 = self.file(fn).revision(mf[fn])
4d3a5dcb6972 Make diffdir take a revision argument
mpm@selenic.com
parents: 25
diff changeset
   897
            return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument
mpm@selenic.com
parents: 25
diff changeset
   898
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   899
        def mfmatches(node):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   900
            mf = dict(self.manifest.read(node))
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   901
            for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   902
                if not match(fn):
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   903
                    del mf[fn]
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   904
            return mf
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   905
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   906
        # are we comparing the working directory?
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   907
        if not node2:
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   908
            l, c, a, d, u = self.dirstate.changes(files, match)
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   909
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   910
            # are we comparing working dir against its parent?
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   911
            if not node1:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   912
                if l:
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   913
                    # do a full compare of any files that might have changed
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   914
                    change = self.changelog.read(self.dirstate.parents()[0])
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   915
                    mf2 = mfmatches(change[0])
548
e2e963e255fd Fix braindamage in repo.changes
mpm@selenic.com
parents: 547
diff changeset
   916
                    for f in l:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   917
                        if fcmp(f, mf2):
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   918
                            c.append(f)
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   919
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   920
                for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   921
                    l.sort()
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   922
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   923
                return (c, a, d, u)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   924
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   925
        # are we comparing working dir against non-tip?
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   926
        # generate a pseudo-manifest for the working dir
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   927
        if not node2:
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   928
            if not mf2:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   929
                change = self.changelog.read(self.dirstate.parents()[0])
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   930
                mf2 = mfmatches(change[0])
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   931
            for f in a + c + l:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   932
                mf2[f] = ""
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   933
            for f in d:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   934
                if f in mf2: del mf2[f]
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   935
        else:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   936
            change = self.changelog.read(node2)
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   937
            mf2 = mfmatches(change[0])
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   938
566
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
   939
        # flush lists from dirstate before comparing manifests
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
   940
        c, a = [], []
b2c9b36bd639 repo.changes: fix duplicate changes
mpm@selenic.com
parents: 561
diff changeset
   941
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   942
        change = self.changelog.read(node1)
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
   943
        mf1 = mfmatches(change[0])
32
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   944
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   945
        for fn in mf2:
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   946
            if mf1.has_key(fn):
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   947
                if mf1[fn] != mf2[fn]:
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   948
                    if mf2[fn] != "" or fcmp(fn, mf1):
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   949
                        c.append(fn)
32
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   950
                del mf1[fn]
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   951
            else:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   952
                a.append(fn)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   953
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   954
        d = mf1.keys()
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   955
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   956
        for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 557
diff changeset
   957
            l.sort()
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
   958
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 529
diff changeset
   959
        return (c, a, d, u)
32
6a4d8718bee0 Add diffrevs function to compare two nodes
mpm@selenic.com
parents: 30
diff changeset
   960
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   961
    def add(self, list):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   962
        for f in list:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   963
            p = self.wjoin(f)
611
48c3eb2bf844 * clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents: 609
diff changeset
   964
            if not os.path.exists(p):
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   965
                self.ui.warn("%s does not exist!\n" % f)
611
48c3eb2bf844 * clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents: 609
diff changeset
   966
            elif not os.path.isfile(p):
741
156dc2f3be7f Fix some line wrapping
mpm@selenic.com
parents: 740
diff changeset
   967
                self.ui.warn("%s not added: only files supported currently\n" % f)
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 723
diff changeset
   968
            elif self.dirstate.state(f) in 'an':
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   969
                self.ui.warn("%s already tracked!\n" % f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   970
            else:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   971
                self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   972
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   973
    def forget(self, list):
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   974
        for f in list:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   975
            if self.dirstate.state(f) not in 'ai':
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   976
                self.ui.warn("%s not added!\n" % f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   977
            else:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   978
                self.dirstate.forget([f])
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   979
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   980
    def remove(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   981
        for f in list:
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
   982
            p = self.wjoin(f)
611
48c3eb2bf844 * clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents: 609
diff changeset
   983
            if os.path.exists(p):
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   984
                self.ui.warn("%s still exists!\n" % f)
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents: 385
diff changeset
   985
            elif self.dirstate.state(f) == 'a':
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents: 385
diff changeset
   986
                self.ui.warn("%s never committed!\n" % f)
657
22bc6fb9aefc dirstate.forget() takes a list
Matt Mackall <mpm@selenic.com>
parents: 656
diff changeset
   987
                self.dirstate.forget([f])
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   988
            elif f not in self.dirstate:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   989
                self.ui.warn("%s not tracked!\n" % f)
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   990
            else:
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 217
diff changeset
   991
                self.dirstate.update([f], "r")
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
   992
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   993
    def copy(self, source, dest):
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   994
        p = self.wjoin(dest)
781
26f3d353851f Fix copy in subdirectories
mpm@selenic.com
parents: 780
diff changeset
   995
        if not os.path.exists(p):
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   996
            self.ui.warn("%s does not exist!\n" % dest)
781
26f3d353851f Fix copy in subdirectories
mpm@selenic.com
parents: 780
diff changeset
   997
        elif not os.path.isfile(p):
659
3662e3d6b690 Whitespace cleanup
Matt Mackall <mpm@selenic.com>
parents: 658
diff changeset
   998
            self.ui.warn("copy failed: %s is not a file\n" % dest)
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
   999
        else:
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
  1000
            if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
  1001
                self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
  1002
            self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 360
diff changeset
  1003
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1004
    def heads(self):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1005
        return self.changelog.heads()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1006
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1007
    def branches(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1008
        if not nodes: nodes = [self.changelog.tip()]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1009
        b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1010
        for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1011
            t = n
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1012
            while n:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1013
                p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1014
                if p[1] != nullid or p[0] == nullid:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1015
                    b.append((t, n, p[0], p[1]))
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1016
                    break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1017
                n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1018
        return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1019
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1020
    def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1021
        r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1022
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1023
        for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1024
            n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1025
            f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1026
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1027
            while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1028
                p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1029
                if i == f:
575
7f5ce4bbdd7b More whitespace cleanups
mpm@selenic.com
parents: 566
diff changeset
  1030
                    l.append(n)
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1031
                    f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1032
                n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1033
                i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1034
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1035
            r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1036
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1037
        return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1038
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1039
    def newer(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1040
        m = {}
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1041
        nl = []
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1042
        pm = {}
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1043
        cl = self.changelog
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1044
        t = l = cl.count()
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1045
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1046
        # find the lowest numbered node
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1047
        for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1048
            l = min(l, cl.rev(n))
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1049
            m[n] = 1
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
  1050
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1051
        for i in xrange(l, t):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1052
            n = cl.node(i)
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1053
            if n in m: # explicitly listed
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1054
                pm[n] = 1
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1055
                nl.append(n)
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1056
                continue
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1057
            for p in cl.parents(n):
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1058
                if p in pm: # parent listed
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1059
                    pm[n] = 1
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1060
                    nl.append(n)
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1061
                    break
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1062
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1063
        return nl
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1064
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1065
    def findincoming(self, remote, base=None, heads=None):
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
  1066
        m = self.changelog.nodemap
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1067
        search = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1068
        fetch = []
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1069
        seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1070
        seenbranch = {}
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1071
        if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1072
            base = {}
192
5d8553352d2e Changes to network protocol
mpm@selenic.com
parents: 191
diff changeset
  1073
636
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1074
        # assume we're closer to the tip than the root
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1075
        # and start by examining the heads
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1076
        self.ui.status("searching for changes\n")
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1077
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1078
        if not heads:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1079
            heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1080
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1081
        unknown = []
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1082
        for h in heads:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1083
            if h not in m:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1084
                unknown.append(h)
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1085
            else:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1086
                base[h] = 1
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
  1087
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1088
        if not unknown:
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1089
            return None
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1090
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1091
        rep = {}
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1092
        reqcnt = 0
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
  1093
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1094
        # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1095
        # a 'branch' here is a linear segment of history, with four parts:
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1096
        # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1097
        # (a branch always has two parents (or none) by definition)
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1098
        unknown = remote.branches(unknown)
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1099
        while unknown:
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1100
            r = []
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1101
            while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1102
                n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1103
                if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1104
                    continue
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1105
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1106
                self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1107
                if n[0] == nullid:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1108
                    break
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1109
                if n in seenbranch:
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1110
                    self.ui.debug("branch already found\n")
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1111
                    continue
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1112
                if n[1] and n[1] in m: # do we know the base?
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1113
                    self.ui.debug("found incomplete branch %s:%s\n"
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1114
                                  % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1115
                    search.append(n) # schedule branch range for scanning
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1116
                    seenbranch[n] = 1
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1117
                else:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1118
                    if n[1] not in seen and n[1] not in fetch:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1119
                        if n[2] in m and n[3] in m:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1120
                            self.ui.debug("found new changeset %s\n" %
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1121
                                          short(n[1]))
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1122
                            fetch.append(n[1]) # earliest unknown
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1123
                            base[n[2]] = 1 # latest known
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1124
                            continue
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1125
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1126
                    for a in n[2:4]:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1127
                        if a not in rep:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1128
                            r.append(a)
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1129
                            rep[a] = 1
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1130
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1131
                seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1132
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1133
            if r:
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1134
                reqcnt += 1
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1135
                self.ui.debug("request %d: %s\n" %
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1136
                            (reqcnt, " ".join(map(short, r))))
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1137
                for p in range(0, len(r), 10):
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1138
                    for b in remote.branches(r[p:p+10]):
148
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1139
                        self.ui.debug("received %s:%s\n" %
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1140
                                      (short(b[0]), short(b[1])))
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1141
                        if b[0] not in m and b[0] not in seen:
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents: 146
diff changeset
  1142
                            unknown.append(b)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
  1143
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1144
        # do binary search on the branches we found
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1145
        while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1146
            n = search.pop(0)
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1147
            reqcnt += 1
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1148
            l = remote.between([(n[0], n[1])])[0]
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1149
            l.append(n[1])
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1150
            p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1151
            f = 1
328
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1152
            for i in l:
dac675ef6189 hg pull: more query fixes
mpm@selenic.com
parents: 324
diff changeset
  1153
                self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
  1154
                if i in m:
85
58a1a0425c9b Fix merge bug, I hope
mpm@selenic.com
parents: 83
diff changeset
  1155
                    if f <= 2:
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1156
                        self.ui.debug("found new branch changeset %s\n" %
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1157
                                          short(p))
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1158
                        fetch.append(p)
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1159
                        base[i] = 1
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1160
                    else:
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1161
                        self.ui.debug("narrowed branch search to %s:%s\n"
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1162
                                      % (short(p), short(i)))
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1163
                        search.append((p, i))
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
  1164
                    break
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1165
                p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1166
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1167
        # sanity check our fetch list
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
  1168
        for f in fetch:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
  1169
            if f in m:
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 495
diff changeset
  1170
                raise RepoError("already have changeset " + short(f[:4]))
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1171
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents: 578
diff changeset
  1172
        if base.keys() == [nullid]:
514
874e577e332e change unrelated repository error to a warning
mpm@selenic.com
parents: 511
diff changeset
  1173
            self.ui.warn("warning: pulling from an unrelated repository!\n")
511
9f67222186bd Disallow merging of unrelated projects
mpm@selenic.com
parents: 504
diff changeset
  1174
94
7daef883134f Refactor merge code
mpm@selenic.com
parents: 90
diff changeset
  1175
        self.ui.note("adding new changesets starting at " +
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1176
                     " ".join([short(f) for f in fetch]) + "\n")
65
d40cc5aacc31 Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents: 64
diff changeset
  1177
324
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1178
        self.ui.debug("%d total queries\n" % reqcnt)
ce81bdd91d06 hg merge: some getchangegroup fixups
mpm@selenic.com
parents: 321
diff changeset
  1179
516
873228c2f6cf Change getchangegroup to findincoming
mpm@selenic.com
parents: 515
diff changeset
  1180
        return fetch
873228c2f6cf Change getchangegroup to findincoming
mpm@selenic.com
parents: 515
diff changeset
  1181
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1182
    def findoutgoing(self, remote, base=None, heads=None):
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1183
        if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1184
            base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1185
            self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1186
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1187
        remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1188
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1189
        # prune everything remote has from the tree
637
31e090c34d3b Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents: 636
diff changeset
  1190
        del remain[nullid]
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1191
        remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1192
        while remove:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1193
            n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1194
            if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1195
                del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1196
                for p in self.changelog.parents(n):
637
31e090c34d3b Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents: 636
diff changeset
  1197
                    remove.append(p)
621
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1198
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1199
        # find every node whose parents have been pruned
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1200
        subset = []
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1201
        for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1202
            p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1203
            if p1 not in remain and p2 not in remain:
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1204
                subset.append(n)
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1205
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1206
        # this is the set of all roots we have to push
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1207
        return subset
004e811f7706 Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents: 616
diff changeset
  1208
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1209
    def pull(self, remote):
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1210
        lock = self.lock()
636
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1211
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1212
        # if we have an empty repo, fetch everything
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1213
        if self.changelog.tip() == nullid:
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1214
            self.ui.status("requesting all changes\n")
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1215
            fetch = [nullid]
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1216
        else:
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1217
            fetch = self.findincoming(remote)
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents: 635
diff changeset
  1218
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1219
        if not fetch:
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1220
            self.ui.status("no changes found\n")
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1221
            return 1
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1222
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1223
        cg = remote.changegroup(fetch)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1224
        return self.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1225
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1226
    def push(self, remote, force=False):
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1227
        lock = remote.lock()
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1228
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1229
        base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1230
        heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1231
        inc = self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1232
        if not force and inc:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1233
            self.ui.warn("abort: unsynced remote changes!\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1234
            self.ui.status("(did you forget to sync? use push -f to force)\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1235
            return 1
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1236
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1237
        update = self.findoutgoing(remote, base)
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1238
        if not update:
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1239
            self.ui.status("no changes found\n")
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1240
            return 1
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1241
        elif not force:
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1242
            if len(heads) < len(self.changelog.heads()):
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1243
                self.ui.warn("abort: push creates new remote branches!\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1244
                self.ui.status("(did you forget to merge?" +
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1245
                               " use push -f to force)\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents: 814
diff changeset
  1246
                return 1
622
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1247
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1248
        cg = self.changegroup(update)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1249
        return remote.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents: 621
diff changeset
  1250
56
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents: 55
diff changeset
  1251
    def changegroup(self, basenodes):
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1252
        class genread:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1253
            def __init__(self, generator):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1254
                self.g = generator
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1255
                self.buf = ""
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1256
            def read(self, l):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1257
                while l > len(self.buf):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1258
                    try:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1259
                        self.buf += self.g.next()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1260
                    except StopIteration:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1261
                        break
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1262
                d, self.buf = self.buf[:l], self.buf[l:]
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1263
                return d
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
  1264
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1265
        def gengroup():
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1266
            nodes = self.newer(basenodes)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1267
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1268
            # construct the link map
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1269
            linkmap = {}
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1270
            for n in nodes:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1271
                linkmap[self.changelog.rev(n)] = n
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1272
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1273
            # construct a list of all changed files
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1274
            changed = {}
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1275
            for n in nodes:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1276
                c = self.changelog.read(n)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1277
                for f in c[3]:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1278
                    changed[f] = 1
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1279
            changed = changed.keys()
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1280
            changed.sort()
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1281
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1282
            # the changegroup is changesets + manifests + all file revs
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1283
            revs = [ self.changelog.rev(n) for n in nodes ]
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1284
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1285
            for y in self.changelog.group(linkmap): yield y
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1286
            for y in self.manifest.group(linkmap): yield y
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1287
            for f in changed:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1288
                yield struct.pack(">l", len(f) + 4) + f
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1289
                g = self.file(f).group(linkmap)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1290
                for y in g:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1291
                    yield y
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1292
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1293
            yield struct.pack(">l", 0)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1294
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1295
        return genread(gengroup())
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1296
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1297
    def addchangegroup(self, source):
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1298
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1299
        def getchunk():
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1300
            d = source.read(4)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1301
            if not d: return ""
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1302
            l = struct.unpack(">l", d)[0]
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1303
            if l <= 4: return ""
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1304
            return source.read(l - 4)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1305
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1306
        def getgroup():
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1307
            while 1:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1308
                c = getchunk()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1309
                if not c: break
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1310
                yield c
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1311
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1312
        def csmap(x):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1313
            self.ui.debug("add changeset %s\n" % short(x))
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1314
            return self.changelog.count()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1315
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1316
        def revmap(x):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1317
            return self.changelog.rev(x)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1318
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1319
        if not source: return
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1320
        changesets = files = revisions = 0
225
1651a3e61925 fix repo locking
mpm@selenic.com
parents: 224
diff changeset
  1321
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1322
        tr = self.transaction()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1323
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1324
        # pull off the changeset group
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1325
        self.ui.status("adding changesets\n")
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1326
        co = self.changelog.tip()
224
ccbcc4d76f81 fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents: 223
diff changeset
  1327
        cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1328
        changesets = self.changelog.rev(cn) - self.changelog.rev(co)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1329
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1330
        # pull off the manifest group
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1331
        self.ui.status("adding manifests\n")
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1332
        mm = self.manifest.tip()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1333
        mo = self.manifest.addgroup(getgroup(), revmap, tr)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1334
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1335
        # process the files
772
f05deda58457 Make pull count jargon less confusing
mpm@selenic.com
parents: 768
diff changeset
  1336
        self.ui.status("adding file changes\n")
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1337
        while 1:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1338
            f = getchunk()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1339
            if not f: break
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1340
            self.ui.debug("adding %s revisions\n" % f)
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1341
            fl = self.file(f)
529
aace5b681fe9 Attempt to fix negative revision count from pull
mpm@selenic.com
parents: 522
diff changeset
  1342
            o = fl.count()
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1343
            n = fl.addgroup(getgroup(), revmap, tr)
529
aace5b681fe9 Attempt to fix negative revision count from pull
mpm@selenic.com
parents: 522
diff changeset
  1344
            revisions += fl.count() - o
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1345
            files += 1
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1346
772
f05deda58457 Make pull count jargon less confusing
mpm@selenic.com
parents: 768
diff changeset
  1347
        self.ui.status(("added %d changesets" +
f05deda58457 Make pull count jargon less confusing
mpm@selenic.com
parents: 768
diff changeset
  1348
                        " with %d changes to %d files\n")
f05deda58457 Make pull count jargon less confusing
mpm@selenic.com
parents: 768
diff changeset
  1349
                       % (changesets, revisions, files))
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1350
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1351
        tr.close()
780
5cb8a3a023b2 Add changegroup hook for push/pull
mpm@selenic.com
parents: 772
diff changeset
  1352
5cb8a3a023b2 Add changegroup hook for push/pull
mpm@selenic.com
parents: 772
diff changeset
  1353
        if not self.hook("changegroup"):
5cb8a3a023b2 Add changegroup hook for push/pull
mpm@selenic.com
parents: 772
diff changeset
  1354
            return 1
5cb8a3a023b2 Add changegroup hook for push/pull
mpm@selenic.com
parents: 772
diff changeset
  1355
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1356
        return
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1357
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1358
    def update(self, node, allow=False, force=False, choose=None,
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1359
               moddirstate=True):
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1360
        pl = self.dirstate.parents()
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1361
        if not force and pl[1] != nullid:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1362
            self.ui.warn("aborting: outstanding uncommitted merges\n")
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
  1363
            return 1
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
  1364
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1365
        p1, p2 = pl[0], node
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1366
        pa = self.changelog.ancestor(p1, p2)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1367
        m1n = self.changelog.read(p1)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1368
        m2n = self.changelog.read(p2)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1369
        man = self.manifest.ancestor(m1n, m2n)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1370
        m1 = self.manifest.read(m1n)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1371
        mf1 = self.manifest.readflags(m1n)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1372
        m2 = self.manifest.read(m2n)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1373
        mf2 = self.manifest.readflags(m2n)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1374
        ma = self.manifest.read(man)
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents: 408
diff changeset
  1375
        mfa = self.manifest.readflags(man)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1376
723
9e0f3ba4a9c2 Work on walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 705
diff changeset
  1377
        (c, a, d, u) = self.changes()
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1378
408
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1379
        # is this a jump, or a merge?  i.e. is there a linear path
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1380
        # from p1 to p2?
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1381
        linear_path = (pa == p1 or pa == p2)
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1382
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1383
        # resolve the manifest to determine which files
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1384
        # we care about merging
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1385
        self.ui.note("resolving manifests\n")
650
2c934c7b79dc Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents: 649
diff changeset
  1386
        self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" %
2c934c7b79dc Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents: 649
diff changeset
  1387
                      (force, allow, moddirstate, linear_path))
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1388
        self.ui.debug(" ancestor %s local %s remote %s\n" %
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1389
                      (short(man), short(m1n), short(m2n)))
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1390
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1391
        merge = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1392
        get = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1393
        remove = []
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1394
        mark = {}
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
  1395
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1396
        # construct a working dir manifest
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1397
        mw = m1.copy()
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1398
        mfw = mf1.copy()
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1399
        umap = dict.fromkeys(u)
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1400
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1401
        for f in a + c + u:
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1402
            mw[f] = ""
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
  1403
            mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1404
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1405
        for f in d:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1406
            if f in mw: del mw[f]
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1407
408
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1408
            # If we're jumping between revisions (as opposed to merging),
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1409
            # and if neither the working directory nor the target rev has
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1410
            # the file, then we need to remove it from the dirstate, to
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1411
            # prevent the dirstate from listing the file when it is no
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1412
            # longer in the manifest.
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1413
            if moddirstate and linear_path and f not in m2:
408
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1414
                self.dirstate.forget((f,))
3695fbd2c33b [PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents: 407
diff changeset
  1415
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1416
        # Compare manifests
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1417
        for f, n in mw.iteritems():
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1418
            if choose and not choose(f): continue
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1419
            if f in m2:
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1420
                s = 0
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1421
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1422
                # is the wfile new since m1, and match m2?
428
183c87d4e1a0 Fix typo in merging new files
mpm@selenic.com
parents: 421
diff changeset
  1423
                if f not in m1:
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1424
                    t1 = self.wfile(f).read()
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1425
                    t2 = self.file(f).revision(m2[f])
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1426
                    if cmp(t1, t2) == 0:
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1427
                        mark[f] = 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1428
                        n = m2[f]
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1429
                    del t1, t2
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents: 405
diff changeset
  1430
296
a3d83bf86755 hg update: fix clobbering files when going backwards
mpm@selenic.com
parents: 292
diff changeset
  1431
                # are files different?
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1432
                if n != m2[f]:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1433
                    a = ma.get(f, nullid)
296
a3d83bf86755 hg update: fix clobbering files when going backwards
mpm@selenic.com
parents: 292
diff changeset
  1434
                    # are both different from the ancestor?
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1435
                    if n != a and m2[f] != a:
273
4f8174389001 merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents: 263
diff changeset
  1436
                        self.ui.debug(" %s versions differ, resolve\n" % f)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1437
                        # merge executable bits
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1438
                        # "if we changed or they changed, change in merge"
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1439
                        a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1440
                        mode = ((a^b) | (a^c)) ^ a
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1441
                        merge[f] = (m1.get(f, nullid), m2[f], mode)
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1442
                        s = 1
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1443
                    # are we clobbering?
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1444
                    # is remote's version newer?
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1445
                    # or are we going back in time?
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1446
                    elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]):
273
4f8174389001 merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents: 263
diff changeset
  1447
                        self.ui.debug(" remote %s is newer, get\n" % f)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1448
                        get[f] = m2[f]
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1449
                        s = 1
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1450
                    else:
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1451
                        mark[f] = 1
576
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1452
                elif f in umap:
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1453
                    # this unknown file is the same as the checkout
da11baf5de7b Handle unknown files better on update
mpm@selenic.com
parents: 575
diff changeset
  1454
                    get[f] = m2[f]
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1455
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1456
                if not s and mfw[f] != mf2[f]:
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1457
                    if force:
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1458
                        self.ui.debug(" updating permissions for %s\n" % f)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
  1459
                        util.set_exec(self.wjoin(f), mf2[f])
277
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1460
                    else:
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1461
                        a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1462
                        mode = ((a^b) | (a^c)) ^ a
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1463
                        if mode != b:
79279550c8ff merge: update permissions even if file contents didn't change
mpm@selenic.com
parents: 276
diff changeset
  1464
                            self.ui.debug(" updating permissions for %s\n" % f)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
  1465
                            util.set_exec(self.wjoin(f), mode)
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1466
                            mark[f] = 1
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1467
                del m2[f]
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1468
            elif f in ma:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1469
                if n != ma[f]:
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1470
                    r = "d"
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1471
                    if not force and (linear_path or allow):
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
  1472
                        r = self.ui.prompt(
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
  1473
                            (" local changed %s which remote deleted\n" % f) +
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
  1474
                            "(k)eep or (d)elete?", "[kd]", "k")
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1475
                    if r == "d":
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1476
                        remove.append(f)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1477
                else:
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1478
                    self.ui.debug("other deleted %s\n" % f)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1479
                    remove.append(f) # other deleted it
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1480
            else:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1481
                if n == m1.get(f, nullid): # same as parent
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents: 377
diff changeset
  1482
                    if p2 == pa: # going backwards?
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents: 377
diff changeset
  1483
                        self.ui.debug("remote deleted %s\n" % f)
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents: 377
diff changeset
  1484
                        remove.append(f)
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents: 377
diff changeset
  1485
                    else:
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents: 377
diff changeset
  1486
                        self.ui.debug("local created %s, keeping\n" % f)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1487
                else:
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1488
                    self.ui.debug("working dir created %s, keeping\n" % f)
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
  1489
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1490
        for f, n in m2.iteritems():
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1491
            if choose and not choose(f): continue
256
649ed23e4661 minor fixes for update()
mpm@selenic.com
parents: 254
diff changeset
  1492
            if f[0] == "/": continue
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1493
            if f in ma and n != ma[f]:
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1494
                r = "k"
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1495
                if not force and (linear_path or allow):
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
  1496
                    r = self.ui.prompt(
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
  1497
                        ("remote changed %s which local deleted\n" % f) +
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents: 413
diff changeset
  1498
                        "(k)eep or (d)elete?", "[kd]", "k")
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1499
                if r == "k": get[f] = n
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1500
            elif f not in ma:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1501
                self.ui.debug("remote created %s\n" % f)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1502
                get[f] = n
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 611
diff changeset
  1503
            else:
680
4b7b79d2db2c Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents: 679
diff changeset
  1504
                if force or p2 == pa: # going backwards?
4b7b79d2db2c Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents: 679
diff changeset
  1505
                    self.ui.debug("local deleted %s, recreating\n" % f)
650
2c934c7b79dc Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents: 649
diff changeset
  1506
                    get[f] = n
680
4b7b79d2db2c Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents: 679
diff changeset
  1507
                else:
4b7b79d2db2c Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents: 679
diff changeset
  1508
                    self.ui.debug("local deleted %s\n" % f)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1509
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1510
        del mw, m1, m2, ma
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1511
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1512
        if force:
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1513
            for f in merge:
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1514
                get[f] = merge[f][1]
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1515
            merge = {}
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1516
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
  1517
        if linear_path or force:
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1518
            # we don't need to do any magic, just jump to the new rev
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1519
            mode = 'n'
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1520
            p1, p2 = p2, nullid
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1521
        else:
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1522
            if not allow:
305
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1523
                self.ui.status("this update spans a branch" +
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1524
                               " affecting the following files:\n")
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1525
                fl = merge.keys() + get.keys()
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1526
                fl.sort()
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1527
                for f in fl:
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1528
                    cf = ""
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1529
                    if f in merge: cf = " (resolve)"
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1530
                    self.ui.status(" %s%s\n" % (f, cf))
719812eb0156 more merge fixes
mpm@selenic.com
parents: 302
diff changeset
  1531
                self.ui.warn("aborting update spanning branches!\n")
788
64d2a558c943 add note about -C to update message
mpm@selenic.com
parents: 786
diff changeset
  1532
                self.ui.status("(use update -m to merge across branches" +
64d2a558c943 add note about -C to update message
mpm@selenic.com
parents: 786
diff changeset
  1533
                               " or -C to lose changes)\n")
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1534
                return 1
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1535
            # we have to remember what files we needed to get/change
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1536
            # because any file that's different from either one of its
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1537
            # parents must be in the changeset
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1538
            mode = 'm'
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1539
            if moddirstate:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1540
                self.dirstate.update(mark.keys(), "m")
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 253
diff changeset
  1541
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1542
        if moddirstate:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1543
            self.dirstate.setparents(p1, p2)
191
d7e859cf2f1b merge: add count of new manifests, files, and revisions
mpm@selenic.com
parents: 190
diff changeset
  1544
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1545
        # get the files we don't need to change
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1546
        files = get.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1547
        files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1548
        for f in files:
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1549
            if f[0] == "/": continue
273
4f8174389001 merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents: 263
diff changeset
  1550
            self.ui.note("getting %s\n" % f)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1551
            t = self.file(f).read(get[f])
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1552
            try:
291
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
  1553
                self.wfile(f, "w").write(t)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1554
            except IOError:
297
0dbcf3c9ff20 Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 292
diff changeset
  1555
                os.makedirs(os.path.dirname(self.wjoin(f)))
291
2c4f2be05587 Add wopener for opening files in the working directory
mpm@selenic.com
parents: 288
diff changeset
  1556
                self.wfile(f, "w").write(t)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
  1557
            util.set_exec(self.wjoin(f), mf2[f])
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1558
            if moddirstate:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1559
                self.dirstate.update([f], mode)
46
93e868fa0db8 Add changegroup support
mpm@selenic.com
parents: 44
diff changeset
  1560
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1561
        # merge the tricky bits
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1562
        files = merge.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1563
        files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1564
        for f in files:
256
649ed23e4661 minor fixes for update()
mpm@selenic.com
parents: 254
diff changeset
  1565
            self.ui.status("merging %s\n" % f)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
  1566
            m, o, flag = merge[f]
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1567
            self.merge3(f, m, o)
441
e8af362cfb01 Permission handling for the other OS
mpm@selenic.com
parents: 436
diff changeset
  1568
            util.set_exec(self.wjoin(f), flag)
768
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 765
diff changeset
  1569
            if moddirstate and mode == 'm':
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 765
diff changeset
  1570
                # only update dirstate on branch merge, otherwise we
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 765
diff changeset
  1571
                # could mark files with changes as unchanged
764
eea96285cbf9 Don't mark files with 'm'erge unless we're actually merging branches
mpm@selenic.com
parents: 753
diff changeset
  1572
                self.dirstate.update([f], mode)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1573
681
32b6bbf1c37b Sort files for removal
Matt Mackall <mpm@selenic.com>
parents: 680
diff changeset
  1574
        remove.sort()
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1575
        for f in remove:
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1576
            self.ui.note("removing %s\n" % f)
690
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
  1577
            try:
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
  1578
                os.unlink(f)
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
  1579
            except OSError, inst:
f762860f82c6 Minor merge fixups
mpm@selenic.com
parents: 686
diff changeset
  1580
                self.ui.warn("update failed to remove %s: %s!\n" % (f, inst))
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents: 576
diff changeset
  1581
            # try removing directories that might now be empty
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents: 576
diff changeset
  1582
            try: os.removedirs(os.path.dirname(f))
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents: 576
diff changeset
  1583
            except: pass
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1584
        if moddirstate:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1585
            if mode == 'n':
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1586
                self.dirstate.forget(remove)
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1587
            else:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
  1588
                self.dirstate.update(remove, 'r')
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1589
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1590
    def merge3(self, fn, my, other):
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1591
        """perform a 3-way merge in the working directory"""
249
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 247
diff changeset
  1592
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1593
        def temp(prefix, node):
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1594
            pre = "%s~%s." % (os.path.basename(fn), prefix)
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1595
            (fd, name) = tempfile.mkstemp("", pre)
417
f2d1f5fd0179 [PATCH] file type fixes for the other 'OS'
mpm@selenic.com
parents: 416
diff changeset
  1596
            f = os.fdopen(fd, "wb")
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1597
            f.write(fl.revision(node))
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1598
            f.close()
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1599
            return name
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1600
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1601
        fl = self.file(fn)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1602
        base = fl.ancestor(my, other)
244
43105253cf5e root relative IO and valid commit states
mpm@selenic.com
parents: 241
diff changeset
  1603
        a = self.wjoin(fn)
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents: 344
diff changeset
  1604
        b = temp("base", base)
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents: 344
diff changeset
  1605
        c = temp("other", other)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1606
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1607
        self.ui.note("resolving %s\n" % fn)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1608
        self.ui.debug("file %s: other %s ancestor %s\n" %
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1609
                              (fn, short(other), short(base)))
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1610
703
fb6f85ecc863 merge program setting from hgrc wasn't used.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 691
diff changeset
  1611
        cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
fb6f85ecc863 merge program setting from hgrc wasn't used.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 691
diff changeset
  1612
               or "hgmerge")
240
737c66b68290 Replace tkmerge with hgmerge
mpm@selenic.com
parents: 232
diff changeset
  1613
        r = os.system("%s %s %s %s" % (cmd, a, b, c))
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1614
        if r:
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 273
diff changeset
  1615
            self.ui.warn("merging %s failed!\n" % fn)
232
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1616
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1617
        os.unlink(b)
fc4a6e5b5812 hg resolve: merge a given node into the working directory
mpm@selenic.com
parents: 231
diff changeset
  1618
        os.unlink(c)
96
fce47326677c Add updated merge3 code
mpm@selenic.com
parents: 95
diff changeset
  1619
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1620
    def verify(self):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1621
        filelinkrevs = {}
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1622
        filenodes = {}
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1623
        changesets = revisions = files = 0
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1624
        errors = 0
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1625
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1626
        seen = {}
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1627
        self.ui.status("checking changesets\n")
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1628
        for i in range(self.changelog.count()):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1629
            changesets += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1630
            n = self.changelog.node(i)
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1631
            if n in seen:
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1632
                self.ui.warn("duplicate changeset at revision %d\n" % i)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1633
                errors += 1
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1634
            seen[n] = 1
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
  1635
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1636
            for p in self.changelog.parents(n):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1637
                if p not in self.changelog.nodemap:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1638
                    self.ui.warn("changeset %s has unknown parent %s\n" %
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1639
                                 (short(n), short(p)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1640
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1641
            try:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1642
                changes = self.changelog.read(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1643
            except Exception, inst:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1644
                self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1645
                errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1646
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1647
            for f in changes[3]:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1648
                filelinkrevs.setdefault(f, []).append(i)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1649
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1650
        seen = {}
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1651
        self.ui.status("checking manifests\n")
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1652
        for i in range(self.manifest.count()):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1653
            n = self.manifest.node(i)
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1654
            if n in seen:
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1655
                self.ui.warn("duplicate manifest at revision %d\n" % i)
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1656
                errors += 1
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1657
            seen[n] = 1
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
  1658
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1659
            for p in self.manifest.parents(n):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1660
                if p not in self.manifest.nodemap:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1661
                    self.ui.warn("manifest %s has unknown parent %s\n" %
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1662
                            (short(n), short(p)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1663
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1664
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1665
            try:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1666
                delta = mdiff.patchtext(self.manifest.delta(n))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1667
            except KeyboardInterrupt:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 579
diff changeset
  1668
                self.ui.warn("aborted")
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1669
                sys.exit(0)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1670
            except Exception, inst:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1671
                self.ui.warn("unpacking manifest %s: %s\n"
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1672
                             % (short(n), inst))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1673
                errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1674
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1675
            ff = [ l.split('\0') for l in delta.splitlines() ]
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1676
            for f, fn in ff:
284
d7c2efd0b541 verify: don't die from new permission bits
mpm@selenic.com
parents: 279
diff changeset
  1677
                filenodes.setdefault(f, {})[bin(fn[:40])] = 1
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1678
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1679
        self.ui.status("crosschecking files in changesets and manifests\n")
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1680
        for f in filenodes:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1681
            if f not in filelinkrevs:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1682
                self.ui.warn("file %s in manifest but not in changesets\n" % f)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1683
                errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1684
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1685
        for f in filelinkrevs:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1686
            if f not in filenodes:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1687
                self.ui.warn("file %s in changeset but not in manifest\n" % f)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1688
                errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1689
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1690
        self.ui.status("checking files\n")
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1691
        ff = filenodes.keys()
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1692
        ff.sort()
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1693
        for f in ff:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1694
            if f == "/dev/null": continue
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1695
            files += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1696
            fl = self.file(f)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1697
            nodes = { nullid: 1 }
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1698
            seen = {}
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1699
            for i in range(fl.count()):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1700
                revisions += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1701
                n = fl.node(i)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1702
302
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1703
                if n in seen:
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1704
                    self.ui.warn("%s: duplicate revision %d\n" % (f, i))
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1705
                    errors += 1
498fb0fa2795 various fixups for git import
mpm@selenic.com
parents: 299
diff changeset
  1706
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1707
                if n not in filenodes[f]:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1708
                    self.ui.warn("%s: %d:%s not in manifests\n"
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1709
                                 % (f, i, short(n)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1710
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1711
                else:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1712
                    del filenodes[f][n]
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1713
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1714
                flr = fl.linkrev(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1715
                if flr not in filelinkrevs[f]:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1716
                    self.ui.warn("%s:%s points to unexpected changeset %d\n"
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1717
                            % (f, short(n), fl.linkrev(n)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1718
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1719
                else:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1720
                    filelinkrevs[f].remove(flr)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1721
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1722
                # verify contents
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1723
                try:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1724
                    t = fl.read(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1725
                except Exception, inst:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1726
                    self.ui.warn("unpacking file %s %s: %s\n"
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1727
                                 % (f, short(n), inst))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1728
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1729
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1730
                # verify parents
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1731
                (p1, p2) = fl.parents(n)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1732
                if p1 not in nodes:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1733
                    self.ui.warn("file %s:%s unknown parent 1 %s" %
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1734
                            (f, short(n), short(p1)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1735
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1736
                if p2 not in nodes:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1737
                    self.ui.warn("file %s:%s unknown parent 2 %s" %
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1738
                            (f, short(n), short(p1)))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1739
                    errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1740
                nodes[n] = 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1741
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1742
            # cross-check
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1743
            for node in filenodes[f]:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1744
                self.ui.warn("node %s in manifests not in %s\n"
721
fed842bb84b2 Fix verify error reporting bug
mpm@selenic.com
parents: 713
diff changeset
  1745
                             % (hex(node), f))
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1746
                errors += 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1747
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1748
        self.ui.status("%d files, %d changesets, %d total revisions\n" %
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1749
                       (files, changesets, revisions))
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1750
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1751
        if errors:
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1752
            self.ui.warn("%d integrity errors encountered!\n" % errors)
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1753
            return 1
863b508c5b36 migrate verify
mpm@selenic.com
parents: 244
diff changeset
  1754
623
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  1755
class httprepository:
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1756
    def __init__(self, ui, path):
765
1e31d97c3d70 Hack to fix missing '/' problem in URLs
mpm@selenic.com
parents: 764
diff changeset
  1757
        # fix missing / after hostname
1e31d97c3d70 Hack to fix missing '/' problem in URLs
mpm@selenic.com
parents: 764
diff changeset
  1758
        s = urlparse.urlsplit(path)
1e31d97c3d70 Hack to fix missing '/' problem in URLs
mpm@selenic.com
parents: 764
diff changeset
  1759
        partial = s[2]
1e31d97c3d70 Hack to fix missing '/' problem in URLs
mpm@selenic.com
parents: 764
diff changeset
  1760
        if not partial: partial = "/"
1e31d97c3d70 Hack to fix missing '/' problem in URLs
mpm@selenic.com
parents: 764
diff changeset
  1761
        self.url = urlparse.urlunsplit((s[0], s[1], partial, '', ''))
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1762
        self.ui = ui
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1763
        no_list = [ "localhost", "127.0.0.1" ]
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1764
        host = ui.config("http_proxy", "host")
424
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1765
        if host is None:
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1766
            host = os.environ.get("http_proxy")
426
8c90ab5644c9 Allow hgrc's proxy host and $http_proxy env var to start with http://
Thomas Arendsen Hein <thomas@intevation.de>
parents: 424
diff changeset
  1767
        if host and host.startswith('http://'):
8c90ab5644c9 Allow hgrc's proxy host and $http_proxy env var to start with http://
Thomas Arendsen Hein <thomas@intevation.de>
parents: 424
diff changeset
  1768
            host = host[7:]
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1769
        user = ui.config("http_proxy", "user")
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1770
        passwd = ui.config("http_proxy", "passwd")
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1771
        no = ui.config("http_proxy", "no")
424
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1772
        if no is None:
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1773
            no = os.environ.get("no_proxy")
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1774
        if no:
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1775
            no_list = no_list + no.split(",")
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 514
diff changeset
  1776
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1777
        no_proxy = 0
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1778
        for h in no_list:
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1779
            if (path.startswith("http://" + h + "/") or
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1780
                path.startswith("http://" + h + ":") or
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1781
                path == "http://" + h):
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1782
                no_proxy = 1
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1783
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1784
        # Note: urllib2 takes proxy values from the environment and those will
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1785
        # take precedence
424
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1786
        for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1787
            if os.environ.has_key(env):
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 385
diff changeset
  1788
                del os.environ[env]
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1789
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1790
        proxy_handler = urllib2.BaseHandler()
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1791
        if host and not no_proxy:
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1792
            proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host})
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1793
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1794
        authinfo = None
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1795
        if user and passwd:
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1796
            passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1797
            passmgr.add_password(None, host, user, passwd)
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1798
            authinfo = urllib2.ProxyBasicAuthHandler(passmgr)
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1799
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1800
        opener = urllib2.build_opener(proxy_handler, authinfo)
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 317
diff changeset
  1801
        urllib2.install_opener(opener)
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1802
634
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
  1803
    def dev(self):
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
  1804
        return -1
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
  1805
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1806
    def do_cmd(self, cmd, **args):
83
9fd5b35cfc45 Add -q quiet option
mpm@selenic.com
parents: 79
diff changeset
  1807
        self.ui.debug("sending %s command\n" % cmd)
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1808
        q = {"cmd": cmd}
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1809
        q.update(args)
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1810
        qs = urllib.urlencode(q)
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1811
        cu = "%s?%s" % (self.url, qs)
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1812
        resp = urllib2.urlopen(cu)
753
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1813
        proto = resp.headers['content-type']
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1814
753
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1815
        # accept old "text/plain" and "application/hg-changegroup" for now
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1816
        if not proto.startswith('application/mercurial') and \
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1817
               not proto.startswith('text/plain') and \
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1818
               not proto.startswith('application/hg-changegroup'):
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1819
            raise RepoError("'%s' does not appear to be an hg repository"
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1820
                            % self.url)
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1821
753
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1822
        if proto.startswith('application/mercurial'):
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1823
            version = proto[22:]
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1824
            if float(version) > 0.1:
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1825
                raise RepoError("'%s' uses newer protocol %s" %
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1826
                                (self.url, version))
8760d0c83b9b Check protocol versions
mpm@selenic.com
parents: 752
diff changeset
  1827
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1828
        return resp
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1829
222
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1830
    def heads(self):
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1831
        d = self.do_cmd("heads").read()
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1832
        try:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1833
            return map(bin, d[:-1].split(" "))
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1834
        except:
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1835
            self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1836
            raise
87484f627422 make pull work for multiple heads
mpm@selenic.com
parents: 220
diff changeset
  1837
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1838
    def branches(self, nodes):
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1839
        n = " ".join(map(hex, nodes))
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1840
        d = self.do_cmd("branches", nodes=n).read()
217
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1841
        try:
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1842
            br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1843
            return br
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1844
        except:
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1845
            self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1846
            raise
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1847
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1848
    def between(self, pairs):
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1849
        n = "\n".join(["-".join(map(hex, p)) for p in pairs])
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1850
        d = self.do_cmd("between", pairs=n).read()
217
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1851
        try:
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1852
            p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1853
            return p
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1854
        except:
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1855
            self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
e6d6497a6331 merge: catch unexpected responses
mpm@selenic.com
parents: 216
diff changeset
  1856
            raise
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1857
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1858
    def changegroup(self, nodes):
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1859
        n = " ".join(map(hex, nodes))
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1860
        f = self.do_cmd("changegroup", roots=n)
192
5d8553352d2e Changes to network protocol
mpm@selenic.com
parents: 191
diff changeset
  1861
        bytes = 0
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1862
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1863
        class zread:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1864
            def __init__(self, f):
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1865
                self.zd = zlib.decompressobj()
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1866
                self.f = f
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1867
                self.buf = ""
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1868
            def read(self, l):
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1869
                while l > len(self.buf):
751
0b245edec124 When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg)
Muli Ben-Yehuda <mulix@mulix.org>
parents: 741
diff changeset
  1870
                    r = self.f.read(4096)
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1871
                    if r:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1872
                        self.buf += self.zd.decompress(r)
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1873
                    else:
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1874
                        self.buf += self.zd.flush()
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1875
                        break
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1876
                d, self.buf = self.buf[:l], self.buf[l:]
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1877
                return d
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1878
752
c693eafd5967 Simplify content type checking
mpm@selenic.com
parents: 751
diff changeset
  1879
        return zread(f)
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1880
638
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1881
class remotelock:
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1882
    def __init__(self, repo):
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1883
        self.repo = repo
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1884
    def release(self):
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1885
        self.repo.unlock()
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1886
        self.repo = None
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1887
    def __del__(self):
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1888
        if self.repo:
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1889
            self.release()
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  1890
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1891
class sshrepository:
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1892
    def __init__(self, ui, path):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1893
        self.url = path
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1894
        self.ui = ui
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1895
817
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1896
        m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))', path)
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1897
        if not m:
817
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1898
            raise RepoError("couldn't parse destination %s" % path)
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1899
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1900
        self.user = m.group(2)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1901
        self.host = m.group(3)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1902
        self.port = m.group(5)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1903
        self.path = m.group(7)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1904
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1905
        args = self.user and ("%s@%s" % (self.user, self.host)) or self.host
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1906
        args = self.port and ("%s -p %s") % (args, self.port) or args
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1907
        path = self.path or ""
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1908
817
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1909
        if not path:
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1910
            raise RepoError("no remote repository path specified")
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1911
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1912
        cmd = "ssh %s 'hg -R %s serve --stdio'"
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1913
        cmd = cmd % (args, path)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1914
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1915
        self.pipeo, self.pipei, self.pipee = os.popen3(cmd)
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1916
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1917
    def readerr(self):
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1918
        while 1:
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1919
            r,w,x = select.select([self.pipee], [], [], 0)
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1920
            if not r: break
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1921
            l = self.pipee.readline()
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1922
            if not l: break
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1923
            self.ui.status("remote: ", l)
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1924
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1925
    def __del__(self):
817
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1926
        try:
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1927
            self.pipeo.close()
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1928
            self.pipei.close()
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1929
            for l in self.pipee:
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1930
                self.ui.status("remote: ", l)
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1931
            self.pipee.close()
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1932
        except:
cf1d9a01dd92 Make ssh URL parsing more robust
mpm@selenic.com
parents: 816
diff changeset
  1933
            pass
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1934
634
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
  1935
    def dev(self):
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
  1936
        return -1
da5378d39269 Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents: 627
diff changeset
  1937
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1938
    def do_cmd(self, cmd, **args):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1939
        self.ui.debug("sending %s command\n" % cmd)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1940
        self.pipeo.write("%s\n" % cmd)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1941
        for k, v in args.items():
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1942
            self.pipeo.write("%s %d\n" % (k, len(v)))
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1943
            self.pipeo.write(v)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1944
        self.pipeo.flush()
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1945
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1946
        return self.pipei
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1947
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1948
    def call(self, cmd, **args):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1949
        r = self.do_cmd(cmd, **args)
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1950
        l = r.readline()
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1951
        self.readerr()
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1952
        try:
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1953
            l = int(l)
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1954
        except:
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1955
            raise RepoError("unexpected response '%s'" % l)
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1956
        return r.read(l)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1957
638
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1958
    def lock(self):
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1959
        self.call("lock")
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1960
        return remotelock(self)
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1961
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1962
    def unlock(self):
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1963
        self.call("unlock")
35f7adfefa69 Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents: 637
diff changeset
  1964
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1965
    def heads(self):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1966
        d = self.call("heads")
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1967
        try:
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1968
            return map(bin, d[:-1].split(" "))
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1969
        except:
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1970
            raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1971
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1972
    def branches(self, nodes):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1973
        n = " ".join(map(hex, nodes))
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1974
        d = self.call("branches", nodes=n)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1975
        try:
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1976
            br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1977
            return br
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1978
        except:
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1979
            raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1980
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1981
    def between(self, pairs):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1982
        n = "\n".join(["-".join(map(hex, p)) for p in pairs])
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1983
        d = self.call("between", pairs=n)
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1984
        try:
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1985
            p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1986
            return p
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1987
        except:
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  1988
            raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1989
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1990
    def changegroup(self, nodes):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1991
        n = " ".join(map(hex, nodes))
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1992
        f = self.do_cmd("changegroup", roots=n)
635
85e2209d401c Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents: 634
diff changeset
  1993
        return self.pipei
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  1994
639
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  1995
    def addchangegroup(self, cg):
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  1996
        d = self.call("addchangegroup")
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  1997
        if d:
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  1998
            raise RepoError("push refused: %s", d)
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  1999
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2000
        while 1:
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2001
            d = cg.read(4096)
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2002
            if not d: break
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2003
            self.pipeo.write(d)
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  2004
            self.readerr()
639
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2005
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2006
        self.pipeo.flush()
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2007
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  2008
        self.readerr()
639
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2009
        l = int(self.pipei.readline())
646
342927da4f4c Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents: 644
diff changeset
  2010
        return self.pipei.read(l) != ""
639
31cebba881a0 Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents: 638
diff changeset
  2011
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  2012
def repository(ui, path=None, create=0):
623
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2013
    if path:
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2014
        if path.startswith("http://"):
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2015
            return httprepository(ui, path)
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2016
        if path.startswith("hg://"):
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2017
            return httprepository(ui, path.replace("hg://", "http://"))
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2018
        if path.startswith("old-http://"):
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2019
            return localrepository(ui, path.replace("old-http://", "http://"))
624
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  2020
        if path.startswith("ssh://"):
876333a295ff Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents: 623
diff changeset
  2021
            return sshrepository(ui, path)
60
e32fdbd97839 Add hg:// protocol
mpm@selenic.com
parents: 56
diff changeset
  2022
623
314867960a4a Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents: 622
diff changeset
  2023
    return localrepository(ui, path, create)