Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-pull-r.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 25 Sep 2007 19:05:34 +0200
changeset 5337 8c5ef3b87cb1
parent 5235 8ede77c2d008
permissions -rw-r--r--
Don't try to determine interactivity if ui() called with interactive=False. WSGI applications are not supposed to refer to sys.stdin. In ed6df6b1c29a, hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but sys.stdin.isatty() was still called by the ui objects. This change makes sure only the ui.fixconfig() method will call ui.isatty() (by making the ui._readline() method, which is currently only called from ui.prompt(), private). ui.fixconfig() is changed to let config files override the initial interactivity setting, but not check isatty() if interactive=False was specified in the creation of the ui.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5235
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
changeset:   2:effea6de0384
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
tag:         tip
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
parent:      0:bbd179dfa0a7
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
user:        test
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
date:        Thu Jan 01 00:00:00 1970 +0000
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
summary:     add bar
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 












8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     8


changeset:   1:ed1b79f46b9a













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     9


user:        test













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10


date:        Thu Jan 01 00:00:00 1970 +0000













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    11


summary:     change foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13


changeset:   0:bbd179dfa0a7













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


user:        test













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15


date:        Thu Jan 01 00:00:00 1970 +0000













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16


summary:     add foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18


% pull -r 0













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    19


changeset:   0:bbd179dfa0a7













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    20


tag:         tip













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    21


user:        test













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


date:        Thu Jan 01 00:00:00 1970 +0000













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23


summary:     add foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    24














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    25


% pull -r 1













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    26


changeset:   1:ed1b79f46b9a













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    27


tag:         tip













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    28


user:        test













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    29


date:        Thu Jan 01 00:00:00 1970 +0000













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    30


summary:     change foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    31














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    32


changeset:   0:bbd179dfa0a7













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    33


user:        test













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    34


date:        Thu Jan 01 00:00:00 1970 +0000













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    35


summary:     add foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    36














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    37


% pull -r 1 again















mercurial-crew-with-dirclash