Commits

Dan Villiom Podlaski Christiansen committed af74a5c

conform to the Mercurial custom of lowercase messages

...and while at it, use the more usual long form of "can't"

Comments (0)

Files changed (6)

     """Warn that the working directory parent is an obsolete changeset"""
     res = origfn(ui, repo, *args, **opts)
     if repo['.'].obsolete():
-        ui.warn(_('Working directory parent is obsolete\n'))
+        ui.warn(_('working directory parent is obsolete!\n'))
     return res
 
 # XXX this could wrap transaction code
     children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
     if not children:
-        ui.warn(_('No non-obsolete children\n'))
+        ui.warn(_('no non-obsolete children\n'))
         return 1
     if len(children) == 1:
         c = children[0]
     else:
         for c in children:
             displayer.show(c)
-        ui.warn(_('Multiple non-obsolete children, explicitly update to one\n'))
+        ui.warn(_('multiple non-obsolete children, explicitly update to one\n'))
         return 1
 
 def _reachablefrombookmark(repo, revs, mark):
         obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)]
         if obsoleted and len(revs) > 1:
 
-            raise error.Abort(_('Can not graft multiple revision while '
+            raise error.Abort(_('cannot graft multiple revisions while '
                                 'obsoleting (for now).'))
 
         return commitwrapper(orig, ui, repo,*revs, **kwargs)

tests/test-obsolete.t

   4
   - 725c380fe99b
   $ hg up --hidden 3 -q
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ mkcommit d # 5 (on 3)
   1 new unstable changesets
   $ qlog -r 'obsolete()'
   0
   - 1f0dee641bb7
   $ hg up --hidden 3 -q
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ mkcommit obsol_d # 6
   created new head
   1 new unstable changesets
   [1]
 
   $ hg up --hidden -q .^ # 3
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ mkcommit "obsol_d'" # 7
   created new head
   1 new unstable changesets
 Test rollback support
 
   $ hg up --hidden .^ -q # 3
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ mkcommit "obsol_d''"
   created new head
   1 new unstable changesets

tests/test-stabilize-result.t

   $ hg amend
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ mv a a.old
   $ echo 'jungle' > a
   $ cat a.old >> a
 
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ echo 'gotta break' >> a
   $ hg amend
   2 new divergent changesets

tests/test-touch.t

   $ hg commit -m ab --amend
   $ hg up --hidden 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ hg log -G
   o  3:[0-9a-f]{12} ab (re)
   

tests/test-tutorial.t

   pulling from $TESTTMP/local
   searching for changes
   no changes found
-  Working directory parent is obsolete
+  working directory parent is obsolete!
 
   $ hg up ee942144f952
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-uncommit.t

 
   $ hg up -C 3 --hidden
   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
   2 new divergent changesets
 
   $ hg up -C 3 --hidden
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  Working directory parent is obsolete
+  working directory parent is obsolete!
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
   1 new divergent changesets
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.