Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 21470:1af854808a3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: remove workingctx logic already moved to context
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 21 Apr 2014 20:42:42 -0500
parents 65cdc6bab91e
children 77dbd05471cd
comparison
equal deleted inserted replaced
21469:65cdc6bab91e 21470:1af854808a3c
1556 1556
1557 modified, added, removed, deleted, unknown, ignored, clean = r 1557 modified, added, removed, deleted, unknown, ignored, clean = r
1558 1558
1559 if not parentworking: 1559 if not parentworking:
1560 mf1 = ctx1._manifestmatches(match, r) 1560 mf1 = ctx1._manifestmatches(match, r)
1561 if working: 1561 mf2 = ctx2._manifestmatches(match, r)
1562 # we are comparing working dir against non-parent
1563 # generate a pseudo-manifest for the working dir
1564 mf2 = self['.']._manifestmatches(match, r)
1565 for f in modified + added:
1566 mf2[f] = None
1567 mf2.set(f, ctx2.flags(f))
1568 for f in removed:
1569 if f in mf2:
1570 del mf2[f]
1571 else:
1572 # we are comparing two revisions
1573 mf2 = ctx2._manifestmatches(match, r)
1574 1562
1575 modified, added, clean = [], [], [] 1563 modified, added, clean = [], [], []
1576 deleted, unknown, ignored = r[3], [], [] 1564 deleted, unknown, ignored = r[3], [], []
1577 withflags = mf1.withflags() | mf2.withflags() 1565 withflags = mf1.withflags() | mf2.withflags()
1578 for fn, mf2node in mf2.iteritems(): 1566 for fn, mf2node in mf2.iteritems():