add export, recover, and undo to the man page

add export to hg help

doc/hg.1

@@ -1,213 +1,225 b''
 .\"Generated by db2man.xsl. Don't modify this, modify the source.
 .de Sh \" Subsection
 .br
 .if t .Sp
 .ne 5
 .PP
 \fB\\$1\fR
 .PP
 ..
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
 .de Ip \" List item
 .br
 .ie \\n(.$>=3 .ne \\$3
 .el .ne 3
 .IP "\\$1" \\$2
 ..
 .TH "HG" 1 "" "" ""
 .SH NAME
 hg \- command line interface to the Mercurial source code management system
 .SH "SYNOPSIS"
 
 
 hg [\-v \-d \-q \-y] <command> [command options] [files]
 
 .SH "DESCRIPTION"
 
 
 The hg(1) command provides a command line interface to the Mercurial system\&.
 
 .SH "NOTE"
 
 
 Many of the hg commands are not yet subdirectory and/or working directory aware\&. This means that some commands will only work in the top level repository directory or will only accept paths and filenames relative to the top level\&. Merges and commits, in particular, should be done in the top\-level directory\&.
 
 .SH "OPTIONS"
 
 .TP
 --debug, \-d
 enable debugging output
 
 .TP
 --quiet, \-q
 suppress output
 
 .TP
 --verbose, \-v
 enable additional output
 
 .TP
 --noninteractive, \-y
 do not prompt, assume yes for any required answers
 
 .SH "COMMAND ELEMENTS"
 
 .TP
 files ...
 indicates one or more filename or relative path filenames
 
 .TP
 path
 indicates a path on the local machine
 
 .TP
 revision
 indicates a changeset which can be specified as a changeset id (int), a tag, or a unique substring of the changeset hash value
 
 .TP
 repository path
 is either the pathname of a local repository of the URI of a remote repository\&. There are two available URI protocols, http:// which is fast and the old\-http:// protocol which is much slower but does not require python on the web host\&.
 
 .SH "COMMANDS"
 
 .TP
 add [files ...]
 add the given files to the repository\&. Note that this just schedules the files for addition at the next hg commit time\&.
 
 .TP
 addremove
 add all new files and remove all missing files from the repository\&. new files are ignored if they match any of the patterns in \&.hgignore
 
 .TP
 annotate [\-r revision \-u \-n \-c] [files ...]
 list the files with each line showing the revision id responsible for that line\&. \-u will add the author to the revision id, \-c will print the changeset hash, and \-n will ...
 
 .TP
 branch <path>
 create a new branch of the repository indicated by path in the current directory\&. Note that there should not be a repository already initialized in the current directory
 
 .TP
 checkout [revision]
 check out the indicated version of the repository into the working directory\&. Note that currently no merge occurs with changed files in the working dir\&.
 
 .TP
 commit
 commit all changed files in the working dir to the repository\&. This uses the EDITOR environment variable to bring up an editor to add a commit comment\&.
 
 .TP
 diff [\-r revision] [\-r revision] [files ...]
 generate a unified diff of the indicated files\&. If there are no revisions specified, the working directory file is compared to the tip, one revision specified indicates a comparison between the working directory file and the specified revision, two revisions compares the two versions specified\&.
 
 .TP
 dump <file> [revision]
 print the indicated revision of the file
 
 .TP
 dumpmanifest [revision]
 print the indicated revision of the manifest (list of version controlled files)
 
 .TP
+export [revision]
+print the changeset header (author, changeset hash, parent, and commit comment) and the diffs for a particular revision\&.
+
+.TP
 history
 print the revision history of the repository
 
 .TP
 init
 initialize a repository in the current directory
 
 .TP
 log <file>
 print the revision history of the specified file
 
 .TP
 merge <repository path>
 pull any changes from the specified repository to the repository in the current directory\&. Use the value of the HGMERGE environment variable as a program to resolve any merge conflicts between the two repositories\&. An implicit commit is done at the end of this process if there were any merge conflicts\&. Note that merge does not yet merge with changed files in the working dir\&.
 
 .TP
+recover
+rollback an interrupted transaction
+
+.TP
 remove [files ...]
 schedule the indicated files for removal from the repository at the next commit
 
 .TP
 serve [\-a addr \-n name \-p port \-t templatedir]
 this will start an http server, by default on port 8000, that will allow browsing the repository using the hgweb interface and will allow merging from the repository\&. \-a sets the interface address, \-p the port to listen on, \-n the name of the repository and \-t sets the location of the template directory\&.
 
 .TP
 status
 list new, changed, and missing files in the working directory
 
 .TP
 tags
 list the current tags
 
+.TP
+undo
+undo the last transaction
+
 .SH "ENVIRONMENT VARIABLES"
 
 .TP
 HGMERGE
 points to an executable to use for resolving merge conflicts, the program will be executed with four arguments: local file, remote file, ancestor file, and original filename\&.
 
 .TP
 HGUSER
 this is the string used for the author value of a commit
 
 .TP
 HG_OPTS
 this string is used for default arguments to hg
 
 .TP
 PYTHONPATH
 this is used by Python to find imported modules and needs to be set appropriately based on where mercurial is installed
 
 .TP
 EMAIL
 if HGUSER is not set, this will be used next as the author value for a commit
 
 .TP
 LOGNAME
 if neither HGUSER nor EMAIL is set, LOGNAME will be used (with @hostname appended) as the author value for a commit
 
 .TP
 EDITOR
 this is the name of the editor to use when committing
 
 .SH "FILES"
 
 .TP
 \&.hgignore
 this file contains regular expressions (one per line) that describe file names that should be ignored by hg
 
 .TP
 \&.hgtags
 this file contains changeset hash values and text tag names (one of each seperated by spaces) that correspond to tagged versions of the repository contents\&.
 
 .TP
 $HOME/\&.hgpaths
 this file contains a mapping from a symbolic name to a repository path (which could be a local path or a remote URI), the format is <symbolic name> <repository path> with each mapping on a seperate line
 
 .SH "BUGS"
 
 
 Probably lots, please post them to the mailing list (See Resources below) when you find them\&.
 
 .SH "AUTHOR"
 
 
 Written by Matt Mackall <mpm@selenic\&.com>
 
 .SH "RESOURCES"
 
 
 Main Web Site: \fIhttp://selenic.com/mercurial\fR
 
 
 Source code repository: \fIhttp://selenic.com/hg\fR
 
 
 Mailing list: \fIhttp://selenic.com/mailman/listinfo/mercurial\fR
 
 .SH "COPYING"
 
 
 Copyright (C) 2005 Matt Mackall\&. Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
 

doc/hg.1.html

@@ -1,417 +1,442 b''
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="generator" content="AsciiDoc 6.0.3">
 <meta name="author" content="Matt Mackall">
 <meta name="author-email" content="[e-mail]">
 <title>HG(1)</title>
 </head>
 <body>
 <h1>HG(1)</h1>
 <p>
 <strong>by Matt Mackall</strong><br />
 <tt>&lt;<a href="mailto:[e-mail]">[e-mail]</a>&gt;</tt><br />
 v0.5,
 27 May 2005
 </p>
 <hr />
 <h2>NAME</h2>
 <p>
 hg - command line interface to the Mercurial source code management system
 </p>
 <hr />
 <h2>SYNOPSIS</h2>
 <p>
 <em>hg</em> [-v -d -q -y] &lt;command&gt; [command options] [files]
 </p>
 <hr />
 <h2>DESCRIPTION</h2>
 <p>
 The hg(1) command provides a command line interface to the Mercurial system.
 </p>
 <hr />
 <h2>NOTE</h2>
 <p>
 Many of the hg commands are not yet subdirectory and/or working directory
 aware.  This means that some commands will only work in the top level
 repository directory or will only accept paths and filenames relative to the
 top level.  Merges and commits, in particular, should be done in the
 top-level directory.
 </p>
 <hr />
 <h2>OPTIONS</h2>
 <dl>
 <dt>
 &#8212;debug, -d
 </dt>
 <dd>
 
     enable debugging output
 
 </dd>
 <dt>
 &#8212;quiet, -q
 </dt>
 <dd>
 
     suppress output
 
 </dd>
 <dt>
 &#8212;verbose, -v
 </dt>
 <dd>
 
     enable additional output
 
 </dd>
 <dt>
 &#8212;noninteractive, -y
 </dt>
 <dd>
 
     do not prompt, assume <em>yes</em> for any required answers
 
 </dd>
 </dl>
 <hr />
 <h2>COMMAND ELEMENTS</h2>
 <dl>
 <dt>
 files &#8230;
 </dt>
 <dd>
 
     indicates one or more filename or relative path filenames
 
 </dd>
 <dt>
 path
 </dt>
 <dd>
 
     indicates a path on the local machine
 
 </dd>
 <dt>
 revision
 </dt>
 <dd>
 
     indicates a changeset which can be specified as a changeset id (int),
     a tag, or a unique substring of the changeset hash value
 
 </dd>
 <dt>
 repository path
 </dt>
 <dd>
 
     is either the pathname of a local repository of the URI of a remote
     repository.  There are two available URI protocols, http:// which is
     fast and the old-http:// protocol which is much slower but does not
     require python on the web host.
 
 </dd>
 </dl>
 <hr />
 <h2>COMMANDS</h2>
 <dl>
 <dt>
 add [files &#8230;]
 </dt>
 <dd>
 
     add the given files to the repository.  Note that this just schedules the
     files for addition at the next hg commit time.
 
 </dd>
 <dt>
 addremove
 </dt>
 <dd>
 
     add all new files and remove all missing files from the repository.  new
     files are ignored if they match any of the patterns in .hgignore
 
 </dd>
 <dt>
 annotate [-r revision -u -n -c] [files &#8230;]
 </dt>
 <dd>
 
     list the files with each line showing the revision id responsible
     for that line.  -u will add the author to the revision id, -c will
     print the changeset hash, and -n will &#8230;
 
 </dd>
 <dt>
 branch &lt;path&gt;
 </dt>
 <dd>
 
     create a new branch of the repository indicated by path in the current
     directory.  Note that there should not be a repository already initialized
     in the current directory
 
 </dd>
 <dt>
 checkout [revision]
 </dt>
 <dd>
 
     check out the indicated version of the repository into the working
     directory.  Note that currently no merge occurs with changed files
     in the working dir.
 
 </dd>
 <dt>
 commit
 </dt>
 <dd>
 
     commit all changed files in the working dir to the repository.  This uses
     the EDITOR environment variable to bring up an editor to add a commit
     comment.
 
 </dd>
 <dt>
 diff [-r revision] [-r revision] [files &#8230;]
 </dt>
 <dd>
 
     generate a unified diff of the indicated files.  If there are no
     revisions specified, the working directory file is compared to
     the tip, one revision specified indicates a comparison between the
     working directory file and the specified revision, two revisions
     compares the two versions specified.
 
 </dd>
 <dt>
 dump &lt;file&gt; [revision]
 </dt>
 <dd>
 
     print the indicated revision of the file
 
 </dd>
 <dt>
 dumpmanifest [revision]
 </dt>
 <dd>
 
     print the indicated revision of the manifest (list of version controlled
     files)
 
 </dd>
 <dt>
+export [revision]
+</dt>
+<dd>
+
+    print the changeset header (author, changeset hash, parent, and commit
+    comment) and the diffs for a particular revision.
+
+</dd>
+<dt>
 history
 </dt>
 <dd>
 
     print the revision history of the repository
 
 </dd>
 <dt>
 init
 </dt>
 <dd>
 
     initialize a repository in the current directory
 
 </dd>
 <dt>
 log &lt;file&gt;
 </dt>
 <dd>
 
     print the revision history of the specified file
 
 </dd>
 <dt>
 merge &lt;repository path&gt;
 </dt>
 <dd>
 
     pull any changes from the specified repository to the repository in the
     current directory.  Use the value of the HGMERGE environment variable
     as a program to resolve any merge conflicts between the two repositories.
     An implicit commit is done at the end of this process if there were any
     merge conflicts.  Note that merge does not yet merge with changed files
     in the working dir.
 
 </dd>
 <dt>
+recover
+</dt>
+<dd>
+
+    rollback an interrupted transaction
+
+</dd>
+<dt>
 remove [files &#8230;]
 </dt>
 <dd>
 
     schedule the indicated files for removal from the repository at the next
     commit
 
 </dd>
 <dt>
 serve [-a addr -n name -p port -t templatedir]
 </dt>
 <dd>
 
     this will start an http server, by default on port 8000, that will
     allow browsing the repository using the hgweb interface and will allow
     merging from the repository.  -a sets the interface address, -p the
     port to listen on, -n the name of the repository and -t sets the
     location of the template directory.
 
 </dd>
 <dt>
 status
 </dt>
 <dd>
 
     list new, changed, and missing files in the working directory
 
 </dd>
 <dt>
 tags
 </dt>
 <dd>
 
     list the current tags
 
 </dd>
+<dt>
+undo
+</dt>
+<dd>
+
+    undo the last transaction
+
+</dd>
 </dl>
 <hr />
 <h2>ENVIRONMENT VARIABLES</h2>
 <dl>
 <dt>
 HGMERGE
 </dt>
 <dd>
 
     points to an executable to use for resolving merge conflicts, the
     program will be executed with four arguments: local file, remote
     file, ancestor file, and original filename.
 
 </dd>
 <dt>
 HGUSER
 </dt>
 <dd>
 
     this is the string used for the author value of a commit
 
 </dd>
 <dt>
 HG_OPTS
 </dt>
 <dd>
 
     this string is used for default arguments to hg
 
 </dd>
 <dt>
 PYTHONPATH
 </dt>
 <dd>
 
     this is used by Python to find imported modules and needs to be set
     appropriately based on where mercurial is installed
 
 </dd>
 <dt>
 EMAIL
 </dt>
 <dd>
 
     if HGUSER is not set, this will be used next as the author value for
     a commit
 
 </dd>
 <dt>
 LOGNAME
 </dt>
 <dd>
 
     if neither HGUSER nor EMAIL is set, LOGNAME will be used (with
     <em>@hostname</em> appended) as the author value for a commit
 
 </dd>
 <dt>
 EDITOR
 </dt>
 <dd>
 
     this is the name of the editor to use when committing
 
 </dd>
 </dl>
 <hr />
 <h2>FILES</h2>
 <dl>
 <dt>
 .hgignore
 </dt>
 <dd>
 
     this file contains regular expressions (one per line) that describe file
     names that should be ignored by hg
 
 </dd>
 <dt>
 .hgtags
 </dt>
 <dd>
 
     this file contains changeset hash values and text tag names (one of each
     seperated by spaces) that correspond to tagged versions of the repository
     contents.
 
 </dd>
 <dt>
 $HOME/.hgpaths
 </dt>
 <dd>
 
     this file contains a mapping from a symbolic name to a repository path
     (which could be a local path or a remote URI), the format is
     &lt;symbolic name&gt; &lt;repository path&gt; with each mapping on a seperate line
 
 </dd>
 </dl>
 <hr />
 <h2>BUGS</h2>
 <p>
 Probably lots, please post them to the mailing list (See Resources below)
 when you find them.
 </p>
 <hr />
 <h2>AUTHOR</h2>
 <p>
 Written by Matt Mackall &lt;[e-mail]&gt;
 </p>
 <hr />
 <h2>RESOURCES</h2>
 <p>
 <a href="http://selenic.com/mercurial">Main Web Site</a>
 </p>
 <p>
 <a href="http://selenic.com/hg">Source code repository</a>
 </p>
 <p>
 <a href="http://selenic.com/mailman/listinfo/mercurial">Mailing list</a>
 </p>
 <hr />
 <h2>COPYING</h2>
 <p>
 Copyright &#169; 2005 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).
 </p>
 <p></p>
 <p></p>
 <hr /><p><small>
 Version 0.5<br />
-Last updated 27-May-2005 15:07:30 MDT
+Last updated 27-May-2005 15:51:06 MDT
 </small></p>
 </body>
 </html>

doc/hg.1.txt

@@ -1,202 +1,212 b''
 HG(1)
 =====
 Matt Mackall <[e-mail]>
 v0.5, 27 May 2005
 
 NAME
 ----
 hg - command line interface to the Mercurial source code management system
 
 SYNOPSIS
 --------
 'hg' [-v -d -q -y] <command> [command options] [files]
 
 DESCRIPTION
 -----------
 The hg(1) command provides a command line interface to the Mercurial system.
 
 NOTE
 ----
 Many of the hg commands are not yet subdirectory and/or working directory
 aware.  This means that some commands will only work in the top level 
 repository directory or will only accept paths and filenames relative to the
 top level.  Merges and commits, in particular, should be done in the
 top-level directory.
 
 OPTIONS
 -------
 --debug, -d::
     enable debugging output
 
 --quiet, -q::
     suppress output
 
 --verbose, -v::
     enable additional output
 
 --noninteractive, -y::
     do not prompt, assume 'yes' for any required answers
 
 COMMAND ELEMENTS
 ----------------
 
 files ...::
     indicates one or more filename or relative path filenames
 
 path::
     indicates a path on the local machine
 
 revision::
     indicates a changeset which can be specified as a changeset id (int),
     a tag, or a unique substring of the changeset hash value
 
 repository path::
     is either the pathname of a local repository of the URI of a remote
     repository.  There are two available URI protocols, http:// which is
     fast and the old-http:// protocol which is much slower but does not 
     require python on the web host.
 
 COMMANDS
 --------
 add [files ...]::
     add the given files to the repository.  Note that this just schedules the
     files for addition at the next hg commit time.
 
 addremove::
     add all new files and remove all missing files from the repository.  new
     files are ignored if they match any of the patterns in .hgignore
 
 annotate [-r revision -u -n -c] [files ...]::
     list the files with each line showing the revision id responsible 
     for that line.  -u will add the author to the revision id, -c will
     print the changeset hash, and -n will ...
 
 branch <path>::
     create a new branch of the repository indicated by path in the current
     directory.  Note that there should not be a repository already initialized
     in the current directory
 
 checkout [revision]::
     check out the indicated version of the repository into the working
     directory.  Note that currently no merge occurs with changed files 
     in the working dir.
 
 commit::
     commit all changed files in the working dir to the repository.  This uses
     the EDITOR environment variable to bring up an editor to add a commit
     comment.
 
 diff [-r revision] [-r revision] [files ...]::
     generate a unified diff of the indicated files.  If there are no 
     revisions specified, the working directory file is compared to 
     the tip, one revision specified indicates a comparison between the 
     working directory file and the specified revision, two revisions 
     compares the two versions specified.
 
 dump <file> [revision]::
     print the indicated revision of the file
 
 dumpmanifest [revision]::
     print the indicated revision of the manifest (list of version controlled
     files)
 
+export [revision]::
+    print the changeset header (author, changeset hash, parent, and commit
+    comment) and the diffs for a particular revision.
+
 history::
     print the revision history of the repository
 
 init::
     initialize a repository in the current directory
 
 log <file>::
     print the revision history of the specified file
 
 merge <repository path>::
     pull any changes from the specified repository to the repository in the
     current directory.  Use the value of the HGMERGE environment variable
     as a program to resolve any merge conflicts between the two repositories.
     An implicit commit is done at the end of this process if there were any
     merge conflicts.  Note that merge does not yet merge with changed files
     in the working dir.
 
+recover::
+    rollback an interrupted transaction
+
 remove [files ...]::
     schedule the indicated files for removal from the repository at the next
     commit
 
 serve [-a addr -n name -p port -t templatedir]::
     this will start an http server, by default on port 8000, that will 
     allow browsing the repository using the hgweb interface and will allow 
     merging from the repository.  -a sets the interface address, -p the 
     port to listen on, -n the name of the repository and -t sets the 
     location of the template directory.
 
 status::
     list new, changed, and missing files in the working directory
 
 tags::
     list the current tags
 
+undo::
+    undo the last transaction
+
 ENVIRONMENT VARIABLES
 ---------------------
 HGMERGE::
     points to an executable to use for resolving merge conflicts, the
     program will be executed with four arguments: local file, remote
     file, ancestor file, and original filename.
 
 HGUSER::
     this is the string used for the author value of a commit
 
 HG_OPTS::
     this string is used for default arguments to hg
 
 PYTHONPATH::
     this is used by Python to find imported modules and needs to be set
     appropriately based on where mercurial is installed
 
 EMAIL::
     if HGUSER is not set, this will be used next as the author value for
     a commit
 
 LOGNAME::
     if neither HGUSER nor EMAIL is set, LOGNAME will be used (with
     '@hostname' appended) as the author value for a commit
 
 EDITOR::
     this is the name of the editor to use when committing
 
 FILES
 -----
  .hgignore::
     this file contains regular expressions (one per line) that describe file
     names that should be ignored by hg
 
  .hgtags::
     this file contains changeset hash values and text tag names (one of each
     seperated by spaces) that correspond to tagged versions of the repository
     contents.
 
  $HOME/.hgpaths::
     this file contains a mapping from a symbolic name to a repository path
     (which could be a local path or a remote URI), the format is 
     <symbolic name> <repository path> with each mapping on a seperate line
 
 BUGS
 ----
 Probably lots, please post them to the mailing list (See Resources below)
 when you find them.
 
 AUTHOR
 ------
 Written by Matt Mackall <[e-mail]>
 
 RESOURCES
 ---------
 http://selenic.com/mercurial[Main Web Site]
 
 http://selenic.com/hg[Source code repository]
 
 http://selenic.com/mailman/listinfo/mercurial[Mailing list]
 
 COPYING
 -------
 Copyright (C) 2005 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).

hg

@@ -1,588 +1,589 b''
 #!/usr/bin/env python
 #
 # mercurial - a minimal scalable distributed SCM
 # v0.5b "katje"
 #
 # Copyright 2005 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 # the psyco compiler makes commits a bit faster
 # and makes changegroup merge about 20 times slower!
 # try:
 #    import psyco
 #    psyco.full()
 # except:
 #    pass
 
 import sys, os, time
 from mercurial import hg, mdiff, fancyopts
 
 def help():
     ui.status("""\
  commands:
 
  add [files...]        add the given files in the next commit
  addremove             add all new files, delete all missing files
  annotate [files...]   show changeset number per file line
  branch <path>         create a branch of <path> in this directory
  checkout [changeset]  checkout the latest or given changeset
  commit                commit all changes to the repository
  diff [files...]       diff working directory (or selected files)
  dump <file> [rev]     dump the latest or given revision of a file
  dumpmanifest [rev]    dump the latest or given revision of the manifest
+ export <rev>          dump the changeset header and diffs for a revision
  history               show changeset history
  init                  create a new repository in this directory
  log <file>            show revision history of a single file
  merge <path>          merge changes from <path> into local repository
  recover               rollback an interrupted transaction
  remove [files...]     remove the given files in the next commit
  serve                 export the repository via HTTP
  status                show new, missing, and changed files in working dir
  tags                  show current changeset tags
  undo                  undo the last transaction
 """)
 
 def filterfiles(list, files):
     l = [ x for x in list if x in files ]
 
     for f in files:
         if f[-1] != os.sep: f += os.sep
         l += [ x for x in list if x.startswith(f) ]
     return l
 
 def diff(files = None, node1 = None, node2 = None):
     def date(c):
         return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
 
     if node2:
         change = repo.changelog.read(node2)
         mmap2 = repo.manifest.read(change[0])
         (c, a, d) = repo.diffrevs(node1, node2)
         def read(f): return repo.file(f).read(mmap2[f])
         date2 = date(change)
     else:
         date2 = time.asctime()
         if not node1:
             node1 = repo.current
         (c, a, d) = repo.diffdir(repo.root, node1)
         a = [] # ignore unknown files in repo, by popular request
         def read(f): return file(os.path.join(repo.root, f)).read()
 
     change = repo.changelog.read(node1)
     mmap = repo.manifest.read(change[0])
     date1 = date(change)
 
     if files:
         c, a, d = map(lambda x: filterfiles(x, files), (c, a, d))
 
     for f in c:
         to = ""
         if mmap.has_key(f):
             to = repo.file(f).read(mmap[f])
         tn = read(f)
         sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
     for f in a:
         to = ""
         tn = read(f)
         sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
     for f in d:
         to = repo.file(f).read(mmap[f])
         tn = ""
         sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
 
 options = {}
 opts = [('v', 'verbose', None, 'verbose'),
         ('d', 'debug', None, 'debug'),
         ('q', 'quiet', None, 'quiet'),
         ('y', 'noninteractive', None, 'run non-interactively'),
         ]
 
 args = fancyopts.fancyopts(sys.argv[1:], opts, options,
                            'hg [options] <command> [command options] [files]')
 
 try:
     cmd = args[0]
     args = args[1:]
 except:
     cmd = ""
 
 ui = hg.ui(options["verbose"], options["debug"], options["quiet"],
            not options["noninteractive"])
     
 if cmd == "init":
     repo = hg.repository(ui, ".", create=1)
     sys.exit(0)
 elif cmd == "branch" or cmd == "clone":
     os.system("cp -al %s/.hg .hg" % args[0])
     sys.exit(0)
 elif cmd == "help":
     help()
     sys.exit(0)
 else:
     try:
         repo = hg.repository(ui=ui)
     except IOError:
         ui.warn("Unable to open repository\n")
         sys.exit(0)
 
 relpath = None
 if os.getcwd() != repo.root:
     relpath = os.getcwd()[len(repo.root) + 1: ]
 
 if cmd == "checkout" or cmd == "co":
     node = repo.changelog.tip()
     if args:
         node = repo.lookup(args[0])
     repo.checkout(node)
 
 elif cmd == "add":
     repo.add(args)
 
 elif cmd == "remove" or cmd == "rm" or cmd == "del" or cmd == "delete":
     repo.remove(args)
 
 elif cmd == "commit" or cmd == "checkin" or cmd == "ci":
     if 1:
         if len(args) > 0:
             repo.commit(repo.current, args)
         else:
             repo.commit(repo.current)
 
 elif cmd == "import" or cmd == "patch":
     try:
         import psyco
         psyco.full()
     except:
         pass
     
     ioptions = {}
     opts = [('p', 'strip', 1, 'path strip'),
             ('b', 'base', "", 'base path'),
             ('q', 'quiet', "", 'silence diff')
             ]
     
     args = fancyopts.fancyopts(args, opts, ioptions,
                               'hg import [options] <patch names>')
     d = ioptions["base"]
     strip = ioptions["strip"]
     quiet = ioptions["quiet"] and "> /dev/null" or ""
 
     for patch in args:
         ui.status("applying %s\n" % patch)
         pf = os.path.join(d, patch)
 
         text = ""
         for l in file(pf):
             if l[:4] == "--- ": break
             text += l
 
         f = os.popen("lsdiff --strip %d %s" % (strip, pf))
         files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
         f.close()
 
         if files:
             if os.system("patch -p%d < %s %s" % (strip, pf, quiet)):
                 raise "patch failed!"
         repo.commit(repo.current, files, text)
 
 elif cmd == "status":
     (c, a, d) = repo.diffdir(repo.root, repo.current)
     if relpath:
         (c, a, d) = map(lambda x: filterfiles(x, [ relpath ]), (c, a, d))
 
     for f in c: print "C", f
     for f in a: print "?", f
     for f in d: print "R", f
 
 elif cmd == "diff":
     revs = []
 
     if args:
         doptions = {}
         opts = [('r', 'revision', [], 'revision')]
         args = fancyopts.fancyopts(args, opts, doptions,
                                    'hg diff [options] [files]')
         revs = map(lambda x: repo.lookup(x), doptions['revision'])
     
     if len(revs) > 2:
         self.ui.warn("too many revisions to diff\n")
         sys.exit(1)
 
     if relpath:
         if not args: args = [ relpath ]
         else: args = [ os.path.join(relpath, x) for x in args ]
 
     diff(args, *revs)
 
 elif cmd == "annotate":
     bcache = {}
 
     def getnode(rev):
         return hg.short(repo.changelog.node(rev))
 
     def getname(rev):
         try:
             return bcache[rev]
         except KeyError:
             cl = repo.changelog.read(repo.changelog.node(rev))
             name = cl[1]
             f = name.find('@')
             if f >= 0:
                 name = name[:f]
             bcache[rev] = name
             return name
     
     aoptions = {}
     opts = [('r', 'revision', '', 'revision'),
             ('u', 'user', None, 'show user'),
             ('n', 'number', None, 'show revision number'),
             ('c', 'changeset', None, 'show changeset')]
 
     args = fancyopts.fancyopts(args, opts, aoptions,
                                'hg annotate [-u] [-c] [-n] [-r id] [files]')
 
     opmap = [['user', getname], ['number', str], ['changeset', getnode]]
     if not aoptions['user'] and not aoptions['changeset']:
         aoptions['number'] = 1
 
     if args:
         if relpath: args = [ os.path.join(relpath, x) for x in args ]
         node = repo.current
         if aoptions['revision']:
             node = repo.changelog.lookup(aoptions['revision'])
         change = repo.changelog.read(node)
         mmap = repo.manifest.read(change[0])
         maxuserlen = 0
         maxchangelen = 0
         for f in args:
             lines = repo.file(f).annotate(mmap[f])
             pieces = []
 
             for o, f in opmap:
                 if aoptions[o]:
                     l = [ f(n) for n,t in lines ]
                     m = max(map(len, l))
                     pieces.append([ "%*s" % (m, x) for x in l])
 
             for p,l in zip(zip(*pieces), lines):
                 sys.stdout.write(" ".join(p) + ": " + l[1])
 
 elif cmd == "export":
     node = repo.lookup(args[0])
     prev, other = repo.changelog.parents(node)
     change = repo.changelog.read(node)
     print "# HG changeset patch"
     print "# User %s" % change[1]
     print "# Node ID %s" % hg.hex(node)
     print "# Parent  %s" % hg.hex(prev)
     print
     if other != hg.nullid:
         print "# Parent  %s" % hg.hex(other)
     print change[4]
     
     diff(None, prev, node)
 
 elif cmd == "debugchangegroup":
     newer = repo.newer(map(repo.lookup, args))
     for chunk in repo.changegroup(newer):
         sys.stdout.write(chunk)
 
 elif cmd == "debugaddchangegroup":
     data = sys.stdin.read()
     repo.addchangegroup(data)
 
 elif cmd == "addremove":
     (c, a, d) = repo.diffdir(repo.root, repo.current)
     repo.add(a)
     repo.remove(d)
     
 elif cmd == "history":
     for i in range(repo.changelog.count()):
         n = repo.changelog.node(i)
         changes = repo.changelog.read(n)
         (p1, p2) = repo.changelog.parents(n)
         (h, h1, h2) = map(hg.hex, (n, p1, p2))
         (i1, i2) = map(repo.changelog.rev, (p1, p2))
         print "rev:      %4d:%s" % (i, h)
         print "parents:  %4d:%s" % (i1, h1)
         if i2: print "          %4d:%s" % (i2, h2)
         print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]),
                                     hg.hex(changes[0]))
         print "user:", changes[1]
         print "date:", time.asctime(
             time.localtime(float(changes[2].split(' ')[0])))
         if ui.verbose: print "files:", " ".join(changes[3])
         print "description:"
         print changes[4]
 
 elif cmd == "tip":
     n = repo.changelog.tip()
     t = repo.changelog.rev(n)
     ui.status("%d:%s\n" % (t, hg.hex(n)))
 
 elif cmd == "log":
 
     if len(args) == 1:
         if relpath:
             args[0] = os.path.join(relpath, args[0])
 
         r = repo.file(args[0])
         for i in range(r.count()):
             n = r.node(i)
             (p1, p2) = r.parents(n)
             (h, h1, h2) = map(hg.hex, (n, p1, p2))
             (i1, i2) = map(r.rev, (p1, p2))
             cr = r.linkrev(n)
             cn = hg.hex(repo.changelog.node(cr))
             print "rev:       %4d:%s" % (i, h)
             print "changeset: %4d:%s" % (cr, cn)
             print "parents:   %4d:%s" % (i1, h1)
             if i2: print "           %4d:%s" % (i2, h2)
             changes = repo.changelog.read(repo.changelog.node(cr))
             print "user: %s" % changes[1]
             print "date: %s" % time.asctime(
                 time.localtime(float(changes[2].split(' ')[0])))
             print "description:"
             print changes[4]
             print
     elif len(args) > 1:
         print "too many args"
     else:
         print "missing filename"
 
 elif cmd == "dump":
     if args:
         r = repo.file(args[0])
         n = r.tip()
         if len(args) > 1: n = r.lookup(args[1])
         sys.stdout.write(r.read(n))
     else:
         print "missing filename"
 
 elif cmd == "dumpmanifest":
     n = repo.manifest.tip()
     if len(args) > 0:
         n = repo.manifest.lookup(args[0])
     m = repo.manifest.read(n)
     files = m.keys()
     files.sort()
 
     for f in files:
         print hg.hex(m[f]), f
 
 elif cmd == "debugindex":
     if ".hg" not in args[0]:
         args[0] = ".hg/data/" + repo.file(args[0]).encodepath(args[0]) + "i"
     
     r = hg.revlog(open, args[0], "")
     print "   rev    offset  length   base linkrev"+\
           " p1           p2           nodeid"
     for i in range(r.count()):
         e = r.index[i]
         print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
             i, e[0], e[1], e[2], e[3],
             hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))
 
 elif cmd == "debugindexdot":
     if ".hg" not in args[0]:
         args[0] = ".hg/data/" + repo.file(args[0]).encodepath(args[0]) + "i"
 
     r = hg.revlog(open, args[0], "")
     print "digraph G {"
     for i in range(r.count()):
         e = r.index[i]
         print "\t%d -> %d" % (r.rev(e[4]), i)
         if e[5] != hg.nullid:
             print "\t%d -> %d" % (r.rev(e[5]), i)
     print "}"
 
 elif cmd == "merge":
     (c, a, d) = repo.diffdir(repo.root, repo.current)
     if c:
         ui.warn("aborting (outstanding changes in working directory)\n")
         sys.exit(1)
 
     if args:
         paths = {}
         try:
             pf = os.path.join(os.environ["HOME"], ".hgpaths")
             for l in file(pf):
                 name, path = l.split()
                 paths[name] = path
         except:
             pass
 
         if args[0] in paths: args[0] = paths[args[0]]
         
         other = hg.repository(ui, args[0])
         cg = repo.getchangegroup(other)
         repo.addchangegroup(cg)
     else:
         print "missing source repository"
 
 elif cmd == "tags":
     repo.lookup(0) # prime the cache
     i = repo.tags.items()
     i.sort()
     for k, n in i:
         try:
             r = repo.changelog.rev(n)
         except KeyError:
             r = "?"
         print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
 
 elif cmd == "recover":
     repo.recover()
 
 elif cmd == "undo":
     repo.recover("undo")
 
 elif cmd == "verify":
     filelinkrevs = {}
     filenodes = {}
     manifestchangeset = {}
     changesets = revisions = files = 0
     errors = 0
 
     ui.status("checking changesets\n")
     for i in range(repo.changelog.count()):
         changesets += 1
         n = repo.changelog.node(i)
         for p in repo.changelog.parents(n):
             if p not in repo.changelog.nodemap:
                 ui.warn("changeset %s has unknown parent %s\n" %
                         (hg.short(n), hg.short(p)))
                 errors += 1
         try:
             changes = repo.changelog.read(n)
         except Exception, inst:
             ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
             errors += 1
             
         manifestchangeset[changes[0]] = n
         for f in changes[3]:
             revisions += 1
             filelinkrevs.setdefault(f, []).append(i)
 
     ui.status("checking manifests\n")
     for i in range(repo.manifest.count()):
         n = repo.manifest.node(i)
         for p in repo.manifest.parents(n):
             if p not in repo.manifest.nodemap:
                 ui.warn("manifest %s has unknown parent %s\n" %
                         (hg.short(n), hg.short(p)))
                 errors += 1
         ca = repo.changelog.node(repo.manifest.linkrev(n))
         cc = manifestchangeset[n]
         if ca != cc:
             ui.warn("manifest %s points to %s, not %s\n" %
                     (hg.hex(n), hg.hex(ca), hg.hex(cc)))
             errors += 1
 
         try:
             delta = mdiff.patchtext(repo.manifest.delta(n))
         except KeyboardInterrupt:
             print "aborted"
             sys.exit(0)
         except Exception, inst:
             ui.warn("unpacking manifest %s: %s\n" % (hg.short(n), inst))
             errors += 1
 
         ff = [ l.split('\0') for l in delta.splitlines() ]
         for f, fn in ff:
             filenodes.setdefault(f, {})[hg.bin(fn)] = 1
 
     ui.status("crosschecking files in changesets and manifests\n")
     for f in filenodes:
         if f not in filelinkrevs:
             ui.warn("file %s in manifest but not in changesets\n" % f)
             errors += 1
 
     for f in filelinkrevs:
         if f not in filenodes:
             ui.warn("file %s in changeset but not in manifest\n" % f)
             errors += 1
 
     ui.status("checking files\n")
     ff = filenodes.keys()
     ff.sort()
     for f in ff:
         if f == "/dev/null": continue
         files += 1
         fl = repo.file(f)
         nodes = { hg.nullid: 1 }
         for i in range(fl.count()):
             n = fl.node(i)
 
             if n not in filenodes[f]:
                 ui.warn("%s: %d:%s not in manifests\n" % (f, i, hg.short(n)))
                 print len(filenodes[f].keys()), fl.count(), f
                 errors += 1
             else:
                 del filenodes[f][n]
 
             flr = fl.linkrev(n)
             if flr not in filelinkrevs[f]:
                 ui.warn("%s:%s points to unexpected changeset rev %d\n"
                         % (f, hg.short(n), fl.linkrev(n)))
                 errors += 1
             else:
                 filelinkrevs[f].remove(flr)
 
             # verify contents
             try:
                 t = fl.read(n)
             except Exception, inst:
                 ui.warn("unpacking file %s %s: %s\n" % (f, hg.short(n), inst))
                 errors += 1
             
             # verify parents
             (p1, p2) = fl.parents(n)
             if p1 not in nodes:
                 ui.warn("file %s:%s unknown parent 1 %s" %
                         (f, hg.short(n), hg.short(p1)))
                 errors += 1
             if p2 not in nodes:
                 ui.warn("file %s:%s unknown parent 2 %s" %
                         (f, hg.short(n), hg.short(p1)))
                 errors += 1
             nodes[n] = 1
 
         # cross-check
         for flr in filelinkrevs[f]:
             ui.warn("changeset rev %d not in %s\n" % (flr, f))
             errors += 1
             
         for node in filenodes[f]:
             ui.warn("node %s in manifests not in %s\n" % (hg.hex(n), f))
             errors += 1
 
     ui.status("%d files, %d changesets, %d total revisions\n" %
               (files, changesets, revisions))
     
     if errors:
         ui.warn("%d integrity errors encountered!\n" % errors)
         sys.exit(1)
 
 elif cmd == "serve":
     from mercurial import hgweb
     
     soptions = {}
     opts = [('p', 'port', 8000, 'listen port'),
             ('a', 'address', '', 'interface address'),
             ('n', 'name', os.getcwd(), 'repository name'),
             ('t', 'templates', "", 'template map')
             ]
     
     args = fancyopts.fancyopts(args, opts, soptions,
                               'hg serve [options]')
 
     hgweb.server(repo.root, soptions["name"], soptions["templates"],
                  soptions["address"], soptions["port"])
     
 else:
     if cmd: ui.warn("unknown command\n\n")
     help()
     sys.exit(1)