mercurial-crew-with-dirclash: mercurial/commands.py comparison

comparison mercurial/commands.py @ 1737:2c9872a4f3fd

Merge with crew

author	Matt Mackall <mpm@selenic.com>
date	Fri, 17 Feb 2006 17:39:05 -0600
parents	50de0887bbcd
children	57de7e1a81d2 f95654385065

comparison

equal deleted inserted replaced

-:ef8cd889a78b
+:2c9872a4f3fd
 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
 pathname),
 mode)
 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
-changes=None, text=False):
+changes=None, text=False, opts={}):
 if not changes:
 changes = repo.changes(node1, node2, files, match=match)
 modified, added, removed, deleted, unknown = changes
 if files:
 modified, added, removed = map(lambda x: filterfiles(files, x),
 change = repo.changelog.read(node1)
 mmap = repo.manifest.read(change[0])
 date1 = util.datestr(change[2])
 diffopts = ui.diffopts()
-showfunc = diffopts['showfunc']
+showfunc = opts.get('show_function') or diffopts['showfunc']
-ignorews = diffopts['ignorews']
+ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
 for f in modified:
 to = None
 if f in mmap:
 to = repo.file(f).read(mmap[f])
 tn = read(f)
 """
 f = open(fname, "wb")
 dest = ui.expandpath(dest, repo.root)
 other = hg.repository(ui, dest)
 o = repo.findoutgoing(other)
-cg = repo.changegroup(o)
+cg = repo.changegroup(o, 'bundle')
 try:
 f.write("HG10")
 z = bz2.BZ2Compressor(9)
 while 1:
 raise util.Abort(_("too many revisions to diff"))
 fns, matchfn, anypats = matchpats(repo, pats, opts)
 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
-text=opts['text'])
+text=opts['text'], opts=opts)
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
 node = repo.lookup(changeset)
 parents = [p for p in repo.changelog.parents(node) if p != nullid]
 if opts['switch_parent']:
 if opts['patch']:
 prev = (parents and parents[0]) or nullid
 dodiff(ui, ui, repo, prev, n)
 ui.write("\n")
-def parents(ui, repo, rev=None):
+def parents(ui, repo, rev=None, branch=None):
 """show the parents of the working dir or revision
 Print the working directory's parent revisions.
 """
 if rev:
 p = repo.changelog.parents(repo.lookup(rev))
 else:
 p = repo.dirstate.parents()
+br = None
+if branch is not None:
+br = repo.branchlookup(p)
 for n in p:
 if n != nullid:
-show_changeset(ui, repo, changenode=n)
+show_changeset(ui, repo, changenode=n, brinfo=br)
 def paths(ui, search=None):
 """show definition of symbolic path names
 Show definition of symbolic path name NAME. If no name is given, show
 elif cmd == "changegroup":
 nodes = []
 arg, roots = getarg()
 nodes = map(bin, roots.split(" "))
-cg = repo.changegroup(nodes)
+cg = repo.changegroup(nodes, 'serve')
 while 1:
 d = cg.read(4096)
 if not d:
 break
 fout.write(d)
 disallowed = (revrangesep, '\r', '\n')
 for c in disallowed:
 if name.find(c) >= 0:
 raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
+repo.hook('pretag', throw=True, node=r, tag=name,
+local=int(not not opts['local']))
 if opts['local']:
 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
+repo.hook('tag', node=r, tag=name, local=1)
 return
 for x in repo.changes():
 if ".hgtags" in x:
 raise util.Abort(_("working copy of .hgtags is changed "
 message = (opts['message'] or
 _("Added tag %s for changeset %s") % (name, r))
 try:
 repo.commit([".hgtags"], message, opts['user'], opts['date'])
+repo.hook('tag', node=r, tag=name, local=0)
 except ValueError, inst:
 raise util.Abort(str(inst))
 def tags(ui, repo):
 """list repository tags
 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
 except KeyError:
 r = "    ?:?"
 ui.write("%-30s %s\n" % (t, r))
-def tip(ui, repo):
+def tip(ui, repo, **opts):
 """show the tip revision
 Show the tip revision.
 """
 n = repo.changelog.tip()
 show_changeset(ui, repo, changenode=n)
+if opts['patch']:
+dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
 def unbundle(ui, repo, fname, **opts):
 """apply a changegroup file
 Apply a compressed changegroup file generated by the bundle
 "^diff":
 (diff,
 [('r', 'rev', [], _('revision')),
 ('a', 'text', None, _('treat all files as text')),
 ('I', 'include', [], _('include names matching the given patterns')),
-('X', 'exclude', [], _('exclude names matching the given patterns'))],
+('p', 'show-function', None,
+_('show which function each change is in')),
+('w', 'ignore-all-space', None,
+_('ignore white space when comparing lines')),
+('X', 'exclude', [],
+_('exclude names matching the given patterns'))],
 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
 "^export":
 (export,
 [('o', 'output', '', _('print output to file with formatted name')),
 ('a', 'text', None, _('treat all files as text')),
 "outgoing|out": (outgoing,
 [('M', 'no-merges', None, _('do not show merges')),
 ('p', 'patch', None, _('show patch')),
 ('n', 'newest-first', None, _('show newest record first'))],
 _('hg outgoing [-p] [-n] [-M] [DEST]')),
-"^parents": (parents, [], _('hg parents [REV]')),
+"^parents":
+(parents,
+[('b', 'branch', None, _('show branches'))],
+_('hg parents [-b] [REV]')),
 "paths": (paths, [], _('hg paths [NAME]')),
 "^pull":
 (pull,
 [('u', 'update', None,
 _('update the working directory to tip after pull')),
 ('d', 'date', '', _('record datecode as commit date')),
 ('u', 'user', '', _('record user as commiter')),
 ('r', 'rev', '', _('revision to tag'))],
 _('hg tag [-r REV] [OPTION]... NAME')),
 "tags": (tags, [], _('hg tags')),
-"tip": (tip, [], _('hg tip')),
+"tip": (tip, [('p', 'patch', None, _('show patch'))], _('hg tip')),
 "unbundle":
 (unbundle,
 [('u', 'update', None,
 _('update the working directory to tip after unbundle'))],
 _('hg unbundle [-u] FILE')),

Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 1737:2c9872a4f3fd