Submitter | Matt Harbison |
---|---|
Date | March 17, 2017, 3:32 a.m. |
Message ID | <ab5c2bef148bfb60e195.1489721539@Envy> |
Download | mbox | patch |
Permalink | /patch/19417/ |
State | Accepted |
Headers | show |
Comments
On 3/17/17 3:32 AM, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1489720627 14400 > # Thu Mar 16 23:17:07 2017 -0400 > # Node ID ab5c2bef148bfb60e1956a55de4b7ba00ebe1817 > # Parent 6a3248558b6929378450b572bb27406afe703ffd > tests: add glob for Windows This looks good to me. > > diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t > --- a/tests/test-inhibit.t > +++ b/tests/test-inhibit.t > @@ -911,7 +911,7 @@ > $ cd not-inhibit > $ hg book -d foo > $ hg pull > - pulling from $TESTTMP/inhibit > + pulling from $TESTTMP/inhibit (glob) > searching for changes > no changes found > adding remote bookmark foo > diff --git a/tests/test-stablesort.t b/tests/test-stablesort.t > --- a/tests/test-stablesort.t > +++ b/tests/test-stablesort.t > @@ -138,7 +138,7 @@ > updating to branch default > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R repo_B pull --rev 13 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -146,7 +146,7 @@ > added 4 changesets with 0 changes to 0 files (+1 heads) > (run 'hg heads' to see heads, 'hg merge' to merge) > $ hg -R repo_B pull --rev 14 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -154,7 +154,7 @@ > added 1 changesets with 0 changes to 0 files (+1 heads) > (run 'hg heads .' to see heads, 'hg merge' to merge) > $ hg -R repo_B pull > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -204,7 +204,7 @@ > updating to branch default > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R repo_C pull --rev 12 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -212,7 +212,7 @@ > added 2 changesets with 0 changes to 0 files (+1 heads) > (run 'hg heads' to see heads, 'hg merge' to merge) > $ hg -R repo_C pull --rev 15 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -220,7 +220,7 @@ > added 4 changesets with 0 changes to 0 files (+1 heads) > (run 'hg heads .' to see heads, 'hg merge' to merge) > $ hg -R repo_C pull > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -270,7 +270,7 @@ > updating to branch default > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R repo_D pull --rev 10 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -278,7 +278,7 @@ > added 5 changesets with 0 changes to 0 files > (run 'hg update' to get a working copy) > $ hg -R repo_D pull --rev 15 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -286,7 +286,7 @@ > added 4 changesets with 0 changes to 0 files (+1 heads) > (run 'hg heads' to see heads, 'hg merge' to merge) > $ hg -R repo_D pull > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -404,7 +404,7 @@ > updating to branch default > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R repo_E pull --rev e7d9710d9fc6 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -420,7 +420,7 @@ > updating to branch default > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R repo_F pull --rev d62d843c9a01 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -436,7 +436,7 @@ > updating to branch default > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R repo_G pull --rev 43227190fef8 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > @@ -444,7 +444,7 @@ > added 1 changesets with 0 changes to 0 files (+1 heads) > (run 'hg heads' to see heads, 'hg merge' to merge) > $ hg -R repo_G pull --rev 2702dd0c91e7 > - pulling from $TESTTMP/repo_A > + pulling from $TESTTMP/repo_A (glob) > searching for changes > adding changesets > adding manifests > diff --git a/tests/test-topic-dest.t b/tests/test-topic-dest.t > --- a/tests/test-topic-dest.t > +++ b/tests/test-topic-dest.t > @@ -276,7 +276,7 @@ > $ hg add other > $ hg ci -m 'c_other' > $ hg pull -r default --rebase > - pulling from $TESTTMP/jungle > + pulling from $TESTTMP/jungle (glob) > searching for changes > adding changesets > adding manifests > diff --git a/tests/test-topic-push.t b/tests/test-topic-push.t > --- a/tests/test-topic-push.t > +++ b/tests/test-topic-push.t > @@ -32,12 +32,12 @@ > $ hg add aaa > $ hg commit -m 'CA' > $ hg outgoing -G > - comparing with $TESTTMP/main > + comparing with $TESTTMP/main (glob) > searching for changes > @ 0 default draft CA > > $ hg push > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > adding changesets > adding manifests > @@ -56,25 +56,25 @@ > $ hg commit -m 'CC' > created new head > $ hg outgoing -G > - comparing with $TESTTMP/main > + comparing with $TESTTMP/main (glob) > searching for changes > @ 2 default draft CC > > o 1 default draft CB > > $ hg push > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > abort: push creates new remote head 9fe81b7f425d! > (merge or see 'hg help push' for details about pushing new heads) > [255] > $ hg outgoing -r 'desc(CB)' -G > - comparing with $TESTTMP/main > + comparing with $TESTTMP/main (glob) > searching for changes > o 1 default draft CB > > $ hg push -r 'desc(CB)' > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > adding changesets > adding manifests > @@ -88,18 +88,18 @@ > (branches are permanent and global, did you want a bookmark?) > $ hg commit --amend > $ hg outgoing -G > - comparing with $TESTTMP/main > + comparing with $TESTTMP/main (glob) > searching for changes > @ 4 mountain draft CC > > $ hg push > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > abort: push creates new remote branches: mountain! > (use 'hg push --new-branch' to create new remote branches) > [255] > $ hg push --new-branch > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > adding changesets > adding manifests > @@ -110,7 +110,7 @@ > Including on non-publishing > > $ hg push --new-branch draft > - pushing to $TESTTMP/draft > + pushing to $TESTTMP/draft (glob) > searching for changes > adding changesets > adding manifests > @@ -143,7 +143,7 @@ > Pushing a new topic to a non publishing server should not be seen as a new head > > $ hg push draft > - pushing to $TESTTMP/draft > + pushing to $TESTTMP/draft (glob) > searching for changes > adding changesets > adding manifests > @@ -162,7 +162,7 @@ > Pushing a new topic to a publishing server should be seen as a new head > > $ hg push > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > abort: push creates new remote head 67f579af159d! > (merge or see 'hg help push' for details about pushing new heads) > @@ -289,7 +289,7 @@ > > > $ hg push draft > - pushing to $TESTTMP/draft > + pushing to $TESTTMP/draft (glob) > searching for changes > abort: push creates new remote head f0bc62a661be on branch 'default:babar'! > (merge or see 'hg help push' for details about pushing new heads) > @@ -333,7 +333,7 @@ > Reject when pushing to draft > > $ hg push draft -r . > - pushing to $TESTTMP/draft > + pushing to $TESTTMP/draft (glob) > searching for changes > abort: push creates new remote head 4937c4cad39e! > (merge or see 'hg help push' for details about pushing new heads) > @@ -343,7 +343,7 @@ > Reject when pushing to publishing > > $ hg push -r . > - pushing to $TESTTMP/main > + pushing to $TESTTMP/main (glob) > searching for changes > adding changesets > adding manifests > diff --git a/tests/test-topic-tutorial.t b/tests/test-topic-tutorial.t > --- a/tests/test-topic-tutorial.t > +++ b/tests/test-topic-tutorial.t > @@ -193,7 +193,7 @@ > Topic will also affect rebase and merge destination. Let's pull the latest update from the main server:: > > $ hg pull > - pulling from $TESTTMP/server > + pulling from $TESTTMP/server (glob) > searching for changes > adding changesets > adding manifests > @@ -276,7 +276,7 @@ > $ hg topic > food > $ hg push > - pushing to $TESTTMP/server > + pushing to $TESTTMP/server (glob) > searching for changes > adding changesets > adding manifests > @@ -392,7 +392,7 @@ > Lets see what other people did in the mean time:: > > $ hg pull > - pulling from $TESTTMP/server > + pulling from $TESTTMP/server (glob) > searching for changes > adding changesets > adding manifests > @@ -421,7 +421,7 @@ > Pushing that topic would create a new heads will be prevented:: > > $ hg push --rev drinks > - pushing to $TESTTMP/server > + pushing to $TESTTMP/server (glob) > searching for changes > abort: push creates new remote head 70dfa201ed73! > (merge or see 'hg help push' for details about pushing new heads) > @@ -437,7 +437,7 @@ > merging shopping > switching to topic tools > $ hg push > - pushing to $TESTTMP/server > + pushing to $TESTTMP/server (glob) > searching for changes > abort: push creates new remote head 4cd7c1591a67! > (merge or see 'hg help push' for details about pushing new heads) > @@ -446,7 +446,7 @@ > Publishing only one of them is allowed (as long as it does not create a new branch head has we just saw in the previous case):: > > $ hg push -r drinks > - pushing to $TESTTMP/server > + pushing to $TESTTMP/server (glob) > searching for changes > adding changesets > adding manifests > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=g1oGhS7HLsPfDuRkJ1gHU7o-5d37-Rukvu3pFjb_jV4&s=TX4xr3L0ClgUjucHvPAqyOMIgskJbylsxqGc-3Swphw&e=
On 03/21/2017 06:48 PM, Ryan McElroy wrote: > On 3/17/17 3:32 AM, Matt Harbison wrote: >> # HG changeset patch >> # User Matt Harbison <matt_harbison@yahoo.com> >> # Date 1489720627 14400 >> # Thu Mar 16 23:17:07 2017 -0400 >> # Node ID ab5c2bef148bfb60e1956a55de4b7ba00ebe1817 >> # Parent 6a3248558b6929378450b572bb27406afe703ffd >> tests: add glob for Windows > > This looks good to me. This one is pushed, thanks. Does this mean someone is actually running the evolve test on windows ?
> On Mar 23, 2017, at 3:13 AM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote: > > > >> On 03/21/2017 06:48 PM, Ryan McElroy wrote: >>> On 3/17/17 3:32 AM, Matt Harbison wrote: >>> # HG changeset patch >>> # User Matt Harbison <matt_harbison@yahoo.com> >>> # Date 1489720627 14400 >>> # Thu Mar 16 23:17:07 2017 -0400 >>> # Node ID ab5c2bef148bfb60e1956a55de4b7ba00ebe1817 >>> # Parent 6a3248558b6929378450b572bb27406afe703ffd >>> tests: add glob for Windows >> >> This looks good to me. > > This one is pushed, thanks. > > Does this mean someone is actually running the evolve test on windows ? This is the first time I've run them in awhile. There's still something broke around pruning bookmarks. I was able to make it work a few years ago by calling invalidate(), but that seemed like a sledgehammer. I'll post more detail next time I have the repo in front of me. > -- > Pierre-Yves David
Patch
diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t --- a/tests/test-inhibit.t +++ b/tests/test-inhibit.t @@ -911,7 +911,7 @@ $ cd not-inhibit $ hg book -d foo $ hg pull - pulling from $TESTTMP/inhibit + pulling from $TESTTMP/inhibit (glob) searching for changes no changes found adding remote bookmark foo diff --git a/tests/test-stablesort.t b/tests/test-stablesort.t --- a/tests/test-stablesort.t +++ b/tests/test-stablesort.t @@ -138,7 +138,7 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_B pull --rev 13 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -146,7 +146,7 @@ added 4 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_B pull --rev 14 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -154,7 +154,7 @@ added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_B pull - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -204,7 +204,7 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_C pull --rev 12 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -212,7 +212,7 @@ added 2 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_C pull --rev 15 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -220,7 +220,7 @@ added 4 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_C pull - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -270,7 +270,7 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_D pull --rev 10 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -278,7 +278,7 @@ added 5 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) $ hg -R repo_D pull --rev 15 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -286,7 +286,7 @@ added 4 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_D pull - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -404,7 +404,7 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_E pull --rev e7d9710d9fc6 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -420,7 +420,7 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_F pull --rev d62d843c9a01 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -436,7 +436,7 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_G pull --rev 43227190fef8 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests @@ -444,7 +444,7 @@ added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_G pull --rev 2702dd0c91e7 - pulling from $TESTTMP/repo_A + pulling from $TESTTMP/repo_A (glob) searching for changes adding changesets adding manifests diff --git a/tests/test-topic-dest.t b/tests/test-topic-dest.t --- a/tests/test-topic-dest.t +++ b/tests/test-topic-dest.t @@ -276,7 +276,7 @@ $ hg add other $ hg ci -m 'c_other' $ hg pull -r default --rebase - pulling from $TESTTMP/jungle + pulling from $TESTTMP/jungle (glob) searching for changes adding changesets adding manifests diff --git a/tests/test-topic-push.t b/tests/test-topic-push.t --- a/tests/test-topic-push.t +++ b/tests/test-topic-push.t @@ -32,12 +32,12 @@ $ hg add aaa $ hg commit -m 'CA' $ hg outgoing -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes @ 0 default draft CA $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests @@ -56,25 +56,25 @@ $ hg commit -m 'CC' created new head $ hg outgoing -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes @ 2 default draft CC o 1 default draft CB $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote head 9fe81b7f425d! (merge or see 'hg help push' for details about pushing new heads) [255] $ hg outgoing -r 'desc(CB)' -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes o 1 default draft CB $ hg push -r 'desc(CB)' - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests @@ -88,18 +88,18 @@ (branches are permanent and global, did you want a bookmark?) $ hg commit --amend $ hg outgoing -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes @ 4 mountain draft CC $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote branches: mountain! (use 'hg push --new-branch' to create new remote branches) [255] $ hg push --new-branch - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests @@ -110,7 +110,7 @@ Including on non-publishing $ hg push --new-branch draft - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes adding changesets adding manifests @@ -143,7 +143,7 @@ Pushing a new topic to a non publishing server should not be seen as a new head $ hg push draft - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes adding changesets adding manifests @@ -162,7 +162,7 @@ Pushing a new topic to a publishing server should be seen as a new head $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote head 67f579af159d! (merge or see 'hg help push' for details about pushing new heads) @@ -289,7 +289,7 @@ $ hg push draft - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes abort: push creates new remote head f0bc62a661be on branch 'default:babar'! (merge or see 'hg help push' for details about pushing new heads) @@ -333,7 +333,7 @@ Reject when pushing to draft $ hg push draft -r . - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes abort: push creates new remote head 4937c4cad39e! (merge or see 'hg help push' for details about pushing new heads) @@ -343,7 +343,7 @@ Reject when pushing to publishing $ hg push -r . - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests diff --git a/tests/test-topic-tutorial.t b/tests/test-topic-tutorial.t --- a/tests/test-topic-tutorial.t +++ b/tests/test-topic-tutorial.t @@ -193,7 +193,7 @@ Topic will also affect rebase and merge destination. Let's pull the latest update from the main server:: $ hg pull - pulling from $TESTTMP/server + pulling from $TESTTMP/server (glob) searching for changes adding changesets adding manifests @@ -276,7 +276,7 @@ $ hg topic food $ hg push - pushing to $TESTTMP/server + pushing to $TESTTMP/server (glob) searching for changes adding changesets adding manifests @@ -392,7 +392,7 @@ Lets see what other people did in the mean time:: $ hg pull - pulling from $TESTTMP/server + pulling from $TESTTMP/server (glob) searching for changes adding changesets adding manifests @@ -421,7 +421,7 @@ Pushing that topic would create a new heads will be prevented:: $ hg push --rev drinks - pushing to $TESTTMP/server + pushing to $TESTTMP/server (glob) searching for changes abort: push creates new remote head 70dfa201ed73! (merge or see 'hg help push' for details about pushing new heads) @@ -437,7 +437,7 @@ merging shopping switching to topic tools $ hg push - pushing to $TESTTMP/server + pushing to $TESTTMP/server (glob) searching for changes abort: push creates new remote head 4cd7c1591a67! (merge or see 'hg help push' for details about pushing new heads) @@ -446,7 +446,7 @@ Publishing only one of them is allowed (as long as it does not create a new branch head has we just saw in the previous case):: $ hg push -r drinks - pushing to $TESTTMP/server + pushing to $TESTTMP/server (glob) searching for changes adding changesets adding manifests