##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472
Sushil khanchi - - Load All Authors

File last commit:

r39442:cb70501d default
r39595:07b58266 default
Show More
test-merge-remove.t
116 lines | 2.3 KiB | text/troff | Tads3Lexer
/ tests / test-merge-remove.t
History | Source | Raw |Copy content |Copy permalink
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
Sushil khanchi
revert: fix the inconsistency of status msgs in --interactive mode...
 r39442 saving current version of foo1 as foo1.orig
Adrian Buehlmann
tests: unify test-merge-remove
 r12260 reverting bar
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
Pulkit Goyal
filemerge: fix the wrong placements of messages in prompt...
 r39321 file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
Augie Fackler
merge: improve interactive one-changed one-deleted message (issue5550)...
 r39313 What do you want to do?
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
Pulkit Goyal
merge: add `--abort` flag which can abort the merge...
 r35722 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
Siddharth Agarwal
filemerge: default change/delete conflicts to 'leave unresolved' (BC)...
 r27599 [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