mercurial-scm/hg: mercurial/commands.py comparison

comparison mercurial/commands.py @ 1782:b9671b41e360

merge with crew

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Tue, 21 Feb 2006 16:46:38 +0100
parents	284fc722c342 b9fac31f34c9
children	b942f5cfd326

comparison

equal deleted inserted replaced

-:284fc722c342
+:b9671b41e360
 revs.reverse()
 for rev in revs:
 yield rev
 minrev, maxrev = min(revs), max(revs)
-for file in files:
+for file_ in files:
-filelog = repo.file(file)
+filelog = repo.file(file_)
 # A zero count may be a directory or deleted file, so
 # try to find matching entries on the slow path.
 if filelog.count() == 0:
 slowpath = True
 break
 for rev in filerevgen(filelog):
 if rev <= maxrev:
 if rev < minrev:
 break
 fncache.setdefault(rev, [])
-fncache[rev].append(file)
+fncache[rev].append(file_)
 wanted[rev] = 1
 if slowpath:
 # The slow path checks files modified in every changeset.
 def changerevgen():
 for i in xrange(repo.changelog.count() - 1, -1, -window):
 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)
 if cmd == "shortlist" and not f.startswith("^"):
 continue
 f = f.lstrip("^")
 if not ui.debugflag and f.startswith("debug"):
 continue
-d = ""
 doc = e[0].__doc__
 if not doc:
 doc = _("(No help text available)")
 h[f] = doc.splitlines(0)[0].rstrip()
 cmds[f] = c.lstrip("^")
 """
 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:
 try:
 # we use a lock here because if we race with commit, we
 # can end up with extra data in the cloned revlogs that's
 # not pointed to by changesets, thus causing verify to
 # fail
-l1 = lock.lock(os.path.join(source, ".hg", "lock"))
+l1 = other.lock()
-except OSError:
+except lock.LockException:
 copy = False
 if copy:
 # we lock here to avoid premature writing to the target
 os.mkdir(os.path.join(dest, ".hg"))
 def okaytocopy(abs, rel, exact):
 reasons = {'?': _('is not managed'),
 'a': _('has been marked for add'),
 'r': _('has been marked for remove')}
-reason = reasons.get(repo.dirstate.state(abs))
+state = repo.dirstate.state(abs)
+reason = reasons.get(state)
 if reason:
+if state == 'a':
+origsrc = repo.dirstate.copied(abs)
+if origsrc is not None:
+return origsrc
 if exact:
 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
 else:
-return True
+return abs
-def copy(abssrc, relsrc, target, exact):
+def copy(origsrc, abssrc, relsrc, target, exact):
 abstarget = util.canonpath(repo.root, cwd, target)
 reltarget = util.pathto(cwd, abstarget)
 prevsrc = targets.get(abstarget)
 if prevsrc is not None:
 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
 errors += 1
 return
 if ui.verbose or not exact:
 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
 targets[abstarget] = abssrc
-repo.copy(abssrc, abstarget)
+repo.copy(origsrc, abstarget)
 copied.append((abssrc, relsrc, exact))
 def targetpathfn(pat, dest, srcs):
 if os.path.isdir(pat):
 abspfx = util.canonpath(repo.root, cwd, pat)
 tfn = targetpathfn
 copylist = []
 for pat in pats:
 srcs = []
 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
-if okaytocopy(abssrc, relsrc, exact):
+origsrc = okaytocopy(abssrc, relsrc, exact)
-srcs.append((abssrc, relsrc, exact))
+if origsrc:
+srcs.append((origsrc, abssrc, relsrc, exact))
 if not srcs:
 continue
 copylist.append((tfn(pat, dest, srcs), srcs))
 if not copylist:
 raise util.Abort(_('no files to copy'))
 for targetpath, srcs in copylist:
-for abssrc, relsrc, exact in srcs:
+for origsrc, abssrc, relsrc, exact in srcs:
-copy(abssrc, relsrc, targetpath(abssrc), exact)
+copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
 if errors:
 ui.warn(_('(consider using --after)\n'))
 return errors, copied
 def debugancestor(ui, index, rev1, rev2):
 """find the ancestor revision of two revisions in a given index"""
 r = revlog.revlog(util.opener(os.getcwd()), index, "")
 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
+def debugrebuildstate(ui, repo, rev=None):
+"""rebuild the dirstate as it would look like for the given revision"""
+if not rev:
+rev = repo.changelog.tip()
+else:
+rev = repo.lookup(rev)
+change = repo.changelog.read(rev)
+n = change[0]
+files = repo.manifest.readflags(n)
+wlock = repo.wlock()
+repo.dirstate.rebuild(rev, files.iteritems())
 def debugcheckstate(ui, repo):
 """validate the correctness of the current dirstate"""
 parent1, parent2 = repo.dirstate.parents()
 repo.dirstate.read()
 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']:
 m = matches[rev][fn]
 for lnum, cstart, cend, line in matchlines(body):
 s = linestate(line, lnum, cstart, cend)
 m[s] = s
+# FIXME: prev isn't used, why ?
 prev = {}
 ucache = {}
 def display(fn, rev, states, prevstates):
 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
 def debug(self, *args):
 if self.debugflag:
 self.write(*args)
 def __getattr__(self, key):
 return getattr(self.ui, key)
 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
+if opts['limit']:
+try:
+limit = int(opts['limit'])
+except ValueError:
+raise util.Abort(_('limit must be a positive integer'))
+if limit <= 0: raise util.Abort(_('limit must be positive'))
+else:
+limit = sys.maxint
+count = 0
 for st, rev, fns in changeiter:
 if st == 'window':
 du = dui(ui)
 elif st == 'add':
 du.bump(rev)
 if opts['no_merges'] and len(parents) == 2:
 continue
 if opts['only_merges'] and len(parents) != 2:
 continue
-br = None
 if opts['keyword']:
 changes = getchange(rev)
 miss = 0
 for k in [kw.lower() for kw in opts['keyword']]:
 if not (k in changes[1].lower() or
 miss = 1
 break
 if miss:
 continue
-if opts['branch']:
+br = None
+if opts['branches']:
 br = repo.branchlookup([repo.changelog.node(rev)])
 show_changeset(du, repo, rev, brinfo=br)
 if opts['patch']:
 prev = (parents and parents[0]) or nullid
 dodiff(du, du, repo, prev, changenode, match=matchfn)
 du.write("\n\n")
 elif st == 'iter':
-for args in du.hunk[rev]:
+if count == limit: break
-ui.write(*args)
+if du.hunk[rev]:
+count += 1
+for args in du.hunk[rev]:
+ui.write(*args)
 def manifest(ui, repo, rev=None):
 """output the latest or given revision of the project manifest
 Print a list of version controlled files for the given revision.
 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, branches=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 branches 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)
 optlist = "name templates style address port ipv6 accesslog errorlog"
 for o in optlist.split():
 if opts[o]:
 ui.setconfig("web", o, opts[o])
+if opts['daemon'] and not opts['daemon_pipefds']:
+rfd, wfd = os.pipe()
+args = sys.argv[:]
+args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
+pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
+args[0], args)
+os.close(wfd)
+os.read(rfd, 1)
+os._exit(0)
 try:
 httpd = hgweb.create_server(repo)
 except socket.error, inst:
 raise util.Abort(_('cannot start server: ') + inst.args[1])
 pass
 if port != 80:
 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
 else:
 ui.status(_('listening at http://%s/\n') % addr)
+if opts['pid_file']:
+fp = open(opts['pid_file'], 'w')
+fp.write(str(os.getpid()))
+fp.close()
+if opts['daemon_pipefds']:
+rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
+os.close(rfd)
+os.write(wfd, 'y')
+os.close(wfd)
+sys.stdout.flush()
+sys.stderr.flush()
+fd = os.open(util.nulldev, os.O_RDWR)
+if fd != 0: os.dup2(fd, 0)
+if fd != 1: os.dup2(fd, 1)
+if fd != 2: os.dup2(fd, 2)
+if fd not in (0, 1, 2): os.close(fd)
 httpd.serve_forever()
 def status(ui, repo, *pats, **opts):
 """show changed files in the working directory
 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)
+br = None
+if opts['branches']:
+br = repo.branchlookup([n])
+show_changeset(ui, repo, changenode=n, brinfo=br)
+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
 ('A', 'after', None, _('record a copy that has already occurred')),
 ('f', 'force', None,
 _('forcibly copy over an existing managed file'))],
 _('hg copy [OPTION]... [SOURCE]... DEST')),
 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
+"debugrebuildstate":
+(debugrebuildstate,
+[('r', 'rev', "", _("revision to rebuild to"))],
+_('debugrebuildstate [-r REV] [REV]')),
 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
 "debugconfig": (debugconfig, [], _('debugconfig')),
 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
 "debugstate": (debugstate, [], _('debugstate')),
 "debugdata": (debugdata, [], _('debugdata FILE REV')),
 "^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')),
 ('r', 'rev', [], _('search in given revision range')),
 ('u', 'user', None, _('print user who committed change'))],
 _('hg grep [OPTION]... PATTERN [FILE]...')),
 "heads":
 (heads,
-[('b', 'branches', None, _('find branch info')),
+[('b', 'branches', None, _('show branches')),
 ('r', 'rev', '', _('show only heads which are descendants of rev'))],
 _('hg heads [-b] [-r <rev>]')),
 "help": (help_, [], _('hg help [COMMAND]')),
 "identify|id": (identify, [], _('hg identify')),
 "import|patch":
 _('hg locate [OPTION]... [PATTERN]...')),
 "^log|history":
 (log,
 [('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns')),
-('b', 'branch', None, _('show branches')),
+('b', 'branches', None, _('show branches')),
 ('k', 'keyword', [], _('search for a keyword')),
+('l', 'limit', '', _('limit number of changes displayed')),
 ('r', 'rev', [], _('show the specified revision or range')),
 ('M', 'no-merges', None, _('do not show merges')),
 ('m', 'only-merges', None, _('show only merges')),
 ('p', 'patch', None, _('show patch'))],
 _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),
 "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', 'branches', 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')),
 _('hg revert [-n] [-r REV] [NAME]...')),
 "root": (root, [], _('hg root')),
 "^serve":
 (serve,
 [('A', 'accesslog', '', _('name of access log file to write to')),
+('d', 'daemon', None, _('run server in background')),
+('', 'daemon-pipefds', '', _('used internally by daemon mode')),
 ('E', 'errorlog', '', _('name of error log file to write to')),
 ('p', 'port', 0, _('port to use (default: 8000)')),
 ('a', 'address', '', _('address to use')),
 ('n', 'name', '',
 _('name to show in web pages (default: working dir)')),
+('', 'pid-file', '', _('name of file to write process ID to')),
 ('', 'stdio', None, _('for remote clients')),
 ('t', 'templates', '', _('web templates to use')),
 ('', 'style', '', _('template style to use')),
 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
 _('hg serve [OPTION]...')),
 ('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,
+[('b', 'branches', None, _('show branches')),
+('p', 'patch', None, _('show patch'))],
+_('hg [-b] [-p] tip')),
 "unbundle":
 (unbundle,
 [('u', 'update', None,
 _('update the working directory to tip after unbundle'))],
 _('hg unbundle [-u] FILE')),
 " debugindex debugindexdot paths")
 def find(cmd):
 """Return (aliases, command table entry) for command string."""
 choice = None
+count = 0
 for e in table.keys():
 aliases = e.lstrip("^").split("|")
 if cmd in aliases:
 return aliases, table[e]
 for a in aliases:
 if a.startswith(cmd):
-if choice:
+count += 1
-raise AmbiguousCommand(cmd)
+choice = aliases, table[e]
-else:
+break
-choice = aliases, table[e]
-break
+if count > 1:
+raise AmbiguousCommand(cmd)
 if choice:
 return choice
 raise UnknownCommand(cmd)

Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 1782:b9671b41e360