cleanup: typos

hgext/convert/__init__.py

@@ -1,307 +1,307
 # convert.py Foreign SCM converter
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''import revisions from foreign VCS repositories into Mercurial'''
 
 import convcmd
 import cvsps
 import subversion
 from mercurial import commands
 from mercurial.i18n import _
 
 # Commands definition was moved elsewhere to ease demandload job.
 
 def convert(ui, src, dest=None, revmapfile=None, **opts):
     """convert a foreign SCM repository to a Mercurial one.
 
     Accepted source formats [identifiers]:
 
     - Mercurial [hg]
     - CVS [cvs]
     - Darcs [darcs]
     - git [git]
     - Subversion [svn]
     - Monotone [mtn]
     - GNU Arch [gnuarch]
     - Bazaar [bzr]
     - Perforce [p4]
 
     Accepted destination formats [identifiers]:
 
     - Mercurial [hg]
     - Subversion [svn] (history on branches is not preserved)
 
     If no revision is given, all revisions will be converted.
     Otherwise, convert will only import up to the named revision
     (given in a format understood by the source).
 
     If no destination directory name is specified, it defaults to the
     basename of the source with '-hg' appended. If the destination
     repository doesn't exist, it will be created.
 
     By default, all sources except Mercurial will use --branchsort.
     Mercurial uses --sourcesort to preserve original revision numbers
     order. Sort modes have the following effects:
 
     --branchsort  convert from parent to child revision when possible,
                   which means branches are usually converted one after
                   the other. It generates more compact repositories.
 
     --datesort    sort revisions by date. Converted repositories have
                   good-looking changelogs but are often an order of
                   magnitude larger than the same ones generated by
                   --branchsort.
 
     --sourcesort  try to preserve source revisions order, only
                   supported by Mercurial sources.
 
     If <REVMAP> isn't given, it will be put in a default location
     (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file
     that maps each source commit ID to the destination ID for that
     revision, like so::
 
       <source ID> <destination ID>
 
     If the file doesn't exist, it's automatically created. It's
     updated on each commit copied, so convert-repo can be interrupted
     and can be run repeatedly to copy new commits.
 
     The [username mapping] file is a simple text file that maps each
     source commit author to a destination commit author. It is handy
     for source SCMs that use unix logins to identify authors (eg:
     CVS). One line per author mapping and the line format is:
     srcauthor=whatever string you want
 
     The filemap is a file that allows filtering and remapping of files
     and directories. Each line can contain one of the following
     directives::
 
       include path/to/file-or-dir
 
       exclude path/to/file-or-dir
 
       rename path/to/source path/to/destination
 
-    Comment lines start with '#'. A specificed path matches if it
+    Comment lines start with '#'. A specified path matches if it
     equals the full relative name of a file or one of its parent
     directories. The 'include' or 'exclude' directive with the longest
     matching path applies, so line order does not matter.
 
     The 'include' directive causes a file, or all files under a
     directory, to be included in the destination repository, and the
     exclusion of all other files and directories not explicitly
     included. The 'exclude' directive causes files or directories to
     be omitted. The 'rename' directive renames a file or directory if
-    is converted. To rename from a subdirectory into the root of the
-    repository, use '.' as the path to rename to.
+    it is converted. To rename from a subdirectory into the root of
+    the repository, use '.' as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic
     history, letting you specify the parents of a revision. This is
     useful if you want to e.g. give a Subversion merge two parents, or
     graft two disconnected series of history together. Each entry
     contains a key, followed by a space, followed by one or two
     comma-separated values. The key is the revision ID in the source
     revision control system whose parents should be modified (same
     format as a key in .hg/shamap). The values are the revision IDs
     (in either the source or destination revision control system) that
     should be used as the new parents for that node. For example, if
     you have merged "release-1.0" into "trunk", then you should
     specify the revision on "trunk" as the first parent and the one on
     the "release-1.0" branch as the second.
 
     The branchmap is a file that allows you to rename a branch when it is
     being brought in from whatever external repository. When used in
     conjunction with a splicemap, it allows for a powerful combination
     to help fix even the most badly mismanaged repositories and turn them
     into nicely structured Mercurial repositories. The branchmap contains
     lines of the form "original_branch_name new_branch_name".
     "original_branch_name" is the name of the branch in the source
     repository, and "new_branch_name" is the name of the branch is the
     destination repository. This can be used to (for instance) move code
     in one repository from "default" to a named branch.
 
     Mercurial Source
     ----------------
 
     --config convert.hg.ignoreerrors=False    (boolean)
         ignore integrity errors when reading. Use it to fix Mercurial
         repositories with missing revlogs, by converting from and to
         Mercurial.
     --config convert.hg.saverev=False         (boolean)
         store original revision ID in changeset (forces target IDs to
         change)
     --config convert.hg.startrev=0            (hg revision identifier)
         convert start revision and its descendants
 
     CVS Source
     ----------
 
     CVS source will use a sandbox (i.e. a checked-out copy) from CVS
     to indicate the starting point of what will be converted. Direct
     access to the repository files is not needed, unless of course the
     repository is :local:. The conversion uses the top level directory
     in the sandbox to find the CVS repository, and then uses CVS rlog
     commands to find files to convert. This means that unless a
     filemap is given, all files under the starting directory will be
     converted, and that any directory reorganization in the CVS
     sandbox is ignored.
 
     The options shown are the defaults.
 
     --config convert.cvsps.cache=True         (boolean)
         Set to False to disable remote log caching, for testing and
         debugging purposes.
     --config convert.cvsps.fuzz=60            (integer)
         Specify the maximum time (in seconds) that is allowed between
         commits with identical user and log message in a single
         changeset. When very large files were checked in as part of a
         changeset then the default may not be long enough.
     --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
         Specify a regular expression to which commit log messages are
         matched. If a match occurs, then the conversion process will
         insert a dummy revision merging the branch on which this log
         message occurs to the branch indicated in the regex.
     --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
         Specify a regular expression to which commit log messages are
         matched. If a match occurs, then the conversion process will
         add the most recent revision on the branch indicated in the
         regex as the second parent of the changeset.
     --config hook.cvslog
         Specify a Python function to be called at the end of gathering
         the CVS log. The function is passed a list with the log entries,
         and can modify the entries in-place, or add or delete them.
     --config hook.cvschangesets
         Specify a Python function to be called after the changesets
         are calculated from the the CVS log. The function is passed
         a list with the changeset entries, and can modify the changesets
         in-place, or add or delete them.
 
     An additional "debugcvsps" Mercurial command allows the builtin
     changeset merging code to be run without doing a conversion. Its
     parameters and output are similar to that of cvsps 2.1. Please see
     the command help for more details.
 
     Subversion Source
     -----------------
 
     Subversion source detects classical trunk/branches/tags layouts.
     By default, the supplied "svn://repo/path/" source URL is
     converted as a single branch. If "svn://repo/path/trunk" exists it
     replaces the default branch. If "svn://repo/path/branches" exists,
     its subdirectories are listed as possible branches. If
     "svn://repo/path/tags" exists, it is looked for tags referencing
     converted branches. Default "trunk", "branches" and "tags" values
     can be overridden with following options. Set them to paths
     relative to the source URL, or leave them blank to disable auto
     detection.
 
     --config convert.svn.branches=branches    (directory name)
         specify the directory containing branches
     --config convert.svn.tags=tags            (directory name)
         specify the directory containing tags
     --config convert.svn.trunk=trunk          (directory name)
         specify the name of the trunk branch
 
     Source history can be retrieved starting at a specific revision,
     instead of being integrally converted. Only single branch
     conversions are supported.
 
     --config convert.svn.startrev=0           (svn revision number)
         specify start Subversion revision.
 
     Perforce Source
     ---------------
 
     The Perforce (P4) importer can be given a p4 depot path or a
     client specification as source. It will convert all files in the
     source to a flat Mercurial repository, ignoring labels, branches
     and integrations. Note that when a depot path is given you then
     usually should specify a target directory, because otherwise the
     target may be named ...-hg.
 
     It is possible to limit the amount of source history to be
     converted by specifying an initial Perforce revision.
 
     --config convert.p4.startrev=0            (perforce changelist number)
         specify initial Perforce revision.
 
     Mercurial Destination
     ---------------------
 
     --config convert.hg.clonebranches=False   (boolean)
         dispatch source branches in separate clones.
     --config convert.hg.tagsbranch=default    (branch name)
         tag revisions branch name
     --config convert.hg.usebranchnames=True   (boolean)
         preserve branch names
 
     """
     return convcmd.convert(ui, src, dest, revmapfile, **opts)
 
 def debugsvnlog(ui, **opts):
     return subversion.debugsvnlog(ui, **opts)
 
 def debugcvsps(ui, *args, **opts):
     '''create changeset information from CVS
 
     This command is intended as a debugging tool for the CVS to
     Mercurial converter, and can be used as a direct replacement for
     cvsps.
 
     Hg debugcvsps reads the CVS rlog for current directory (or any
     named directory) in the CVS repository, and converts the log to a
     series of changesets based on matching commit log entries and
     dates.'''
     return cvsps.debugcvsps(ui, *args, **opts)
 
 commands.norepo += " convert debugsvnlog debugcvsps"
 
 cmdtable = {
     "convert":
         (convert,
          [('A', 'authors', '',
            _('username mapping filename'), _('FILE')),
           ('d', 'dest-type', '',
            _('destination repository type'), _('TYPE')),
           ('', 'filemap', '',
            _('remap file names using contents of file'), _('FILE')),
           ('r', 'rev', '',
            _('import up to target revision REV'), _('REV')),
           ('s', 'source-type', '',
            _('source repository type'), _('TYPE')),
           ('', 'splicemap', '',
            _('splice synthesized history into place'), _('FILE')),
           ('', 'branchmap', '',
            _('change branch names while converting'), _('FILE')),
           ('', 'branchsort', None, _('try to sort changesets by branches')),
           ('', 'datesort', None, _('try to sort changesets by date')),
           ('', 'sourcesort', None, _('preserve source changesets order'))],
          _('hg convert [OPTION]... SOURCE [DEST [REVMAP]]')),
     "debugsvnlog":
         (debugsvnlog,
          [],
          'hg debugsvnlog'),
     "debugcvsps":
         (debugcvsps,
          [
           # Main options shared with cvsps-2.1
           ('b', 'branches', [], _('only return changes on specified branches')),
           ('p', 'prefix', '', _('prefix to remove from file names')),
           ('r', 'revisions', [],
            _('only return changes after or between specified tags')),
           ('u', 'update-cache', None, _("update cvs log cache")),
           ('x', 'new-cache', None, _("create new cvs log cache")),
           ('z', 'fuzz', 60, _('set commit time fuzz in seconds')),
           ('', 'root', '', _('specify cvsroot')),
           # Options specific to builtin cvsps
           ('', 'parents', '', _('show parent changesets')),
           ('', 'ancestors', '', _('show current changeset in ancestor branches')),
           # Options that are ignored for compatibility with cvsps-2.1
           ('A', 'cvs-direct', None, _('ignored for compatibility')),
          ],
          _('hg debugcvsps [OPTION]... [PATH]...')),
 }

mercurial/help/glossary.txt

@@ -1,357 +1,357
 Ancestor
     Any changeset that can be reached by an unbroken chain of parent
     changesets from a given changeset. More precisely, the ancestors
     of a changeset can be defined by two properties: a parent of a
     changeset is an ancestor, and a parent of an ancestor is an
     ancestor. See also: 'Descendant'.
 
 Branch
     (Noun) A child changeset that has been created from a parent that
     is not a head. These are known as topological branches, see
     'Branch, topological'. If a topological branch is named, it becomes
     a named branch. If a topological branch is not named, it becomes
     an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
 
     Branches may be created when changes are pulled from or pushed to
     a remote repository, since new heads may be created by these
     operations. Note that the term branch can also be used informally
     to describe a development process in which certain development is
-    done independently of other development.This is sometimes done
+    done independently of other development. This is sometimes done
     explicitly with a named branch, but it can also be done locally,
     using bookmarks or clones and anonymous branches.
 
     Example: "The experimental branch".
 
     (Verb) The action of creating a child changeset which results in
     its parent having more than one child.
 
     Example: "I'm going to branch at X".
 
 Branch, anonymous
     Every time a new child changeset is created from a parent that is not
     a head and the name of the branch is not changed, a new anonymous
     branch is created.
 
 Branch, closed
     A named branch whose branch heads have all been closed.
 
 Branch, default
     The branch assigned to a changeset when no name has previously been
     assigned.
 
 Branch head
     See 'Head, branch'.
 
 Branch, named
     A collection of changesets which have the same branch name. By
     default, children of a changeset in a named branch belong to the
     same named branch. A child can be explicitly assigned to a
     different branch. See :hg:`help branch`, :hg:`help branches` and
     :hg:`commit --close-branch` for more information on managing
     branches.
 
     Named branches can be thought of as a kind of namespace, dividing
     the collection of changesets that comprise the repository into a
     collection of disjoint subsets. A named branch is not necessarily
     a topological branch. If a new named branch is created from the
     head of another named branch, or the default branch, but no
     further changesets are added to that previous branch, then that
     previous branch will be a branch in name only.
 
 Branch tip
     See 'Tip, branch'.
 
 Branch, topological
     Every time a new child changeset is created from a parent that is
     not a head, a new topological branch is created. If a topological
     branch is named, it becomes a named branch. If a topological
     branch is not named, it becomes an anonymous branch of the
     current, possibly default, branch.
 
 Changelog
     A record of the changesets in the order in which they were added
     to the repository. This includes details such as changeset id,
     author, commit message, date, and list of changed files.
 
 Changeset
     A snapshot of the state of the repository used to record a change.
 
 Changeset, child
     The converse of parent changeset: if P is a parent of C, then C is
     a child of P. There is no limit to the number of children that a
     changeset may have.
 
 Changeset id
     A SHA-1 hash that uniquely identifies a changeset. It may be
     represented as either a "long" 40-byte hexadecimal string, or a
     "short" 12-byte hexadecimal string.
 
 Changeset, merge
     A changeset with two parents. This occurs when a merge is
     committed.
 
 Changeset, parent
     A revision upon which a child changeset is based. Specifically, a
     parent changeset of a changeset C is a changeset whose node
     immediately precedes C in the DAG. Changesets have at most two
     parents.
 
 Checkout
     (Noun) The working directory being updated to a specific
     revision. This use should probably be avoided where possible, as
     changeset is much more appropriate than checkout in this context.
 
     Example: "I'm using checkout X."
 
     (Verb) Updating the working directory to a specific changeset. See
     :hg:`help update`.
 
     Example: "I'm going to check out changeset X."
 
 Child changeset
     See 'Changeset, child'.
 
 Close changeset
     See 'Changeset, close'.
 
 Closed branch
     See 'Branch, closed'.
 
 Clone
     (Noun) An entire or partial copy of a repository. The partial
     clone must be in the form of a revision and its ancestors.
 
     Example: "Is your clone up to date?".
 
     (Verb) The process of creating a clone, using :hg:`clone`.
 
     Example: "I'm going to clone the repository".
 
 Closed branch head
     See 'Head, closed branch'.
 
 Commit
     (Noun) A synonym for changeset.
 
     Example: "Is the bug fixed in your recent commit?"
 
     (Verb) The act of recording changes to a repository. When files
     are committed in a working directory, Mercurial finds the
     differences between the committed files and their parent
     changeset, creating a new changeset in the repository.
 
     Example: "You should commit those changes now."
 
 Cset
     A common abbreviation of the term changeset.
 
 DAG
     The repository of changesets of a distributed version control
     system (DVCS) can be described as a directed acyclic graph (DAG),
     consisting of nodes and edges, where nodes correspond to
     changesets and edges imply a parent -> child relation. This graph
     can be visualized by graphical tools such as :hg:`glog`
     (graphlog). In Mercurial, the DAG is limited by the requirement
     for children to have at most two parents.
 
 Default branch
     See 'Branch, default'.
 
 Descendant
     Any changeset that can be reached by a chain of child changesets
     from a given changeset. More precisely, the descendants of a
     changeset can be defined by two properties: the child of a
     changeset is a descendant, and the child of a descendant is a
     descendant. See also: 'Ancestor'.
 
 Diff
     (Noun) The difference between the contents and attributes of files
     in two changesets or a changeset and the current working
     directory. The difference is usually represented in a standard
     form called a "diff" or "patch". The "git diff" format is used
     when the changes include copies, renames, or changes to file
     attributes, none of which can be represented/handled by classic
     "diff" and "patch".
 
     Example: "Did you see my correction in the diff?"
 
     (Verb) Diffing two changesets is the action of creating a diff or
     patch.
 
     Example: "If you diff with changeset X, you will see what I mean."
 
 Directory, working
     The working directory represents the state of the files tracked by
     Mercurial, that will be recorded in the next commit. The working
     directory initially corresponds to the snapshot at an existing
     changeset, known as the parent of the working directory. See
     'Parent, working directory'. The state may be modified by changes
     to the files introduced manually or by a merge. The repository
     metadata exists in the .hg directory inside the working directory.
 
 Graph
     See DAG and :hg:`help graphlog`.
 
 Head
     The term 'head' may be used to refer to both a branch head or a
     repository head, depending on the context. See 'Head, branch' and
     'Head, repository' for specific definitions.
 
     Heads are where development generally takes place and are the
     usual targets for update and merge operations.
 
 Head, branch
     A changeset with no descendants on the same named branch.
 
 Head, closed branch
     A changeset that marks a head as no longer interesting. The closed
     head is no longer listed by :hg:`heads`. A branch is considered
     closed when all its heads are closed and consequently is not
     listed by :hg:`branches`.
 
 Head, repository
     A topological head which has not been closed.
 
 Head, topological
     A changeset with no children in the repository.
 
 History, immutable
     Once committed, changesets cannot be altered.  Extensions which
     appear to change history actually create new changesets that
     replace existing ones, and then destroy the old changesets. Doing
     so in public repositories can result in old changesets being
     reintroduced to the repository.
 
 History, rewriting
     The changesets in a repository are immutable. However, extensions
     to Mercurial can be used to alter the repository, usually in such
     a way as to preserve changeset contents.
 
 Immutable history
     See 'History, immutable'.
 
 Merge changeset
     See 'Changeset, merge'.
 
 Manifest
     Each changeset has a manifest, which is the list of files that are
     tracked by the changeset.
 
 Merge
     Used to bring together divergent branches of work. When you update
     to a changeset and then merge another changeset, you bring the
     history of the latter changeset into your working directory. Once
     conflicts are resolved (and marked), this merge may be committed
     as a merge changeset, bringing two branches together in the DAG.
 
 Named branch
     See 'Branch, named'.
 
 Null changeset
     The empty changeset. It is the parent state of newly-initialized
     repositories and repositories with no checked out revision. It is
     thus the parent of root changesets and the effective ancestor when
     merging unrelated changesets. Can be specified by the alias 'null'
     or by the changeset ID '000000000000'.
 
 Parent
     See 'Changeset, parent'.
 
 Parent changeset
     See 'Changeset, parent'.
 
 Parent, working directory
     The working directory parent reflects a virtual revision which is
     the child of the changeset (or two changesets with an uncommitted
     merge) shown by :hg:`parents`. This is changed with
     :hg:`update`. Other commands to see the working directory parent
     are :hg:`summary` and :hg:`id`. Can be specified by the alias ".".
 
 Patch
     (Noun) The product of a diff operation.
 
     Example: "I've sent you my patch."
 
     (Verb) The process of using a patch file to transform one
     changeset into another.
 
     Example: "You will need to patch that revision."
 
 Pull
     An operation in which changesets in a remote repository which are
     not in the local repository are brought into the local
     repository. Note that this operation without special arguments
     only updates the repository, it does not update the files in the
     working directory. See :hg:`help pull`.
 
 Push
     An operation in which changesets in a local repository which are
     not in a remote repository are sent to the remote repository. Note
     that this operation only adds changesets which have been committed
     locally to the remote repository. Uncommitted changes are not
     sent. See :hg:`help push`.
 
 Repository
     The metadata describing all recorded states of a collection of
     files. Each recorded state is represented by a changeset. A
     repository is usually (but not always) found in the ``.hg``
     subdirectory of a working directory. Any recorded state can be
     recreated by "updating" a working directory to a specific
     changeset.
 
 Repository head
     See 'Head, repository'.
 
 Revision
     A state of the repository at some point in time. Earlier revisions
     can be updated to by using :hg:`update`.  See also 'Revision
     number'; See also 'Changeset'.
 
 Revision number
     This integer uniquely identifies a changeset in a specific
     repository. It represents the order in which changesets were added
     to a repository, starting with revision number 0. Note that the
     revision number may be different in each clone of a repository. To
     identify changesets uniquely between different clones, see
     'Changeset id'.
 
 Revlog
     History storage mechanism used by Mercurial. It is a form of delta
     encoding, with occasional full revision of data followed by delta
     of each successive revision. It includes data and an index
     pointing to the data.
 
 Rewriting history
     See 'History, rewriting'.
 
 Root
     A changeset that has only the null changeset as its parent. Most
     repositories have only a single root changeset.
 
 Tip
     The changeset with the highest revision number. It is the changeset
     most recently added in a repository.
 
 Tip, branch
     The head of a given branch with the highest revision number. When
     a branch name is used as a revision identifier, it refers to the
     branch tip. See also 'Branch, head'. Note that because revision
     numbers may be different in different repository clones, the
     branch tip may be different in different cloned repositories.
 
 Update
     (Noun) Another synonym of changeset.
 
     Example: "I've pushed an update".
 
     (Verb) This term is usually used to describe updating the state of
     the working directory to that of a specific changeset. See
     :hg:`help update`.
 
     Example: "You should update".
 
 Working directory
     See 'Directory, working'.
 
 Working directory parent
     See 'Parent, working directory'.

mercurial/transaction.py

@@ -1,176 +1,176
 # transaction.py - simple journalling scheme for mercurial
 #
 # This transaction scheme is intended to gracefully handle program
 # errors and interruptions. More serious failures like system crashes
 # can be recovered with an fsck-like tool. As the whole repository is
 # effectively log-structured, this should amount to simply truncating
 # anything that isn't referenced in the changelog.
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from i18n import _
 import os, errno
 import error
 
 def active(func):
     def _active(self, *args, **kwds):
         if self.count == 0:
             raise error.Abort(_(
                 'cannot use transaction when it is already committed/aborted'))
         return func(self, *args, **kwds)
     return _active
 
 def _playback(journal, report, opener, entries, unlink=True):
     for f, o, ignore in entries:
         if o or not unlink:
             try:
                 opener(f, 'a').truncate(o)
             except IOError:
                 report(_("failed to truncate %s\n") % f)
                 raise
         else:
             try:
                 fn = opener(f).name
                 os.unlink(fn)
             except (IOError, OSError), inst:
                 if inst.errno != errno.ENOENT:
                     raise
     os.unlink(journal)
 
 class transaction(object):
     def __init__(self, report, opener, journal, after=None, createmode=None):
         self.count = 1
         self.usages = 1
         self.report = report
         self.opener = opener
         self.after = after
         self.entries = []
         self.map = {}
         self.journal = journal
         self._queue = []
 
         self.file = open(self.journal, "w")
         if createmode is not None:
             os.chmod(self.journal, createmode & 0666)
 
     def __del__(self):
         if self.journal:
             self._abort()
 
     @active
     def startgroup(self):
         self._queue.append([])
 
     @active
     def endgroup(self):
         q = self._queue.pop()
         d = ''.join(['%s\0%d\n' % (x[0], x[1]) for x in q])
         self.entries.extend(q)
         self.file.write(d)
         self.file.flush()
 
     @active
     def add(self, file, offset, data=None):
         if file in self.map:
             return
         if self._queue:
             self._queue[-1].append((file, offset, data))
             return
 
         self.entries.append((file, offset, data))
         self.map[file] = len(self.entries) - 1
         # add enough data to the journal to do the truncate
         self.file.write("%s\0%d\n" % (file, offset))
         self.file.flush()
 
     @active
     def find(self, file):
         if file in self.map:
             return self.entries[self.map[file]]
         return None
 
     @active
     def replace(self, file, offset, data=None):
         '''
         replace can only replace already committed entries
         that are not pending in the queue
         '''
 
         if file not in self.map:
             raise KeyError(file)
         index = self.map[file]
         self.entries[index] = (file, offset, data)
         self.file.write("%s\0%d\n" % (file, offset))
         self.file.flush()
 
     @active
     def nest(self):
         self.count += 1
         self.usages += 1
         return self
 
     def release(self):
         if self.count > 0:
             self.usages -= 1
-        # of the transaction scopes are left without being closed, fail
+        # if the transaction scopes are left without being closed, fail
         if self.count > 0 and self.usages == 0:
             self._abort()
 
     def running(self):
         return self.count > 0
 
     @active
     def close(self):
         '''commit the transaction'''
         self.count -= 1
         if self.count != 0:
             return
         self.file.close()
         self.entries = []
         if self.after:
             self.after()
         if os.path.isfile(self.journal):
             os.unlink(self.journal)
         self.journal = None
 
     @active
     def abort(self):
         '''abort the transaction (generally called on error, or when the
         transaction is not explicitly committed before going out of
         scope)'''
         self._abort()
 
     def _abort(self):
         self.count = 0
         self.usages = 0
         self.file.close()
 
         try:
             if not self.entries:
                 if self.journal:
                     os.unlink(self.journal)
                 return
 
             self.report(_("transaction abort!\n"))
 
             try:
                 _playback(self.journal, self.report, self.opener,
                           self.entries, False)
                 self.report(_("rollback completed\n"))
             except:
                 self.report(_("rollback failed - please run hg recover\n"))
         finally:
             self.journal = None
 
 
 def rollback(opener, file, report):
     entries = []
 
     for l in open(file).readlines():
         f, o = l.split('\0')
         entries.append((f, int(o), None))
 
     _playback(file, report, opener, entries)

tests/test-convert.out

@@ -1,306 +1,306
 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
 
 convert a foreign SCM repository to a Mercurial one.
 
     Accepted source formats [identifiers]:
 
     - Mercurial [hg]
     - CVS [cvs]
     - Darcs [darcs]
     - git [git]
     - Subversion [svn]
     - Monotone [mtn]
     - GNU Arch [gnuarch]
     - Bazaar [bzr]
     - Perforce [p4]
 
     Accepted destination formats [identifiers]:
 
     - Mercurial [hg]
     - Subversion [svn] (history on branches is not preserved)
 
     If no revision is given, all revisions will be converted. Otherwise,
     convert will only import up to the named revision (given in a format
     understood by the source).
 
     If no destination directory name is specified, it defaults to the basename
     of the source with '-hg' appended. If the destination repository doesn't
     exist, it will be created.
 
     By default, all sources except Mercurial will use --branchsort. Mercurial
     uses --sourcesort to preserve original revision numbers order. Sort modes
     have the following effects:
 
     --branchsort  convert from parent to child revision when possible, which
                   means branches are usually converted one after the other. It
                   generates more compact repositories.
     --datesort    sort revisions by date. Converted repositories have good-
                   looking changelogs but are often an order of magnitude
                   larger than the same ones generated by --branchsort.
     --sourcesort  try to preserve source revisions order, only supported by
                   Mercurial sources.
 
     If <REVMAP> isn't given, it will be put in a default location
     (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that
     maps each source commit ID to the destination ID for that revision, like
     so:
 
       <source ID> <destination ID>
 
     If the file doesn't exist, it's automatically created. It's updated on
     each commit copied, so convert-repo can be interrupted and can be run
     repeatedly to copy new commits.
 
     The [username mapping] file is a simple text file that maps each source
     commit author to a destination commit author. It is handy for source SCMs
     that use unix logins to identify authors (eg: CVS). One line per author
     mapping and the line format is: srcauthor=whatever string you want
 
     The filemap is a file that allows filtering and remapping of files and
     directories. Each line can contain one of the following directives:
 
       include path/to/file-or-dir
 
       exclude path/to/file-or-dir
 
       rename path/to/source path/to/destination
 
-    Comment lines start with '#'. A specificed path matches if it equals the
+    Comment lines start with '#'. A specified path matches if it equals the
     full relative name of a file or one of its parent directories. The
     'include' or 'exclude' directive with the longest matching path applies,
     so line order does not matter.
 
     The 'include' directive causes a file, or all files under a directory, to
     be included in the destination repository, and the exclusion of all other
     files and directories not explicitly included. The 'exclude' directive
     causes files or directories to be omitted. The 'rename' directive renames
-    a file or directory if is converted. To rename from a subdirectory into
+    a file or directory if it is converted. To rename from a subdirectory into
     the root of the repository, use '.' as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic history,
     letting you specify the parents of a revision. This is useful if you want
     to e.g. give a Subversion merge two parents, or graft two disconnected
     series of history together. Each entry contains a key, followed by a
     space, followed by one or two comma-separated values. The key is the
     revision ID in the source revision control system whose parents should be
     modified (same format as a key in .hg/shamap). The values are the revision
     IDs (in either the source or destination revision control system) that
     should be used as the new parents for that node. For example, if you have
     merged "release-1.0" into "trunk", then you should specify the revision on
     "trunk" as the first parent and the one on the "release-1.0" branch as the
     second.
 
     The branchmap is a file that allows you to rename a branch when it is
     being brought in from whatever external repository. When used in
     conjunction with a splicemap, it allows for a powerful combination to help
     fix even the most badly mismanaged repositories and turn them into nicely
     structured Mercurial repositories. The branchmap contains lines of the
     form "original_branch_name new_branch_name". "original_branch_name" is the
     name of the branch in the source repository, and "new_branch_name" is the
     name of the branch is the destination repository. This can be used to (for
     instance) move code in one repository from "default" to a named branch.
 
     Mercurial Source
     ----------------
 
     --config convert.hg.ignoreerrors=False    (boolean)
         ignore integrity errors when reading. Use it to fix Mercurial
         repositories with missing revlogs, by converting from and to
         Mercurial.
 
     --config convert.hg.saverev=False         (boolean)
         store original revision ID in changeset (forces target IDs to change)
 
     --config convert.hg.startrev=0            (hg revision identifier)
         convert start revision and its descendants
 
     CVS Source
     ----------
 
     CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
     indicate the starting point of what will be converted. Direct access to
     the repository files is not needed, unless of course the repository is
     :local:. The conversion uses the top level directory in the sandbox to
     find the CVS repository, and then uses CVS rlog commands to find files to
     convert. This means that unless a filemap is given, all files under the
     starting directory will be converted, and that any directory
     reorganization in the CVS sandbox is ignored.
 
     The options shown are the defaults.
 
     --config convert.cvsps.cache=True         (boolean)
         Set to False to disable remote log caching, for testing and debugging
         purposes.
 
     --config convert.cvsps.fuzz=60            (integer)
         Specify the maximum time (in seconds) that is allowed between commits
         with identical user and log message in a single changeset. When very
         large files were checked in as part of a changeset then the default
         may not be long enough.
 
     --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
         Specify a regular expression to which commit log messages are matched.
         If a match occurs, then the conversion process will insert a dummy
         revision merging the branch on which this log message occurs to the
         branch indicated in the regex.
 
     --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
         Specify a regular expression to which commit log messages are matched.
         If a match occurs, then the conversion process will add the most
         recent revision on the branch indicated in the regex as the second
         parent of the changeset.
 
     --config hook.cvslog
         Specify a Python function to be called at the end of gathering the CVS
         log. The function is passed a list with the log entries, and can
         modify the entries in-place, or add or delete them.
 
     --config hook.cvschangesets
         Specify a Python function to be called after the changesets are
         calculated from the the CVS log. The function is passed a list with
         the changeset entries, and can modify the changesets in-place, or add
         or delete them.
 
     An additional "debugcvsps" Mercurial command allows the builtin changeset
     merging code to be run without doing a conversion. Its parameters and
     output are similar to that of cvsps 2.1. Please see the command help for
     more details.
 
     Subversion Source
     -----------------
 
     Subversion source detects classical trunk/branches/tags layouts. By
     default, the supplied "svn://repo/path/" source URL is converted as a
     single branch. If "svn://repo/path/trunk" exists it replaces the default
     branch. If "svn://repo/path/branches" exists, its subdirectories are
     listed as possible branches. If "svn://repo/path/tags" exists, it is
     looked for tags referencing converted branches. Default "trunk",
     "branches" and "tags" values can be overridden with following options. Set
     them to paths relative to the source URL, or leave them blank to disable
     auto detection.
 
     --config convert.svn.branches=branches    (directory name)
         specify the directory containing branches
 
     --config convert.svn.tags=tags            (directory name)
         specify the directory containing tags
 
     --config convert.svn.trunk=trunk          (directory name)
         specify the name of the trunk branch
 
     Source history can be retrieved starting at a specific revision, instead
     of being integrally converted. Only single branch conversions are
     supported.
 
     --config convert.svn.startrev=0           (svn revision number)
         specify start Subversion revision.
 
     Perforce Source
     ---------------
 
     The Perforce (P4) importer can be given a p4 depot path or a client
     specification as source. It will convert all files in the source to a flat
     Mercurial repository, ignoring labels, branches and integrations. Note
     that when a depot path is given you then usually should specify a target
     directory, because otherwise the target may be named ...-hg.
 
     It is possible to limit the amount of source history to be converted by
     specifying an initial Perforce revision.
 
     --config convert.p4.startrev=0            (perforce changelist number)
         specify initial Perforce revision.
 
     Mercurial Destination
     ---------------------
 
     --config convert.hg.clonebranches=False   (boolean)
         dispatch source branches in separate clones.
 
     --config convert.hg.tagsbranch=default    (branch name)
         tag revisions branch name
 
     --config convert.hg.usebranchnames=True   (boolean)
         preserve branch names
 
 options:
 
  -A --authors FILE      username mapping filename
  -d --dest-type TYPE    destination repository type
     --filemap FILE      remap file names using contents of file
  -r --rev REV           import up to target revision REV
  -s --source-type TYPE  source repository type
     --splicemap FILE    splice synthesized history into place
     --branchmap FILE    change branch names while converting
     --branchsort        try to sort changesets by branches
     --datesort          try to sort changesets by date
     --sourcesort        preserve source changesets order
 
 use "hg -v help convert" to show global options
 adding a
 assuming destination a-hg
 initializing destination a-hg repository
 scanning source...
 sorting...
 converting...
 4 a
 3 b
 2 c
 1 d
 0 e
 pulling from ../a
 searching for changes
 no changes found
 % should fail
 initializing destination bogusfile repository
 abort: cannot create new bundle repository
 % should fail
 abort: Permission denied: bogusdir
 % should succeed
 initializing destination bogusdir repository
 scanning source...
 sorting...
 converting...
 4 a
 3 b
 2 c
 1 d
 0 e
 % test pre and post conversion actions
 run hg source pre-conversion action
 run hg sink pre-conversion action
 run hg sink post-conversion action
 run hg source post-conversion action
 % converting empty dir should fail nicely
 assuming destination emptydir-hg
 initializing destination emptydir-hg repository
 emptydir does not look like a CVS checkout
 emptydir does not look like a Git repository
 emptydir does not look like a Subversion repository
 emptydir is not a local Mercurial repository
 emptydir does not look like a darcs repository
 emptydir does not look like a monotone repository
 emptydir does not look like a GNU Arch repository
 emptydir does not look like a Bazaar repository
 cannot find required "p4" tool
 abort: emptydir: missing or unsupported repository
 % convert with imaginary source type
 initializing destination a-foo repository
 abort: foo: invalid source repository type
 % convert with imaginary sink type
 abort: foo: invalid destination repository type
 
 % testing: convert must not produce duplicate entries in fncache
 initializing destination b repository
 scanning source...
 sorting...
 converting...
 4 a
 3 b
 2 c
 1 d
 0 e
 % contents of fncache file:
 data/a.i
 data/b.i
 % test bogus URL
 abort: bzr+ssh://[e-mail]/baz: missing or unsupported repository