Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/scmutil.py
changeset 32659 7b17f9de6d3e
parent 32658 55ff67ffcead
child 33088 65cadeea6c22
equal deleted inserted replaced
32658:55ff67ffcead 32659:7b17f9de6d3e 
   188     except error.InterventionRequired as inst:
 
   188     except error.InterventionRequired as inst:
 
   189         ui.warn("%s\n" % inst)
 
   189         ui.warn("%s\n" % inst)
 
   190         if inst.hint:
 
   190         if inst.hint:
 
   191             ui.warn(_("(%s)\n") % inst.hint)
 
   191             ui.warn(_("(%s)\n") % inst.hint)
 
   192         return 1
 
   192         return 1
 
       
   193     except error.WdirUnsupported:
 
       
   194         ui.warn(_("abort: working directory revision cannot be specified\n"))
 
   193     except error.Abort as inst:
 
   195     except error.Abort as inst:
 
   194         ui.warn(_("abort: %s\n") % inst)
 
   196         ui.warn(_("abort: %s\n") % inst)
 
   195         if inst.hint:
 
   197         if inst.hint:
 
   196             ui.warn(_("(%s)\n") % inst.hint)
 
   198             ui.warn(_("(%s)\n") % inst.hint)
 
   197     except ImportError as inst:
 
   199     except ImportError as inst:
mercurial