Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 4045:1bd6868b0b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 24 Jan 2007 23:07:09 +0100
parents a195f11ed1a2 31047b6f7ec1
children 431f3c1d3a37
comparison
equal deleted inserted replaced
4041:add43809810d 4045:1bd6868b0b11
2370 node1, node2 = cmdutil.revpair(repo, opts.get('rev')) 2370 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
2371 2371
2372 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) 2372 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
2373 cwd = (pats and repo.getcwd()) or '' 2373 cwd = (pats and repo.getcwd()) or ''
2374 modified, added, removed, deleted, unknown, ignored, clean = [ 2374 modified, added, removed, deleted, unknown, ignored, clean = [
2375 [util.pathto(cwd, x) for x in n] 2375 n for n in repo.status(node1=node1, node2=node2, files=files,
2376 for n in repo.status(node1=node1, node2=node2, files=files,
2377 match=matchfn, 2376 match=matchfn,
2378 list_ignored=all or opts['ignored'], 2377 list_ignored=all or opts['ignored'],
2379 list_clean=all or opts['clean'])] 2378 list_clean=all or opts['clean'])]
2380 2379
2381 changetypes = (('modified', 'M', modified), 2380 changetypes = (('modified', 'M', modified),
2396 format = "%%s%s" % end 2395 format = "%%s%s" % end
2397 else: 2396 else:
2398 format = "%s %%s%s" % (char, end) 2397 format = "%s %%s%s" % (char, end)
2399 2398
2400 for f in changes: 2399 for f in changes:
2401 ui.write(format % f) 2400 ui.write(format % util.pathto(cwd, f))
2402 if ((all or opts.get('copies')) and not opts.get('no_status')): 2401 if ((all or opts.get('copies')) and not opts.get('no_status')):
2403 copied = repo.dirstate.copied(f) 2402 copied = repo.dirstate.copied(f)
2404 if copied: 2403 if copied:
2405 ui.write(' %s%s' % (copied, end)) 2404 ui.write(' %s%s' % (util.pathto(cwd, copied), end))
2406 2405
2407 def tag(ui, repo, name, rev_=None, **opts): 2406 def tag(ui, repo, name, rev_=None, **opts):
2408 """add a tag for the current or given revision 2407 """add a tag for the current or given revision
2409 2408
2410 Name a particular revision using <name>. 2409 Name a particular revision using <name>.