comparison mercurial/commands.py @ 16176:0bb0b9f22cd7

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 25 Feb 2012 16:48:07 -0600
parents 5b0a4383cd5e 280e834c9d15
children a4413624d014
comparison
equal deleted inserted replaced
16174:0a73c4bd9f47 16176:0bb0b9f22cd7
3851 3851
3852 matchfn = scmutil.match(repo[None], pats, opts) 3852 matchfn = scmutil.match(repo[None], pats, opts)
3853 limit = cmdutil.loglimit(opts) 3853 limit = cmdutil.loglimit(opts)
3854 count = 0 3854 count = 0
3855 3855
3856 endrev = None 3856 getrenamed, endrev = None, None
3857 if opts.get('copies') and opts.get('rev'): 3857 if opts.get('copies'):
3858 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 3858 if opts.get('rev'):
3859 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3860 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3859 3861
3860 df = False 3862 df = False
3861 if opts["date"]: 3863 if opts["date"]:
3862 df = util.matchdate(opts["date"]) 3864 df = util.matchdate(opts["date"])
3863 3865
3897 break 3899 break
3898 else: 3900 else:
3899 return 3901 return
3900 3902
3901 copies = None 3903 copies = None
3902 if opts.get('copies') and rev: 3904 if getrenamed is not None and rev:
3903 copies = [] 3905 copies = []
3904 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3905 for fn in ctx.files(): 3906 for fn in ctx.files():
3906 rename = getrenamed(fn, rev) 3907 rename = getrenamed(fn, rev)
3907 if rename: 3908 if rename:
3908 copies.append((fn, rename[0])) 3909 copies.append((fn, rename[0]))
3909 3910