Mercurial > evolve
changeset 4613:30a544904238
messages: standardize on "working copy is now at" including "is"
It seemed that we mostly used "is", but `hg next` and `hg prune` could
print it without the "is".
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 25 Apr 2019 15:14:21 -0700 |
parents | c289f06028d0 |
children | 091eab1223a4 |
files | hgext3rd/evolve/__init__.py hgext3rd/evolve/cmdrewrite.py tests/test-evolve-abort-orphan.t tests/test-evolve-cycles.t tests/test-evolve-obshistory-prune.t tests/test-evolve-orphan-merge.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-exchange-obsmarkers-case-D2.t tests/test-exchange-obsmarkers-case-D3.t tests/test-prev-next.t tests/test-prune.t tests/test-split.t tests/test-topic-tutorial.t tests/test-touch.t tests/test-tutorial.t tests/test-uncommit-interactive.t tests/test-userguide.t |
diffstat | 18 files changed, 33 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Thu Apr 25 13:58:29 2019 -0700 +++ b/hgext3rd/evolve/__init__.py Thu Apr 25 15:14:21 2019 -0700 @@ -1159,7 +1159,7 @@ False)) # making sure a next commit is formed if result[0] and result[1]: - ui.status(_('working directory now at %s\n') + ui.status(_('working directory is now at %s\n') % ui.label(str(repo['.']), 'evolve.node')) return 0
--- a/hgext3rd/evolve/cmdrewrite.py Thu Apr 25 13:58:29 2019 -0700 +++ b/hgext3rd/evolve/cmdrewrite.py Thu Apr 25 15:14:21 2019 -0700 @@ -1121,7 +1121,7 @@ bmchanges = [(bookactive, newnode.node())] repo._bookmarks.applychanges(repo, tr, bmchanges) commands.update(ui, repo, newnode.hex()) - ui.status(_('working directory now at %s\n') + ui.status(_('working directory is now at %s\n') % ui.label(str(newnode), 'evolve.node')) if movebookmark: bookmarksmod.activate(repo, bookactive)
--- a/tests/test-evolve-abort-orphan.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-evolve-abort-orphan.t Thu Apr 25 15:14:21 2019 -0700 @@ -526,7 +526,7 @@ $ hg next --evolve move:[2] added b atop:[4] added a - working directory now at c1f4718020e3 + working directory is now at c1f4718020e3 $ hg next --evolve move:[3] added c atop:[5] added b
--- a/tests/test-evolve-cycles.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-evolve-cycles.t Thu Apr 25 15:14:21 2019 -0700 @@ -55,7 +55,7 @@ 1 changesets pruned $ hg prune -s "desc(A)" "desc(C)" 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - working directory now at 2a34000d3544 + working directory is now at 2a34000d3544 1 changesets pruned $ hg log --hidden -G x changeset: 3:a8df460dbbfe @@ -200,7 +200,7 @@ 1 changesets pruned $ hg prune -s "desc(D)" "desc(F)" 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - working directory now at 868d2e0eb19c + working directory is now at 868d2e0eb19c 1 changesets pruned $ hg log --hidden -G x changeset: 6:d9f908fde1a1
--- a/tests/test-evolve-obshistory-prune.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-evolve-obshistory-prune.t Thu Apr 25 15:14:21 2019 -0700 @@ -38,7 +38,7 @@ $ hg prune -r 'desc(B0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 471f378eab4c + working directory is now at 471f378eab4c 1 changesets pruned $ sync $ hg log --hidden -G
--- a/tests/test-evolve-orphan-merge.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-evolve-orphan-merge.t Thu Apr 25 15:14:21 2019 -0700 @@ -301,7 +301,7 @@ $ hg prune -r d0f84b25d4e3 -r 928097d0b5b5 -r dc1948a6eeab 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 8fa14d15e168 + working directory is now at 8fa14d15e168 3 changesets pruned $ for ch in l m; do echo foo > $ch; hg ci -Aqm "added "$ch; done; @@ -371,7 +371,7 @@ $ hg prune -r a446ad3e6700 -r 495d2039f8f1 -r 863d11043c67 0 files updated, 0 files merged, 3 files removed, 0 files unresolved - working directory now at fccc9de66799 + working directory is now at fccc9de66799 3 changesets pruned $ hg glog @@ -543,7 +543,7 @@ $ hg prune -r . 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 8fa14d15e168 + working directory is now at 8fa14d15e168 1 changesets pruned $ hg up null 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-evolve-templates.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-evolve-templates.t Thu Apr 25 15:14:21 2019 -0700 @@ -1544,7 +1544,7 @@ $ mkcommit A0 $ hg prune . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at ea207398892e + working directory is now at ea207398892e 1 changesets pruned Check output
--- a/tests/test-evolve.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-evolve.t Thu Apr 25 15:14:21 2019 -0700 @@ -156,7 +156,7 @@ 5 $ hg prune . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at fbb94e3a0ecf + working directory is now at fbb94e3a0ecf 1 changesets pruned $ hg qlog 4 - fbb94e3a0ecf add e (draft) @@ -169,7 +169,7 @@ $ hg prune 4 -r 3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 7c3bad9141dc + working directory is now at 7c3bad9141dc 2 changesets pruned $ hg qlog 2 - 4538525df7e2 add c (draft) @@ -184,7 +184,7 @@ $ hg add g $ hg prune . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 7c3bad9141dc + working directory is now at 7c3bad9141dc 1 changesets pruned $ hg st A g
--- a/tests/test-exchange-obsmarkers-case-D2.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-exchange-obsmarkers-case-D2.t Thu Apr 25 15:14:21 2019 -0700 @@ -57,7 +57,7 @@ obsoleted 1 changesets $ hg prune --date '0 0' . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at a9bdc8b26820 + working directory is now at a9bdc8b26820 1 changesets pruned $ hg strip --hidden -q 'desc(A1)' --config devel.strip-obsmarkers=no $ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-D3.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-exchange-obsmarkers-case-D3.t Thu Apr 25 15:14:21 2019 -0700 @@ -60,7 +60,7 @@ obsoleted 1 changesets $ hg prune -d '0 0' . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 35b183996678 + working directory is now at 35b183996678 1 changesets pruned $ hg strip --hidden -q 'desc(A1)' --config devel.strip-obsmarkers=no $ hg log -G --hidden
--- a/tests/test-prev-next.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-prev-next.t Thu Apr 25 15:14:21 2019 -0700 @@ -198,7 +198,7 @@ $ hg next --evolve --color debug [evolve.operation|move:][[evolve.rev|2]] added c atop:[[evolve.rev|3]] added b (2) - [ ui.status|working directory now at [evolve.node|e3b6d5df389b]] + [ ui.status|working directory is now at [evolve.node|e3b6d5df389b]] next with ambiguity @@ -245,7 +245,7 @@ enter the index of the revision you want to select: 1 move:[4] added c atop:[6] added b (3) - working directory now at 5ce67c2407b0 + working directory is now at 5ce67c2407b0 $ hg log -GT "{rev}:{node|short} {desc}\n" @ 7:5ce67c2407b0 added c @@ -352,7 +352,7 @@ got lock after (\d+) seconds (re) move:[2] two atop:[3] one - working directory now at a7d885c75614 + working directory is now at a7d885c75614 $ wait testing next --evolve when working directory is dirty @@ -598,4 +598,4 @@ > EOF move:[4] B atop:[5] B modified - working directory now at 1b434459c7e7 + working directory is now at 1b434459c7e7
--- a/tests/test-prune.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-prune.t Thu Apr 25 15:14:21 2019 -0700 @@ -58,7 +58,7 @@ $ hg prune --user blah --date '1979-12-15' . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 47d2a3944de8 + working directory is now at 47d2a3944de8 1 changesets pruned $ hg bookmark * BABAR 3:47d2a3944de8 @@ -81,7 +81,7 @@ $ hg prune 2: --color debug [ ui.status|0 files updated, 0 files merged, 3 files removed, 0 files unresolved] - [ ui.status|working directory now at [evolve.node|1f0dee641bb7]] + [ ui.status|working directory is now at [evolve.node|1f0dee641bb7]] [ ui.status|2 changesets pruned] $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} @@ -142,7 +142,7 @@ 4 files updated, 0 files merged, 4 files removed, 0 files unresolved $ hg prune 'desc("add ee")' -s 'desc("add nE")' 4 files updated, 0 files merged, 4 files removed, 0 files unresolved - working directory now at 6e8148413dd5 + working directory is now at 6e8148413dd5 1 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} @@ -239,7 +239,7 @@ $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --pair 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - working directory now at 1f0dee641bb7 + working directory is now at 1f0dee641bb7 2 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} @@ -262,7 +262,7 @@ $ mkcommit n2 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at c7e58696a948 + working directory is now at c7e58696a948 1 changesets pruned $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . --bundle 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -308,7 +308,7 @@ $ hg prune -B todelete 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark todelete) - working directory now at d62d843c9a01 + working directory is now at d62d843c9a01 bookmark 'todelete' deleted 1 changesets pruned $ hg id -ir dcbb326fdec2
--- a/tests/test-split.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-split.t Thu Apr 25 15:14:21 2019 -0700 @@ -1134,7 +1134,7 @@ Pruning revision 4 (current one): $ hg prune . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 88437e073cd4 + working directory is now at 88437e073cd4 1 changesets pruned $ hg evolve -r 2 move:[2] c
--- a/tests/test-topic-tutorial.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-topic-tutorial.t Thu Apr 25 15:14:21 2019 -0700 @@ -1370,7 +1370,7 @@ $ hg next --evolve move:[s2] Adding saw atop:[s1] Adding hammer to the shopping list - working directory now at d5c51ee5762a + working directory is now at d5c51ee5762a $ hg stack ### topic: tools @@ -1385,7 +1385,7 @@ $ hg next --evolve move:[s3] Adding drill atop:[s2] Adding saw - working directory now at bae3758e46bf + working directory is now at bae3758e46bf $ hg stack ### topic: tools
--- a/tests/test-touch.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-touch.t Thu Apr 25 15:14:21 2019 -0700 @@ -54,7 +54,7 @@ $ hg prune 3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 000000000000 + working directory is now at 000000000000 1 changesets pruned Duplicate
--- a/tests/test-tutorial.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-tutorial.t Thu Apr 25 15:14:21 2019 -0700 @@ -547,7 +547,7 @@ $ hg prune . # "." is for working directory parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 41aff6a42b75 + working directory is now at 41aff6a42b75 1 changesets pruned The silly changeset is gone. @@ -1678,7 +1678,7 @@ $ hg prune 2a2b36e14660 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 682004e81e71 + working directory is now at 682004e81e71 1 changesets pruned 1 new orphan changesets
--- a/tests/test-uncommit-interactive.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-uncommit-interactive.t Thu Apr 25 15:14:21 2019 -0700 @@ -449,7 +449,7 @@ $ hg prune . 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 42cc15efbec2 + working directory is now at 42cc15efbec2 1 changesets pruned $ hg revert --all undeleting a
--- a/tests/test-userguide.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-userguide.t Thu Apr 25 15:14:21 2019 -0700 @@ -63,7 +63,7 @@ $ hg commit -m 'debug hack' $ hg prune . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 934359450037 + working directory is now at 934359450037 1 changesets pruned $ hg parents --template '{rev}:{node|short} {desc|firstline}\n' 2:934359450037 implement feature Y