Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 12209:affec9fb56ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepos: handle diff nodeids in subrepos, not before Subversion nodeids are integer revisions.
author Patrick Mezard <pmezard@gmail.com>
date Fri, 10 Sep 2010 22:52:00 +0200
parents ecab10820983
children 00658492e2aa
comparison
equal deleted inserted replaced
12208:482443557cad 12209:affec9fb56ef
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from node import hex, bin, nullid, nullrev, short 8 from node import hex, nullid, nullrev, short
9 from i18n import _ 9 from i18n import _
10 import os, sys, errno, re, glob, tempfile 10 import os, sys, errno, re, glob, tempfile
11 import util, templater, patch, error, encoding, templatekw 11 import util, templater, patch, error, encoding, templatekw
12 import match as matchmod 12 import match as matchmod
13 import similar, revset, subrepo 13 import similar, revset, subrepo
683 if listsubrepos: 683 if listsubrepos:
684 ctx1 = repo[node1] 684 ctx1 = repo[node1]
685 ctx2 = repo[node2] 685 ctx2 = repo[node2]
686 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2): 686 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
687 if node2 is not None: 687 if node2 is not None:
688 node2 = bin(ctx2.substate[subpath][1]) 688 node2 = ctx2.substate[subpath][1]
689 submatch = matchmod.narrowmatcher(subpath, match) 689 submatch = matchmod.narrowmatcher(subpath, match)
690 sub.diff(diffopts, node2, submatch, changes=changes, 690 sub.diff(diffopts, node2, submatch, changes=changes,
691 stat=stat, fp=fp, prefix=prefix) 691 stat=stat, fp=fp, prefix=prefix)
692 692
693 class changeset_printer(object): 693 class changeset_printer(object):