Mercurial > hg
comparison hgext/hgk.py @ 6599:cd4db3999ef9
status: use match helpers for various users
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 May 2008 11:37:08 -0500 |
parents | fe8dbbe9520d |
children | cab3ad865444 |
comparison
equal
deleted
inserted
replaced
6598:7fc87fa485e5 | 6599:cd4db3999ef9 |
---|---|
44 # | 44 # |
45 # Revisions context menu will now display additional entries to fire | 45 # Revisions context menu will now display additional entries to fire |
46 # vdiff on hovered and selected revisions. | 46 # vdiff on hovered and selected revisions. |
47 | 47 |
48 import os | 48 import os |
49 from mercurial import commands, util, patch, revlog | 49 from mercurial import commands, util, patch, revlog, cmdutil |
50 from mercurial.node import nullid, nullrev, short | 50 from mercurial.node import nullid, nullrev, short |
51 | 51 |
52 def difftree(ui, repo, node1=None, node2=None, *files, **opts): | 52 def difftree(ui, repo, node1=None, node2=None, *files, **opts): |
53 """diff trees from two commits""" | 53 """diff trees from two commits""" |
54 def __difftree(repo, node1, node2, files=[]): | 54 def __difftree(repo, node1, node2, files=[]): |
55 assert node2 is not None | 55 assert node2 is not None |
56 mmap = repo.changectx(node1).manifest() | 56 mmap = repo.changectx(node1).manifest() |
57 mmap2 = repo.changectx(node2).manifest() | 57 mmap2 = repo.changectx(node2).manifest() |
58 status = repo.status(node1, node2, files=files)[:5] | 58 m = cmdutil.matchfiles(repo, files) |
59 status = repo.status(node1, node2, files=m.files(), match=m)[:5] | |
59 modified, added, removed, deleted, unknown = status | 60 modified, added, removed, deleted, unknown = status |
60 | 61 |
61 empty = short(nullid) | 62 empty = short(nullid) |
62 | 63 |
63 for f in modified: | 64 for f in modified: |