##// END OF EJS Templates
sslutil: store and use hostname and ui in socket instance...
sslutil: store and use hostname and ui in socket instance Currently, we pass a hostname and ui to sslutil.wrap_socket() then create a separate sslutil.validator instance also from a hostname and ui. There is a 1:1 mapping between a wrapped socket and a validator instance. This commit lays the groundwork for making the validation function generic by storing the hostname and ui instance in the state dict attached to the socket instance and then using these variables in the validator function. Since the arguments to sslutil.validator.__init__ are no longer used, we make them optional and make __init__ a no-op.

File last commit:

r27599:ad5966de default
r29226:33006bd6 default
Show More
test-merge-remove.t
115 lines | 2.2 KiB | text/troff | Tads3Lexer
/ tests / test-merge-remove.t
Adrian Buehlmann
tests: unify test-merge-remove
r12260 $ hg init
$ echo foo > foo
$ echo bar > bar
$ hg ci -qAm 'add foo bar'
$ echo foo2 >> foo
$ echo bleh > bar
$ hg ci -m 'change foo bar'
$ hg up -qC 0
$ hg mv foo foo1
$ echo foo1 > foo1
$ hg cat foo >> foo1
$ hg ci -m 'mv foo foo1'
created new head
$ hg merge
merging foo1 and foo to foo1
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg debugstate --nodates
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 m 0 -2 unset bar
m 0 -2 unset foo1
Adrian Buehlmann
tests: unify test-merge-remove
r12260 copy: foo -> foo1
$ hg st -q
M bar
M foo1
Removing foo1 and bar:
$ cp foo1 F
$ cp bar B
$ hg rm -f foo1 bar
$ hg debugstate --nodates
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 r 0 -1 set bar
r 0 -1 set foo1
Adrian Buehlmann
tests: unify test-merge-remove
r12260 copy: foo -> foo1
$ hg st -qC
R bar
R foo1
Re-adding foo1 and bar:
$ cp F foo1
$ cp B bar
$ hg add -v foo1 bar
adding bar
adding foo1
$ hg debugstate --nodates
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 n 0 -2 unset bar
n 0 -2 unset foo1
Adrian Buehlmann
tests: unify test-merge-remove
r12260 copy: foo -> foo1
$ hg st -qC
M bar
M foo1
foo
Reverting foo1 and bar:
$ hg revert -vr . foo1 bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
$ hg debugstate --nodates
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 n 0 -2 unset bar
n 0 -2 unset foo1
Adrian Buehlmann
tests: unify test-merge-remove
r12260 copy: foo -> foo1
$ hg st -qC
M bar
M foo1
foo
$ hg diff
Mads Kiilerich
merge: don't overwrite file untracked after remove, abort with 'untracked files'...
r20415 Merge should not overwrite local file that is untracked after remove
$ rm *
$ hg up -qC
$ hg rm bar
$ hg ci -m 'remove bar'
$ echo 'memories of buried pirate treasure' > bar
$ hg merge
bar: untracked file differs
abort: untracked files in working directory differ from files in requested revision
[255]
$ cat bar
memories of buried pirate treasure
Those who use force will lose
$ hg merge -f
remote changed bar which local deleted
Siddharth Agarwal
filemerge: default change/delete conflicts to 'leave unresolved' (BC)...
r27599 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
Mads Kiilerich
merge: don't overwrite file untracked after remove, abort with 'untracked files'...
r20415 merging foo1 and foo to foo1
Siddharth Agarwal
filemerge: default change/delete conflicts to 'leave unresolved' (BC)...
r27599 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
Mads Kiilerich
merge: don't overwrite file untracked after remove, abort with 'untracked files'...
r20415 $ cat bar
bleh
$ hg st
M bar
M foo1