2309             ui.write(("remote is subset\n"))

  2309             ui.write(("remote is subset\n"))

  2310 

  2310 

  2311     serverlogs = opts.get('serverlog')

  2311     serverlogs = opts.get('serverlog')

  2312     if serverlogs:

  2312     if serverlogs:

  2313         for filename in serverlogs:

  2313         for filename in serverlogs:

  2316                 line = logfile.readline()

  2315                 line = logfile.readline()

  2317                 while line:

  2316                 while line:

  2318                     parts = line.strip().split(';')

  2317                     parts = line.strip().split(';')

  2319                     op = parts[1]

  2318                     op = parts[1]

  2320                     if op == 'cg':

  2319                     if op == 'cg':

  2322                     elif op == 'cgss':

  2321                     elif op == 'cgss':

  2323                         doit(parts[2].split(' '), parts[3].split(' '))

  2322                         doit(parts[2].split(' '), parts[3].split(' '))

  2324                     elif op == 'unb':

  2323                     elif op == 'unb':

  2325                         doit(parts[3].split(' '), parts[2].split(' '))

  2324                         doit(parts[3].split(' '), parts[2].split(' '))

  2326                     line = logfile.readline()

  2325                     line = logfile.readline()

  2330     else:

  2326     else:

  2331         remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,

  2327         remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,

  2332                                                  opts.get('remote_head'))

  2328                                                  opts.get('remote_head'))

  2333         localrevs = opts.get('local_head')

  2329         localrevs = opts.get('local_head')

  2334         doit(localrevs, remoterevs)

  2330         doit(localrevs, remoterevs)