Commits

Patrick Mézard committed 0bc0c9e

evolve: usual syntax/grammar errors/long lines cleanup

Comments (0)

Files changed (5)

 Collapse changesets: ``fold``
 ------------------------------------------------------------
 
-you can use ``hg fold`` to collapse multiple changeset in a single one.
+you can use ``hg fold`` to collapse multiple changesets in a single one.
 
 Getting changes out of a commit
 ------------------------------------------------------------
 View obsolete markers
 ------------------------------------------------------------
 
-hgview_ is the only viewer that currently support this feature. You need version 1.6.2
+hgview_ is the only viewer that currently supports this feature. You
+need version 1.6.2
 
 .. _hgview: http://www.logilab.org/project/hgview/
 
 
 .. -c is very confusig
 ..
-.. The amend command also has a -c switch which allow you to make an
+.. The amend command also has a -c switch which allows you to make an
 .. explicit amending commit before rewriting a changeset.::
 ..
 ..   $ hg record -m 'feature A'
-..   # oups, I forget some stuff
+..   # oups, I forgot some stuff
 ..   $ hg record babar.py
 ..   $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
 
 
 * Cover all mq usage but guard.
 
-.. warning:: The evolve extention and the obsolete marker are at an experimental
-             stage. While using obsolete you'll likely be exposed to complex
-             implication of the **obsolete marker** concept. I do not recommend
-             non-power user to test this at this stage.
+.. warning:: The evolve extension and obsolete markers are at an experimental
+             stage. While using obsolete you willl likely be exposed to complex
+             implications of the **obsolete marker** concept. I do not recommend
+             non-power users to test this at this stage.
 
-             Even numbered 1.0.0 the command line API of this version should
-             **not** be regard as *stable*, command behavior, name and option
-             may change in future relase and in mercurial integration. It is
-             still an immature extension, a lot a feature are still missing but
-             there is not high risk of corrupting your repo.
+             While numbered 1.0.0, the command line API of this version should
+             **not** be regarded as *stable*, command behavior, name and
+             options may change in future release or once integrated in
+             mercurial. It is still an immature extension, a lot of
+             features are still missing but there is no high risk of
+             repository corruption.
 
              Production ready version should hide such details to normal user.
 
 # Obsolescence related logic can be very slow if we don't have efficient cache.
 #
 # This section implements a cache mechanism that did not make it into core for
-# time reason. It store meaningful set of revision related to obsolescence
-# (obsolete, unstabletble ...
+# time reason. It stores meaningful set of revisions related to obsolescence
+# (obsolete, unstable, etc.)
 #
 # Here is:
 #
-# - Computation of meaningful set,
+# - Computation of meaningful sets
 # - Cache access logic,
 # - Cache invalidation logic,
 # - revset and ctx using this cache.
     return orig(repo, remote, outgoing, *args, **kwargs)
 
 #####################################################################
-### Filter extinct changeset from common operation                ###
+### Filter extinct changesets from common operations              ###
 #####################################################################
 
 @eh.wrapfunction(merge, 'update')
     # search of a parent which is not killed
     while newer == [()]:
         ui.debug("stabilize target %s is plain dead,"
-                 " trying to stabilize on it's parent")
+                 " trying to stabilize on its parent")
         obs = obs.parents()[0]
         newer = newerversion(repo, obs.node())
     if len(newer) > 1:
     if len(other.parents()) > 1:
         raise util.Abort("conflicting changeset can't be a merge (yet)")
     if other.p1() not in conflicting.parents():
-        raise util.Abort("parent are not common (not handled yet)")
+        raise util.Abort("parents are not common (not handled yet)")
 
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
     ui.status(_('merge:'))
     if dryrun:
         ui.write('hg update -c %s &&\n' % conflicting)
         ui.write('hg merge %s && \n' % other)
-        ui.write('hg commit -m "auto merge resolving conflict between %s and %s"&&\n'
-                  % (conflicting, other))
+        ui.write('hg commit -m "auto merge resolving conflict between '
+                 '%s and %s"&&\n' % (conflicting, other))
         ui.write('hg up -C %s &&\n' % base)
         ui.write('hg revert --all --rev tip &&\n')
-        ui.write('hg commit -m "`hg log -r %s --template={desc}`";\n' % conflicting)
+        ui.write('hg commit -m "`hg log -r %s --template={desc}`";\n'
+                 % conflicting)
         return
-    #oldphase = max(conflicting.phase(), other.phase())
     wlock = lock = None
     try:
         wlock = repo.wlock()
         if stats[3]:
             repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                              "or 'hg update -C .' to abandon\n"))
-        #repo.dirstate.write()
         if stats[3] > 0:
             raise util.Abort('GASP! Merge Conflict! You are on you own chap!',
-                             hint='/!\\ hg evolve --continue will NOT work /!\\')
+                hint='/!\\ hg evolve --continue will NOT work /!\\')
         tr = repo.transaction('stabilize-conflicting')
         try:
             repo.dirstate.setparents(conflicting.node(), node.nullid)
     _('[-r] revs'))
 def touch(ui, repo, *revs, **opts):
     """Create successors with exact same property but hash
-    
-    This is used to "resurect" changeset"""
+
+    This is used to "resurrect" changesets
+    """
     revs = list(revs)
     revs.extend(opts['rev'])
     if not revs:
         lockmod.release(lock, wlock)
 
 @command('^fold',
-    [('r', 'rev', [], 'revision to fold'),],
+    [('r', 'rev', [], 'revisions to fold'),],
     # allow to choose the seed ?
     _('[-r] revs'))
 def fold(ui, repo, *revs, **opts):
-    """Fold multiple revision into a single one"""
+    """Fold multiple revisions into a single one"""
     revs = list(revs)
     revs.extend(opts['rev'])
     if not revs:
         return 1
     roots = repo.revs('roots(%ld)', revs)
     if len(roots) > 1:
-        raise util.Abort("set have multiple roots")
+        raise util.Abort("set has multiple roots")
     root = repo[roots[0]]
     if root.phase() <= phases.public:
-        raise util.Abort("can't touch public revision")
+        raise util.Abort("can't fold public revisions")
     heads = repo.revs('heads(%ld)', revs)
     if len(heads) > 1:
-        raise util.Abort("set have multiple heads")
+        raise util.Abort("set has multiple heads")
     head = repo[heads[0]]
     wlock = lock = None
     try:

tests/test-stabilize-result.t

 Stabilize of late comer with different parent
 ==================================================
 
-(the with same parent is handled in test-evolve.t)
+(the same parent case is handled in test-evolve.t)
 
   $ glog
   @  8:e3183e9c0961@default(draft) bk:[] newer a
   o  0:07f494440405@default(public) bk:[] adda
   
 
-Stabilize of conflicting changeset with same parent
-====================================================
+Stabilize conflicting changesets with same parent
+=================================================
 
   $ rm a.orig
   $ hg up 9