Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 6615:0697e7818d07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: fix "added" attributes renamed in bf2bf986ff87
author Patrick Mezard <pmezard@gmail.com>
date Sun, 18 May 2008 23:09:59 +0200
parents bf2bf986ff87
children 92ee960a928d
comparison
equal deleted inserted replaced
6614:944a292d522a 6615:0697e7818d07
2648 ctx1 = repo.changectx(node1) 2648 ctx1 = repo.changectx(node1)
2649 ctx2 = repo.changectx(node2) 2649 ctx2 = repo.changectx(node2)
2650 if node2 is None: 2650 if node2 is None:
2651 ctx2 = repo.workingctx() 2651 ctx2 = repo.workingctx()
2652 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items(): 2652 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items():
2653 if v in stat.added: 2653 if v in stat[1]:
2654 copy[v] = k 2654 copy[v] = k
2655 elif k in stat.added: 2655 elif k in stat[1]:
2656 copy[k] = v 2656 copy[k] = v
2657 2657
2658 for state, char, files in changestates: 2658 for state, char, files in changestates:
2659 if state in show: 2659 if state in show:
2660 format = "%s %%s%s" % (char, end) 2660 format = "%s %%s%s" % (char, end)