equal
deleted
inserted
replaced
27 return files |
27 return files |
28 |
28 |
29 def relpath(repo, args): |
29 def relpath(repo, args): |
30 if os.getcwd() != repo.root: |
30 if os.getcwd() != repo.root: |
31 p = os.getcwd()[len(repo.root) + 1: ] |
31 p = os.getcwd()[len(repo.root) + 1: ] |
32 return [ util.pconvert(os.path.normpath(os.path.join(p, x))) for x in args ] |
32 return [ util.pconvert(os.path.normpath(os.path.join(p, x))) |
|
33 for x in args ] |
33 return args |
34 return args |
34 |
35 |
35 def dodiff(ui, repo, files = None, node1 = None, node2 = None): |
36 def dodiff(ui, repo, files = None, node1 = None, node2 = None): |
36 def date(c): |
37 def date(c): |
37 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
38 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
360 errors += 1 |
361 errors += 1 |
361 if state in "a" and f in m1: |
362 if state in "a" and f in m1: |
362 print "%s in state %s, but also listed in manifest1" % (f, state) |
363 print "%s in state %s, but also listed in manifest1" % (f, state) |
363 errors += 1 |
364 errors += 1 |
364 if state in "m" and f not in m1 and f not in m2: |
365 if state in "m" and f not in m1 and f not in m2: |
365 print "%s in state %s, but not listed in either manifest" % (f, state) |
366 print "%s in state %s, but not listed in either manifest" % \ |
|
367 (f, state) |
366 errors += 1 |
368 errors += 1 |
367 for f in m1: |
369 for f in m1: |
368 state = repo.dirstate.state(f) |
370 state = repo.dirstate.state(f) |
369 if state not in "nrm": |
371 if state not in "nrm": |
370 print "%s in manifest1, but listed as state %s" % (f, state) |
372 print "%s in manifest1, but listed as state %s" % (f, state) |
371 errors += 1 |
373 errors += 1 |
372 if errors: |
374 if errors: |
373 print ".hg/dirstate inconsistent with current parent's manifest, aborting" |
375 print ".hg/dirstate inconsistent with current parent's manifest" |
374 sys.exit(1) |
376 sys.exit(1) |
375 |
377 |
376 def debugdumpdirstate(ui, repo): |
378 def debugdumpdirstate(ui, repo): |
377 dc = repo.dirstate.dup() |
379 dc = repo.dirstate.dup() |
378 keys = dc.keys() |
380 keys = dc.keys() |