Mercurial Mercurial > mercurial / 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-install.t
author Siddharth Agarwal <sid0@fb.com>
Wed, 25 Nov 2015 14:25:33 -0800
changeset 27137 25e4b2f000c5
parent 24891 be4915009b09
child 27383 b1160299a175
permissions -rw-r--r--
merge: move almost all change/delete conflicts to resolve phase (BC) (API) We have finally laid all the groundwork to make this happen. The only change/delete conflicts that haven't been moved are .hgsubstate conflicts. Those are trickier to deal with and well outside the scope of this series. We add comprehensive testing not just for the initial selections but also for re-resolves and all possible dirstate transitions caused by merge tools. That testing managed to shake out several bugs in the way we were handling dirstate transitions. The other test changes are because we now treat change/delete conflicts as proper merges, and increment the 'merged' counter rather than the 'updated' counter. I believe this is the right approach here. For third-party extensions, if they're interacting with filemerge code they might have to deal with an absentfilectx rather than a regular filectx. Still to come: - add a 'leave unresolved' option to merges - change the default for non-interactive change/delete conflicts to be 'leave unresolved' - add debug output to go alongside debug outputs for binary and symlink file merges
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3846
diff changeset 
     1
 
hg debuginstall
11917
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     2
 
  $ hg debuginstall
16934
0c9c41e53f1a debuginstall: lowercase status messages
Martin Geisler <mg@aragost.com>
parents: 15447
diff changeset 
     3
 
  checking encoding (ascii)...
20741
f1dfef0a9352 debuginstall: change showing to checking for consistency and future checking
Matt Mackall <mpm@selenic.com>
parents: 20740
diff changeset 
     4
 
  checking Python executable (*) (glob)
f1dfef0a9352 debuginstall: change showing to checking for consistency and future checking
Matt Mackall <mpm@selenic.com>
parents: 20740
diff changeset 
     5
 
  checking Python version (2.*) (glob)
17392
bdd248666dbc debuginstall: show directory for Python lib
Adrian Buehlmann <adrian@cadifra.com>
parents: 16934
diff changeset 
     6
 
  checking Python lib (*lib*)... (glob)
16934
0c9c41e53f1a debuginstall: lowercase status messages
Martin Geisler <mg@aragost.com>
parents: 15447
diff changeset 
     7
 
  checking installed modules (*mercurial)... (glob)
0c9c41e53f1a debuginstall: lowercase status messages
Martin Geisler <mg@aragost.com>
parents: 15447
diff changeset 
     8
 
  checking templates (*mercurial?templates)... (glob)
0c9c41e53f1a debuginstall: lowercase status messages
Martin Geisler <mg@aragost.com>
parents: 15447
diff changeset 
     9
 
  checking commit editor...
0c9c41e53f1a debuginstall: lowercase status messages
Martin Geisler <mg@aragost.com>
parents: 15447
diff changeset 
    10
 
  checking username...
0c9c41e53f1a debuginstall: lowercase status messages
Martin Geisler <mg@aragost.com>
parents: 15447
diff changeset 
    11
 
  no problems detected
9734
36c388a1aa51 commands: call ui.username carefully in debuginstall
Martin Geisler <mg@lazybytes.net>
parents: 4365
diff changeset 
    12
 







11917






b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    13


hg debuginstall with no username












b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    14


  $ HGUSER= hg debuginstall







16934






0c9c41e53f1a
debuginstall: lowercase status messages



Martin Geisler <mg@aragost.com>


parents: 
15447

diff
changeset




    15


  checking encoding (ascii)...







20741






f1dfef0a9352
debuginstall: change showing to checking for consistency and future checking



Matt Mackall <mpm@selenic.com>


parents: 
20740

diff
changeset




    16


  checking Python executable (*) (glob)












f1dfef0a9352
debuginstall: change showing to checking for consistency and future checking



Matt Mackall <mpm@selenic.com>


parents: 
20740

diff
changeset




    17


  checking Python version (2.*) (glob)







17392






bdd248666dbc
debuginstall: show directory for Python lib



Adrian Buehlmann <adrian@cadifra.com>


parents: 
16934

diff
changeset




    18


  checking Python lib (*lib*)... (glob)







16934






0c9c41e53f1a
debuginstall: lowercase status messages



Martin Geisler <mg@aragost.com>


parents: 
15447

diff
changeset




    19


  checking installed modules (*mercurial)... (glob)












0c9c41e53f1a
debuginstall: lowercase status messages



Martin Geisler <mg@aragost.com>


parents: 
15447

diff
changeset




    20


  checking templates (*mercurial?templates)... (glob)












0c9c41e53f1a
debuginstall: lowercase status messages



Martin Geisler <mg@aragost.com>


parents: 
15447

diff
changeset




    21


  checking commit editor...












0c9c41e53f1a
debuginstall: lowercase status messages



Martin Geisler <mg@aragost.com>


parents: 
15447

diff
changeset




    22


  checking username...







20574






5614f8cf0861
ui: suggest config --edit when no username is set



Matt Mackall <mpm@selenic.com>


parents: 
17392

diff
changeset




    23


   no username supplied







12084






ff7c1118a83a
Merge with stable



Martin Geisler <mg@aragost.com>


parents: 
12004

diff
changeset




    24


   (specify a username in your configuration file)







11917






b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    25


  1 problems detected, please check your install!







12316






4134686b83e1
tests: add exit codes to unified tests



Matt Mackall <mpm@selenic.com>


parents: 
12084

diff
changeset




    26


  [1]







24891






be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    27














be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    28


path variables are expanded (~ is the same as $TESTTMP)












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    29


  $ mkdir tools












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    30


  $ touch tools/testeditor.exe












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    31


#if execbit












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    32


  $ chmod 755 tools/testeditor.exe












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    33


#endif












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    34


  $ hg debuginstall --config ui.editor=~/tools/testeditor.exe












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    35


  checking encoding (ascii)...












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    36


  checking Python executable (*) (glob)












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    37


  checking Python version (*) (glob)












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    38


  checking Python lib (*lib*)... (glob)












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    39


  checking installed modules (*mercurial)... (glob)












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    40


  checking templates (*mercurial?templates)... (glob)












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    41


  checking commit editor...












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    42


  checking username...












be4915009b09
debuginstall: expand the editor path before searching for it (issue4380)



Matt Harbison <matt_harbison@yahoo.com>


parents: 
20741

diff
changeset




    43


  no problems detected














mercurial