Mercurial > evolve
changeset 5445:d0b0ef0ba094
rewind: past tense of rewind is rewound
I think grammar rules still apply if `rewind` is a command.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 25 May 2020 19:58:33 +0800 |
parents | 5174daed97c2 |
children | 5fc54b8f3f84 |
files | hgext3rd/evolve/rewind.py tests/test-rewind.t |
diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/rewind.py Mon May 25 19:58:11 2020 +0800 +++ b/hgext3rd/evolve/rewind.py Mon May 25 19:58:33 2020 +0800 @@ -156,7 +156,7 @@ else: hg.updaterepo(repo, update_target, False) - ui.status(_(b'rewinded to %d changesets\n') % len(targets)) + ui.status(_(b'rewound to %d changesets\n') % len(targets)) if relationships: ui.status(_(b'(%d changesets obsoleted)\n') % len(relationships)) if update_target is not None and not opts.get('keep'):
--- a/tests/test-rewind.t Mon May 25 19:58:11 2020 +0800 +++ b/tests/test-rewind.t Mon May 25 19:58:33 2020 +0800 @@ -86,7 +86,7 @@ ````````````` $ hg rewind --hidden --to 'desc("c_B0")' - rewinded to 1 changesets + rewound to 1 changesets $ hg debugobsolete 7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} 7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'} @@ -166,7 +166,7 @@ $ hg prune 'desc("c_B0")' 1 changesets pruned $ hg rewind --hidden --to 'min(desc("c_B0"))' - rewinded to 1 changesets + rewound to 1 changesets $ hg debugobsolete 7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} 7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'} @@ -282,7 +282,7 @@ $ hg rewind --hidden --to 'desc("c_B0")' --as-divergence 2 new content-divergent changesets - rewinded to 1 changesets + rewound to 1 changesets $ hg debugobsolete 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'} @@ -387,7 +387,7 @@ ---------------------------------------------------------------- $ hg rewind --hidden --to 'min(desc("c_B0"))' - rewinded to 1 changesets + rewound to 1 changesets (1 changesets obsoleted) working directory is now at 837cd997bb05 $ hg debugobsolete @@ -570,7 +570,7 @@ ````````````` $ hg rewind --hidden --to 'min(desc("c_CD0"))' - rewinded to 1 changesets + rewound to 1 changesets (2 changesets obsoleted) working directory is now at 4535d0af405c $ hg debugobsolete @@ -645,7 +645,7 @@ ````````````` $ hg rewind --to '9576e80d6851+a0316c4c5417' --hidden - rewinded to 2 changesets + rewound to 2 changesets (1 changesets obsoleted) working directory is now at 95d72d892df7 $ hg debugobsolete @@ -778,7 +778,7 @@ $ hg rewind --hidden --to 'min(desc(c_B0))' --exact 1 new orphan changesets - rewinded to 1 changesets + rewound to 1 changesets (1 changesets obsoleted) working directory is now at ac979e0aac4e $ hg debugobsolete @@ -840,7 +840,7 @@ $ echo 'default-date = 4 0' >> $HGRCPATH $ hg rewind --from '.' - rewinded to 1 changesets + rewound to 1 changesets (1 changesets obsoleted) working directory is now at a5dd64adbb2a $ echo 'default-date = 5 0' >> $HGRCPATH @@ -888,7 +888,7 @@ -------------------------------------------------- $ hg rewind --hidden --to 'predecessors(.)' - rewinded to 2 changesets + rewound to 2 changesets (2 changesets obsoleted) working directory is now at 3f2d8862657d $ hg debugobsolete @@ -944,7 +944,7 @@ $ echo 'default-date = 6 0' >> $HGRCPATH $ hg rewind --hidden --from '.' - rewinded to 2 changesets + rewound to 2 changesets (2 changesets obsoleted) working directory is now at d36d6d267714 $ hg debugobsolete @@ -1029,7 +1029,7 @@ A B $ hg rewind --from . - rewinded to 1 changesets + rewound to 1 changesets (1 changesets obsoleted) working directory is now at 9d325190bd87 $ hg st --change . @@ -1083,7 +1083,7 @@ Clean wdir $ hg rewind --keep --to 'desc("initial")' --hidden - rewinded to 1 changesets + rewound to 1 changesets (1 changesets obsoleted) $ hg debugobsolete 30704102d912d9d35a3d51400c4c93ad1e8bc7f3 2ea5be2f87510c7d26d5866dec83b57a7d939c4a 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}