Mercurial > evolve
changeset 743:af74a5cdf96b
conform to the Mercurial custom of lowercase messages
...and while at it, use the more usual long form of "can't"
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Fri, 26 Jul 2013 12:06:44 +0200 |
| parents | 760d01a549a6 |
| children | 72d7b0b9edd6 |
| files | hgext/evolve.py tests/test-obsolete.t tests/test-stabilize-result.t tests/test-touch.t tests/test-tutorial.t tests/test-uncommit.t |
| diffstat | 6 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Wed Oct 16 00:37:29 2013 +0200 +++ b/hgext/evolve.py Fri Jul 26 12:06:44 2013 +0200 @@ -562,7 +562,7 @@ """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 @@ -1236,7 +1236,7 @@ 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] @@ -1246,7 +1246,7 @@ 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): @@ -1716,7 +1716,7 @@ 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)
--- a/tests/test-obsolete.t Wed Oct 16 00:37:29 2013 +0200 +++ b/tests/test-obsolete.t Fri Jul 26 12:06:44 2013 +0200 @@ -119,7 +119,7 @@ 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()' @@ -193,7 +193,7 @@ 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 @@ -249,7 +249,7 @@ [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 @@ -336,7 +336,7 @@ 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
--- a/tests/test-stabilize-result.t Wed Oct 16 00:37:29 2013 +0200 +++ b/tests/test-stabilize-result.t Fri Jul 26 12:06:44 2013 +0200 @@ -202,7 +202,7 @@ $ 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 @@ -295,7 +295,7 @@ $ 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
--- a/tests/test-touch.t Wed Oct 16 00:37:29 2013 +0200 +++ b/tests/test-touch.t Fri Jul 26 12:06:44 2013 +0200 @@ -33,7 +33,7 @@ $ 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)
--- a/tests/test-tutorial.t Wed Oct 16 00:37:29 2013 +0200 +++ b/tests/test-tutorial.t Fri Jul 26 12:06:44 2013 +0200 @@ -667,7 +667,7 @@ 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
--- a/tests/test-uncommit.t Wed Oct 16 00:37:29 2013 +0200 +++ b/tests/test-uncommit.t Fri Jul 26 12:06:44 2013 +0200 @@ -238,7 +238,7 @@ $ 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 @@ -282,7 +282,7 @@ $ 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