fix undefined variables, spotted by pylint

mercurial/dagparser.py

@@ -1,473 +1,474 b''
 # dagparser.py - parser and generator for concise description of DAGs
 #
 # Copyright 2010 Peter Arrenbrecht <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import re, string
 import util
+from i18n import _
 
 def parsedag(desc):
     '''parses a DAG from a concise textual description; generates events
 
     "+n" is a linear run of n nodes based on the current default parent
     "." is a single node based on the current default parent
     "$" resets the default parent to -1 (implied at the start);
         otherwise the default parent is always the last node created
     "<p" sets the default parent to the backref p
     "*p" is a fork at parent p, where p is a backref
     "*p1/p2/.../pn" is a merge of parents p1..pn, where the pi are backrefs
     "/p2/.../pn" is a merge of the preceding node and p2..pn
     ":name" defines a label for the preceding node; labels can be redefined
     "@text" emits an annotation event for text
     "!command" emits an action event for the current node
     "!!my command\n" is like "!", but to the end of the line
     "#...\n" is a comment up to the end of the line
 
     Whitespace between the above elements is ignored.
 
     A backref is either
      * a number n, which references the node curr-n, where curr is the current
        node, or
      * the name of a label you placed earlier using ":name", or
      * empty to denote the default parent.
 
     All string valued-elements are either strictly alphanumeric, or must
     be enclosed in double quotes ("..."), with "\" as escape character.
 
     Generates sequence of
 
       ('n', (id, [parentids])) for node creation
       ('l', (id, labelname)) for labels on nodes
       ('a', text) for annotations
       ('c', command) for actions (!)
       ('C', command) for line actions (!!)
 
     Examples
     --------
 
     Example of a complex graph (output not shown for brevity):
 
         >>> len(list(parsedag("""
         ...
         ... +3         # 3 nodes in linear run
         ... :forkhere  # a label for the last of the 3 nodes from above
         ... +5         # 5 more nodes on one branch
         ... :mergethis # label again
         ... <forkhere  # set default parent to labelled fork node
         ... +10        # 10 more nodes on a parallel branch
         ... @stable    # following nodes will be annotated as "stable"
         ... +5         # 5 nodes in stable
         ... !addfile   # custom command; could trigger new file in next node
         ... +2         # two more nodes
         ... /mergethis # merge last node with labelled node
         ... +4         # 4 more nodes descending from merge node
         ...
         ... """)))
         34
 
     Empty list:
 
         >>> list(parsedag(""))
         []
 
     A simple linear run:
 
         >>> list(parsedag("+3"))
         [('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [1]))]
 
     Some non-standard ways to define such runs:
 
         >>> list(parsedag("+1+2"))
         [('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [1]))]
 
         >>> list(parsedag("+1*1*"))
         [('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [1]))]
 
         >>> list(parsedag("*"))
         [('n', (0, [-1]))]
 
         >>> list(parsedag("..."))
         [('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [1]))]
 
     A fork and a join, using numeric back references:
 
         >>> list(parsedag("+2*2*/2"))
         [('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [0])), ('n', (3, [2, 1]))]
 
         >>> list(parsedag("+2<2+1/2"))
         [('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [0])), ('n', (3, [2, 1]))]
 
     Placing a label:
 
         >>> list(parsedag("+1 :mylabel +1"))
         [('n', (0, [-1])), ('l', (0, 'mylabel')), ('n', (1, [0]))]
 
     An empty label (silly, really):
 
         >>> list(parsedag("+1:+1"))
         [('n', (0, [-1])), ('l', (0, '')), ('n', (1, [0]))]
 
     Fork and join, but with labels instead of numeric back references:
 
         >>> list(parsedag("+1:f +1:p2 *f */p2"))
         [('n', (0, [-1])), ('l', (0, 'f')), ('n', (1, [0])), ('l', (1, 'p2')),
          ('n', (2, [0])), ('n', (3, [2, 1]))]
 
         >>> list(parsedag("+1:f +1:p2 <f +1 /p2"))
         [('n', (0, [-1])), ('l', (0, 'f')), ('n', (1, [0])), ('l', (1, 'p2')),
          ('n', (2, [0])), ('n', (3, [2, 1]))]
 
     Restarting from the root:
 
         >>> list(parsedag("+1 $ +1"))
         [('n', (0, [-1])), ('n', (1, [-1]))]
 
     Annotations, which are meant to introduce sticky state for subsequent nodes:
 
         >>> list(parsedag("+1 @ann +1"))
         [('n', (0, [-1])), ('a', 'ann'), ('n', (1, [0]))]
 
         >>> list(parsedag('+1 @"my annotation" +1'))
         [('n', (0, [-1])), ('a', 'my annotation'), ('n', (1, [0]))]
 
     Commands, which are meant to operate on the most recently created node:
 
         >>> list(parsedag("+1 !cmd +1"))
         [('n', (0, [-1])), ('c', 'cmd'), ('n', (1, [0]))]
 
         >>> list(parsedag('+1 !"my command" +1'))
         [('n', (0, [-1])), ('c', 'my command'), ('n', (1, [0]))]
 
         >>> list(parsedag('+1 !!my command line\\n +1'))
         [('n', (0, [-1])), ('C', 'my command line'), ('n', (1, [0]))]
 
     Comments, which extend to the end of the line:
 
         >>> list(parsedag('+1 # comment\\n+1'))
         [('n', (0, [-1])), ('n', (1, [0]))]
 
     Error:
 
         >>> try: list(parsedag('+1 bad'))
         ... except Exception, e: print e
         invalid character in dag description: bad...
 
     '''
     if not desc:
         return
 
     wordchars = string.ascii_letters + string.digits
 
     labels = {}
     p1 = -1
     r = 0
 
     def resolve(ref):
         if not ref:
             return p1
         elif ref[0] in string.digits:
             return r - int(ref)
         else:
             return labels[ref]
 
     chiter = (c for c in desc)
 
     def nextch():
         try:
             return chiter.next()
         except StopIteration:
             return '\0'
 
     def nextrun(c, allow):
         s = ''
         while c in allow:
             s += c
             c = nextch()
         return c, s
 
     def nextdelimited(c, limit, escape):
         s = ''
         while c != limit:
             if c == escape:
                 c = nextch()
             s += c
             c = nextch()
         return nextch(), s
 
     def nextstring(c):
         if c == '"':
             return nextdelimited(nextch(), '"', '\\')
         else:
             return nextrun(c, wordchars)
 
     c = nextch()
     while c != '\0':
         while c in string.whitespace:
             c = nextch()
         if c == '.':
             yield 'n', (r, [p1])
             p1 = r
             r += 1
             c = nextch()
         elif c == '+':
             c, digs = nextrun(nextch(), string.digits)
             n = int(digs)
             for i in xrange(0, n):
                 yield 'n', (r, [p1])
                 p1 = r
                 r += 1
         elif c == '*' or c == '/':
             if c == '*':
                 c = nextch()
             c, pref = nextstring(c)
             prefs = [pref]
             while c == '/':
                 c, pref = nextstring(nextch())
                 prefs.append(pref)
             ps = [resolve(ref) for ref in prefs]
             yield 'n', (r, ps)
             p1 = r
             r += 1
         elif c == '<':
             c, ref = nextstring(nextch())
             p1 = resolve(ref)
         elif c == ':':
             c, name = nextstring(nextch())
             labels[name] = p1
             yield 'l', (p1, name)
         elif c == '@':
             c, text = nextstring(nextch())
             yield 'a', text
         elif c == '!':
             c = nextch()
             if c == '!':
                 cmd = ''
                 c = nextch()
                 while c not in '\n\r\0':
                     cmd += c
                     c = nextch()
                 yield 'C', cmd
             else:
                 c, cmd = nextstring(c)
                 yield 'c', cmd
         elif c == '#':
             while c not in '\n\r\0':
                 c = nextch()
         elif c == '$':
             p1 = -1
             c = nextch()
         elif c == '\0':
             return # in case it was preceded by whitespace
         else:
             s = ''
             i = 0
             while c != '\0' and i < 10:
                 s += c
                 i += 1
                 c = nextch()
             raise util.Abort("invalid character in dag description: %s..." % s)
 
 def dagtextlines(events,
                  addspaces=True,
                  wraplabels=False,
                  wrapannotations=False,
                  wrapcommands=False,
                  wrapnonlinear=False,
                  usedots=False,
                  maxlinewidth=70):
     '''generates single lines for dagtext()'''
 
     def wrapstring(text):
         if re.match("^[0-9a-z]*$", text):
             return text
         return '"' + text.replace('\\', '\\\\').replace('"', '\"') + '"'
 
     def gen():
         labels = {}
         run = 0
         wantr = 0
         needroot = False
         for kind, data in events:
             if kind == 'n':
                 r, ps = data
 
                 # sanity check
                 if r != wantr:
                     raise util.Abort("Expected id %i, got %i" % (wantr, r))
                 if not ps:
                     ps = [-1]
                 else:
                     for p in ps:
                         if p >= r:
                             raise util.Abort("Parent id %i is larger than "
                                              "current id %i" % (p, r))
                 wantr += 1
 
                 # new root?
                 p1 = r - 1
                 if len(ps) == 1 and ps[0] == -1:
                     if needroot:
                         if run:
                             yield '+' + str(run)
                             run = 0
                         if wrapnonlinear:
                             yield '\n'
                         yield '$'
                         p1 = -1
                     else:
                         needroot = True
                 if len(ps) == 1 and ps[0] == p1:
                     if usedots:
                         yield "."
                     else:
                         run += 1
                 else:
                     if run:
                         yield '+' + str(run)
                         run = 0
                     if wrapnonlinear:
                         yield '\n'
                     prefs = []
                     for p in ps:
                         if p == p1:
                             prefs.append('')
                         elif p in labels:
                             prefs.append(labels[p])
                         else:
                             prefs.append(str(r - p))
                     yield '*' + '/'.join(prefs)
             else:
                 if run:
                     yield '+' + str(run)
                     run = 0
                 if kind == 'l':
                     rid, name = data
                     labels[rid] = name
                     yield ':' + name
                     if wraplabels:
                         yield '\n'
                 elif kind == 'c':
                     yield '!' + wrapstring(data)
                     if wrapcommands:
                         yield '\n'
                 elif kind == 'C':
                     yield '!!' + data
                     yield '\n'
                 elif kind == 'a':
                     if wrapannotations:
                         yield '\n'
                     yield '@' + wrapstring(data)
                 elif kind == '#':
                     yield '#' + data
                     yield '\n'
                 else:
                     raise util.Abort(_("invalid event type in dag: %s")
                                      % str((type, data)))
         if run:
             yield '+' + str(run)
 
     line = ''
     for part in gen():
         if part == '\n':
             if line:
                 yield line
                 line = ''
         else:
             if len(line) + len(part) >= maxlinewidth:
                 yield line
                 line = ''
             elif addspaces and line and part != '.':
                 line += ' '
             line += part
     if line:
         yield line
 
 def dagtext(dag,
             addspaces=True,
             wraplabels=False,
             wrapannotations=False,
             wrapcommands=False,
             wrapnonlinear=False,
             usedots=False,
             maxlinewidth=70):
     '''generates lines of a textual representation for a dag event stream
 
     events should generate what parsedag() does, so:
 
       ('n', (id, [parentids])) for node creation
       ('l', (id, labelname)) for labels on nodes
       ('a', text) for annotations
       ('c', text) for commands
       ('C', text) for line commands ('!!')
       ('#', text) for comment lines
 
     Parent nodes must come before child nodes.
 
     Examples
     --------
 
     Linear run:
 
         >>> dagtext([('n', (0, [-1])), ('n', (1, [0]))])
         '+2'
 
     Two roots:
 
         >>> dagtext([('n', (0, [-1])), ('n', (1, [-1]))])
         '+1 $ +1'
 
     Fork and join:
 
         >>> dagtext([('n', (0, [-1])), ('n', (1, [0])), ('n', (2, [0])),
         ...          ('n', (3, [2, 1]))])
         '+2 *2 */2'
 
     Fork and join with labels:
 
         >>> dagtext([('n', (0, [-1])), ('l', (0, 'f')), ('n', (1, [0])),
         ...          ('l', (1, 'p2')), ('n', (2, [0])), ('n', (3, [2, 1]))])
         '+1 :f +1 :p2 *f */p2'
 
     Annotations:
 
         >>> dagtext([('n', (0, [-1])), ('a', 'ann'), ('n', (1, [0]))])
         '+1 @ann +1'
 
         >>> dagtext([('n', (0, [-1])), ('a', 'my annotation'), ('n', (1, [0]))])
         '+1 @"my annotation" +1'
 
     Commands:
 
         >>> dagtext([('n', (0, [-1])), ('c', 'cmd'), ('n', (1, [0]))])
         '+1 !cmd +1'
 
         >>> dagtext([('n', (0, [-1])), ('c', 'my command'), ('n', (1, [0]))])
         '+1 !"my command" +1'
 
         >>> dagtext([('n', (0, [-1])), ('C', 'my command line'), ('n', (1, [0]))])
         '+1 !!my command line\\n+1'
 
     Comments:
 
         >>> dagtext([('n', (0, [-1])), ('#', ' comment'), ('n', (1, [0]))])
         '+1 # comment\\n+1'
 
         >>> dagtext([])
         ''
 
     Combining parsedag and dagtext:
 
         >>> dagtext(parsedag('+1 :f +1 :p2 *f */p2'))
         '+1 :f +1 :p2 *f */p2'
 
     '''
     return "\n".join(dagtextlines(dag,
                                   addspaces,
                                   wraplabels,
                                   wrapannotations,
                                   wrapcommands,
                                   wrapnonlinear,
                                   usedots,
                                   maxlinewidth))

mercurial/wireproto.py

@@ -1,332 +1,332 b''
 # wireproto.py - generic wire protocol support functions
 #
 # Copyright 2005-2010 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-import urllib, tempfile, os
+import urllib, tempfile, os, sys
 from i18n import _
 from node import bin, hex
 import changegroup as changegroupmod
 import repo, error, encoding, util, store
 import pushkey as pushkey_
 
 # list of nodes encoding / decoding
 
 def decodelist(l, sep=' '):
     return map(bin, l.split(sep))
 
 def encodelist(l, sep=' '):
     return sep.join(map(hex, l))
 
 # client side
 
 class wirerepository(repo.repository):
     def lookup(self, key):
         self.requirecap('lookup', _('look up remote revision'))
         d = self._call("lookup", key=key)
         success, data = d[:-1].split(" ", 1)
         if int(success):
             return bin(data)
         self._abort(error.RepoError(data))
 
     def heads(self):
         d = self._call("heads")
         try:
             return decodelist(d[:-1])
         except:
-            self.abort(error.ResponseError(_("unexpected response:"), d))
+            self._abort(error.ResponseError(_("unexpected response:"), d))
 
     def branchmap(self):
         d = self._call("branchmap")
         try:
             branchmap = {}
             for branchpart in d.splitlines():
                 branchname, branchheads = branchpart.split(' ', 1)
                 branchname = urllib.unquote(branchname)
                 # Earlier servers (1.3.x) send branch names in (their) local
                 # charset. The best we can do is assume it's identical to our
                 # own local charset, in case it's not utf-8.
                 try:
                     branchname.decode('utf-8')
                 except UnicodeDecodeError:
                     branchname = encoding.fromlocal(branchname)
                 branchheads = decodelist(branchheads)
                 branchmap[branchname] = branchheads
             return branchmap
         except TypeError:
             self._abort(error.ResponseError(_("unexpected response:"), d))
 
     def branches(self, nodes):
         n = encodelist(nodes)
         d = self._call("branches", nodes=n)
         try:
             br = [tuple(decodelist(b)) for b in d.splitlines()]
             return br
         except:
             self._abort(error.ResponseError(_("unexpected response:"), d))
 
     def between(self, pairs):
         batch = 8 # avoid giant requests
         r = []
         for i in xrange(0, len(pairs), batch):
             n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]])
             d = self._call("between", pairs=n)
             try:
                 r.extend(l and decodelist(l) or [] for l in d.splitlines())
             except:
                 self._abort(error.ResponseError(_("unexpected response:"), d))
         return r
 
     def pushkey(self, namespace, key, old, new):
         if not self.capable('pushkey'):
             return False
         d = self._call("pushkey",
                       namespace=namespace, key=key, old=old, new=new)
         return bool(int(d))
 
     def listkeys(self, namespace):
         if not self.capable('pushkey'):
             return {}
         d = self._call("listkeys", namespace=namespace)
         r = {}
         for l in d.splitlines():
             k, v = l.split('\t')
             r[k.decode('string-escape')] = v.decode('string-escape')
         return r
 
     def stream_out(self):
         return self._callstream('stream_out')
 
     def changegroup(self, nodes, kind):
         n = encodelist(nodes)
         f = self._callstream("changegroup", roots=n)
         return self._decompress(f)
 
     def changegroupsubset(self, bases, heads, kind):
         self.requirecap('changegroupsubset', _('look up remote changes'))
         bases = encodelist(bases)
         heads = encodelist(heads)
         return self._decompress(self._callstream("changegroupsubset",
                                                  bases=bases, heads=heads))
 
     def unbundle(self, cg, heads, source):
         '''Send cg (a readable file-like object representing the
         changegroup to push, typically a chunkbuffer object) to the
         remote server as a bundle. Return an integer indicating the
         result of the push (see localrepository.addchangegroup()).'''
 
         ret, output = self._callpush("unbundle", cg, heads=encodelist(heads))
         if ret == "":
             raise error.ResponseError(
                 _('push failed:'), output)
         try:
             ret = int(ret)
         except ValueError, err:
             raise error.ResponseError(
                 _('push failed (unexpected response):'), ret)
 
         for l in output.splitlines(True):
             self.ui.status(_('remote: '), l)
         return ret
 
 # server side
 
 class streamres(object):
     def __init__(self, gen):
         self.gen = gen
 
 class pushres(object):
     def __init__(self, res):
         self.res = res
 
 def dispatch(repo, proto, command):
     func, spec = commands[command]
     args = proto.getargs(spec)
     return func(repo, proto, *args)
 
 def between(repo, proto, pairs):
     pairs = [decodelist(p, '-') for p in pairs.split(" ")]
     r = []
     for b in repo.between(pairs):
         r.append(encodelist(b) + "\n")
     return "".join(r)
 
 def branchmap(repo, proto):
     branchmap = repo.branchmap()
     heads = []
     for branch, nodes in branchmap.iteritems():
         branchname = urllib.quote(branch)
         branchnodes = encodelist(nodes)
         heads.append('%s %s' % (branchname, branchnodes))
     return '\n'.join(heads)
 
 def branches(repo, proto, nodes):
     nodes = decodelist(nodes)
     r = []
     for b in repo.branches(nodes):
         r.append(encodelist(b) + "\n")
     return "".join(r)
 
 def capabilities(repo, proto):
     caps = 'lookup changegroupsubset branchmap pushkey'.split()
     if _allowstream(repo.ui):
         caps.append('stream=%d' % repo.changelog.version)
     caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority))
     return ' '.join(caps)
 
 def changegroup(repo, proto, roots):
     nodes = decodelist(roots)
     cg = repo.changegroup(nodes, 'serve')
     return streamres(proto.groupchunks(cg))
 
 def changegroupsubset(repo, proto, bases, heads):
     bases = decodelist(bases)
     heads = decodelist(heads)
     cg = repo.changegroupsubset(bases, heads, 'serve')
     return streamres(proto.groupchunks(cg))
 
 def heads(repo, proto):
     h = repo.heads()
     return encodelist(h) + "\n"
 
 def hello(repo, proto):
     '''the hello command returns a set of lines describing various
     interesting things about the server, in an RFC822-like format.
     Currently the only one defined is "capabilities", which
     consists of a line in the form:
 
     capabilities: space separated list of tokens
     '''
     return "capabilities: %s\n" % (capabilities(repo, proto))
 
 def listkeys(repo, proto, namespace):
     d = pushkey_.list(repo, namespace).items()
     t = '\n'.join(['%s\t%s' % (k.encode('string-escape'),
                                v.encode('string-escape')) for k, v in d])
     return t
 
 def lookup(repo, proto, key):
     try:
         r = hex(repo.lookup(key))
         success = 1
     except Exception, inst:
         r = str(inst)
         success = 0
     return "%s %s\n" % (success, r)
 
 def pushkey(repo, proto, namespace, key, old, new):
     r = pushkey_.push(repo, namespace, key, old, new)
     return '%s\n' % int(r)
 
 def _allowstream(ui):
     return ui.configbool('server', 'uncompressed', True, untrusted=True)
 
 def stream(repo, proto):
     '''If the server supports streaming clone, it advertises the "stream"
     capability with a value representing the version and flags of the repo
     it is serving. Client checks to see if it understands the format.
 
     The format is simple: the server writes out a line with the amount
     of files, then the total amount of bytes to be transfered (separated
     by a space). Then, for each file, the server first writes the filename
     and filesize (separated by the null character), then the file contents.
     '''
 
     if not _allowstream(repo.ui):
         return '1\n'
 
     entries = []
     total_bytes = 0
     try:
         # get consistent snapshot of repo, lock during scan
         lock = repo.lock()
         try:
             repo.ui.debug('scanning\n')
             for name, ename, size in repo.store.walk():
                 entries.append((name, size))
                 total_bytes += size
         finally:
             lock.release()
     except error.LockError:
         return '2\n' # error: 2
 
     def streamer(repo, entries, total):
         '''stream out all metadata files in repository.'''
         yield '0\n' # success
         repo.ui.debug('%d files, %d bytes to transfer\n' %
                       (len(entries), total_bytes))
         yield '%d %d\n' % (len(entries), total_bytes)
         for name, size in entries:
             repo.ui.debug('sending %s (%d bytes)\n' % (name, size))
             # partially encode name over the wire for backwards compat
             yield '%s\0%d\n' % (store.encodedir(name), size)
             for chunk in util.filechunkiter(repo.sopener(name), limit=size):
                 yield chunk
 
     return streamres(streamer(repo, entries, total_bytes))
 
 def unbundle(repo, proto, heads):
     their_heads = decodelist(heads)
 
     def check_heads():
         heads = repo.heads()
         return their_heads == ['force'] or their_heads == heads
 
     # fail early if possible
     if not check_heads():
         return 'unsynced changes'
 
     # write bundle data to temporary file because it can be big
     fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
     fp = os.fdopen(fd, 'wb+')
     r = 0
     proto.redirect()
     try:
         proto.getfile(fp)
         lock = repo.lock()
         try:
             if not check_heads():
                 # someone else committed/pushed/unbundled while we
                 # were transferring data
                 return 'unsynced changes'
 
             # push can proceed
             fp.seek(0)
             header = fp.read(6)
             if header.startswith('HG'):
                 if not header.startswith('HG10'):
                     raise ValueError('unknown bundle version')
                 elif header not in changegroupmod.bundletypes:
                     raise ValueError('unknown bundle compression type')
             gen = changegroupmod.unbundle(header, fp)
 
             try:
                 r = repo.addchangegroup(gen, 'serve', proto._client(),
                                         lock=lock)
             except util.Abort, inst:
                 sys.stderr.write("abort: %s\n" % inst)
         finally:
             lock.release()
             return pushres(r)
 
     finally:
         fp.close()
         os.unlink(tempname)
 
 commands = {
     'between': (between, 'pairs'),
     'branchmap': (branchmap, ''),
     'branches': (branches, 'nodes'),
     'capabilities': (capabilities, ''),
     'changegroup': (changegroup, 'roots'),
     'changegroupsubset': (changegroupsubset, 'bases heads'),
     'heads': (heads, ''),
     'hello': (hello, ''),
     'listkeys': (listkeys, 'namespace'),
     'lookup': (lookup, 'key'),
     'pushkey': (pushkey, 'namespace key old new'),
     'stream_out': (stream, ''),
     'unbundle': (unbundle, 'heads'),
 }