equal
deleted
inserted
replaced
354 if e[5] != hg.nullid: |
354 if e[5] != hg.nullid: |
355 print "\t%d -> %d" % (r.rev(e[5]), i) |
355 print "\t%d -> %d" % (r.rev(e[5]), i) |
356 print "}" |
356 print "}" |
357 |
357 |
358 elif cmd == "merge": |
358 elif cmd == "merge": |
359 (c, a, d, u) = repo.diffdir(repo.root, repo.current) |
|
360 if c or a or d: |
|
361 ui.warn("aborting (outstanding changes in working directory)\n") |
|
362 sys.exit(1) |
|
363 |
|
364 if args: |
359 if args: |
365 paths = {} |
360 paths = {} |
366 try: |
361 try: |
367 pf = os.path.join(os.environ["HOME"], ".hgpaths") |
362 pf = os.path.join(os.environ["HOME"], ".hgpaths") |
368 for l in file(pf): |
363 for l in file(pf): |