Show More
@@ -34780,8 +34780,8 b' msgid "creating obsolete markers is not ' | |||
|
34780 | 34780 | msgstr "廃止マーカの作成機能は無効化されています" |
|
34781 | 34781 | |
|
34782 | 34782 | #, python-format |
|
34783 | msgid "obsolete feature not enabled but %i markers found!\n" | |
|
34784 | msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n" | |
|
34783 | msgid "\"obsolete\" feature not enabled but %i markers found!\n" | |
|
34784 | msgstr "\"obsolete\" 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n" | |
|
34785 | 34785 | |
|
34786 | 34786 | #, python-format |
|
34787 | 34787 | msgid "unknown key: %r" |
@@ -36049,9 +36049,9 b' msgstr ""' | |||
|
36049 | 36049 | "repositório" |
|
36050 | 36050 | |
|
36051 | 36051 | #, python-format |
|
36052 | msgid "obsolete feature not enabled but %i markers found!\n" | |
|
36053 | msgstr "" | |
|
36054 | "a funcionalidade obsolete não está habilitada, mas foram encontradas %i " | |
|
36052 | msgid "\"obsolete\" feature not enabled but %i markers found!\n" | |
|
36053 | msgstr "" | |
|
36054 | "a funcionalidade \"obsolete\" não está habilitada, mas foram encontradas %i " | |
|
36055 | 36055 | "marcações!\n" |
|
36056 | 36056 | |
|
36057 | 36057 | #, python-format |
@@ -818,7 +818,7 b' def makestore(ui, repo):' | |||
|
818 | 818 | store = obsstore(repo, repo.svfs, readonly=readonly, **kwargs) |
|
819 | 819 | if store and readonly: |
|
820 | 820 | ui.warn( |
|
821 | _(b'obsolete feature not enabled but %i markers found!\n') | |
|
821 | _(b'"obsolete" feature not enabled but %i markers found!\n') | |
|
822 | 822 | % len(list(store)) |
|
823 | 823 | ) |
|
824 | 824 | return store |
@@ -252,7 +252,10 b' def filterhgerr(err):' | |||
|
252 | 252 | if ( |
|
253 | 253 | not e.startswith(b'not trusting file') |
|
254 | 254 | and not e.startswith(b'warning: Not importing') |
|
255 | and not e.startswith(b'obsolete feature not enabled') | |
|
255 | and not ( | |
|
256 | e.startswith(b'obsolete feature not enabled') | |
|
257 | or e.startswith(b'"obsolete" feature not enabled') | |
|
258 | ) | |
|
256 | 259 | and not e.startswith(b'*** failed to import extension') |
|
257 | 260 | and not e.startswith(b'devel-warn:') |
|
258 | 261 | and not ( |
@@ -730,7 +730,7 b' getoldnodedrevmap() in later phabsends.' | |||
|
730 | 730 | $ hg amend --config experimental.evolution=all --config extensions.amend= |
|
731 | 731 | 1 new orphan changesets |
|
732 | 732 | $ hg up 3 |
|
733 | obsolete feature not enabled but 1 markers found! | |
|
733 | "obsolete" feature not enabled but 1 markers found! | |
|
734 | 734 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
735 | 735 | $ hg rebase --config experimental.evolution=all --config extensions.rebase= |
|
736 | 736 | note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 tip "two: second commit to review" |
@@ -741,7 +741,7 b' updated.' | |||
|
741 | 741 | |
|
742 | 742 | $ echo y | hg phabsend --fold --confirm -r 1:: \ |
|
743 | 743 | > --test-vcr "$VCR/phabsend-fold-updated.json" |
|
744 | obsolete feature not enabled but 2 markers found! | |
|
744 | "obsolete" feature not enabled but 2 markers found! | |
|
745 | 745 | 602c4e738243 mapped to old nodes ['602c4e738243'] |
|
746 | 746 | 0124e5474c88 mapped to old nodes ['832553266fe8'] |
|
747 | 747 | e4edb1fe3565 mapped to old nodes ['921f8265efbd'] |
@@ -752,11 +752,11 b' updated.' | |||
|
752 | 752 | D8387 - updated - 1:602c4e738243 "one: first commit to review" |
|
753 | 753 | D8387 - updated - 4:0124e5474c88 "two: second commit to review" |
|
754 | 754 | D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message" |
|
755 | obsolete feature not enabled but 2 markers found! (?) | |
|
755 | "obsolete" feature not enabled but 2 markers found! (?) | |
|
756 | 756 | updating local commit list for D8387 |
|
757 | 757 | new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565'] |
|
758 | 758 | $ hg log -Tcompact |
|
759 | obsolete feature not enabled but 2 markers found! | |
|
759 | "obsolete" feature not enabled but 2 markers found! | |
|
760 | 760 | 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test |
|
761 | 761 | 3: a commit with no detailed message |
|
762 | 762 | |
@@ -773,17 +773,17 b' When nothing has changed locally since t' | |||
|
773 | 773 | updated, and nothing is changed locally afterward. |
|
774 | 774 | |
|
775 | 775 | $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json" |
|
776 | obsolete feature not enabled but 2 markers found! | |
|
776 | "obsolete" feature not enabled but 2 markers found! | |
|
777 | 777 | 602c4e738243 mapped to old nodes ['602c4e738243'] |
|
778 | 778 | 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
|
779 | 779 | e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
|
780 | 780 | D8387 - updated - 1:602c4e738243 "one: first commit to review" |
|
781 | 781 | D8387 - updated - 4:0124e5474c88 "two: second commit to review" |
|
782 | 782 | D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message" |
|
783 | obsolete feature not enabled but 2 markers found! (?) | |
|
783 | "obsolete" feature not enabled but 2 markers found! (?) | |
|
784 | 784 | local commit list for D8387 is already up-to-date |
|
785 | 785 | $ hg log -Tcompact |
|
786 | obsolete feature not enabled but 2 markers found! | |
|
786 | "obsolete" feature not enabled but 2 markers found! | |
|
787 | 787 | 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test |
|
788 | 788 | 3: a commit with no detailed message |
|
789 | 789 | |
@@ -800,7 +800,7 b' Fold will accept new revisions at the en' | |||
|
800 | 800 | |
|
801 | 801 | $ echo 'another mod' > file2.txt |
|
802 | 802 | $ hg ci -m 'four: extend the fold range' |
|
803 | obsolete feature not enabled but 2 markers found! | |
|
803 | "obsolete" feature not enabled but 2 markers found! | |
|
804 | 804 | $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \ |
|
805 | 805 | > --config experimental.evolution=all |
|
806 | 806 | 602c4e738243 mapped to old nodes ['602c4e738243'] |
@@ -817,7 +817,7 b' Fold will accept new revisions at the en' | |||
|
817 | 817 | |
|
818 | 818 | Differential Revision: https://phab.mercurial-scm.org/D8387 |
|
819 | 819 | $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' -r 1:: |
|
820 | obsolete feature not enabled but 3 markers found! | |
|
820 | "obsolete" feature not enabled but 3 markers found! | |
|
821 | 821 | 1 https://phab.mercurial-scm.org/D8387 D8387 |
|
822 | 822 | 4 https://phab.mercurial-scm.org/D8387 D8387 |
|
823 | 823 | 5 https://phab.mercurial-scm.org/D8387 D8387 |
@@ -846,7 +846,7 b' TODO: See if it can reuse the existing D' | |||
|
846 | 846 | new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991'] |
|
847 | 847 | |
|
848 | 848 | $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' |
|
849 | obsolete feature not enabled but 8 markers found! | |
|
849 | "obsolete" feature not enabled but 8 markers found! | |
|
850 | 850 | 12:ac7db67f0991 |
|
851 | 851 | four: extend the fold range |
|
852 | 852 | |
@@ -962,7 +962,7 b' Test phabsend --fold with an `hg fold` a' | |||
|
962 | 962 | new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe'] |
|
963 | 963 | |
|
964 | 964 | $ hg log -r tip -v |
|
965 | obsolete feature not enabled but 12 markers found! | |
|
965 | "obsolete" feature not enabled but 12 markers found! | |
|
966 | 966 | changeset: 16:e919cdf3d4fe |
|
967 | 967 | tag: tip |
|
968 | 968 | parent: 11:30682b960804 |
General Comments 0
You need to be logged in to leave comments.
Login now