Mercurial > hg
view tests/test-conflict.t @ 45565:c1d0f83d62c4
log: introduce struct that carries log traversal options
I tried to refactor logcmdutil.getrevs() without using an options struct,
but none of these attempts didn't work out. Since every stage of getrevs()
needs various log command options (e.g. both matcher and revset query need
file patterns), it isn't possible to cleanly split getrevs() into a command
layer and a core logic.
So, this patch introduces a named struct to carry command options in slightly
abstracted way, which will be later used by "hg grep" and "hg churn". More
fields will be added to the walkopt struct.
Type hints aren't verified. I couldn't figure out how to teach pytype to
load its own attr type stubs in place of our .thirdparty.attr. Conditional
import didn't work. s/^from \.thirdparty // is the only way I found pytype
could parse the @attr.ib decorator.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 12 Sep 2020 21:06:16 +0900 |
parents | aac921f54554 |
children | 40411ad2f5d2 |
line wrap: on
line source
$ hg init $ cat << EOF > a > Small Mathematical Series. > One > Two > Three > Four > Five > Hop we are done. > EOF $ hg add a $ hg commit -m ancestor $ cat << EOF > a > Small Mathematical Series. > 1 > 2 > 3 > 4 > 5 > Hop we are done. > EOF $ hg commit -m branch1 $ hg co 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat << EOF > a > Small Mathematical Series. > 1 > 2 > 3 > 6 > 8 > Hop we are done. > EOF $ hg commit -m branch2 created new head $ hg merge 1 merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ hg id 618808747361+c0c68e4fe667+ tip $ echo "[commands]" >> $HGRCPATH $ echo "status.verbose=true" >> $HGRCPATH $ hg status M a ? a.orig # The repository is in an unfinished *merge* state. # Unresolved merge conflicts: # # a # # To mark files as resolved: hg resolve --mark FILE # To continue: hg commit # To abort: hg merge --abort $ hg status -Tjson [ { "itemtype": "file", "path": "a", "status": "M", "unresolved": true }, { "itemtype": "file", "path": "a.orig", "status": "?" }, { "itemtype": "morestatus", "unfinished": "merge", "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort" } ] $ cat a Small Mathematical Series. 1 2 3 <<<<<<< working copy: 618808747361 - test: branch2 6 8 ======= 4 5 >>>>>>> merge rev: c0c68e4fe667 - test: branch1 Hop we are done. $ hg status --config commands.status.verbose=0 M a ? a.orig Verify custom conflict markers $ hg up -q --clean . $ cat <<EOF >> .hg/hgrc > [ui] > mergemarkertemplate = '{author} {rev}' > EOF $ hg merge 1 merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ cat a Small Mathematical Series. 1 2 3 <<<<<<< working copy: test 2 6 8 ======= 4 5 >>>>>>> merge rev: test 1 Hop we are done. Verify line splitting of custom conflict marker which causes multiple lines $ hg up -q --clean . $ cat >> .hg/hgrc <<EOF > [ui] > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz > EOF $ hg -q merge 1 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') [1] $ cat a Small Mathematical Series. 1 2 3 <<<<<<< working copy: test 2 6 8 ======= 4 5 >>>>>>> merge rev: test 1 Hop we are done. Verify line trimming of custom conflict marker using multi-byte characters $ hg up -q --clean . $ "$PYTHON" <<EOF > fp = open('logfile', 'wb') > fp.write(b'12345678901234567890123456789012345678901234567890' + > b'1234567890') # there are 5 more columns for 80 columns > > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) > > fp.close() > EOF $ hg add logfile $ hg --encoding utf-8 commit --logfile logfile $ cat >> .hg/hgrc <<EOF > [ui] > mergemarkertemplate={desc|firstline} > EOF $ hg -q --encoding utf-8 merge 1 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') [1] $ cat a Small Mathematical Series. 1 2 3 <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345... 6 8 ======= 4 5 >>>>>>> merge rev: branch1 Hop we are done. Verify basic conflict markers $ hg up -q --clean 2 $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc $ hg merge 1 merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ cat a Small Mathematical Series. 1 2 3 <<<<<<< working copy 6 8 ======= 4 5 >>>>>>> merge rev Hop we are done. internal:merge3 $ hg up -q --clean . $ hg merge 1 --tool internal:merge3 merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ cat a Small Mathematical Series. <<<<<<< working copy 1 2 3 6 8 ||||||| base One Two Three Four Five ======= 1 2 3 4 5 >>>>>>> merge rev Hop we are done. Add some unconflicting changes on each head, to make sure we really are merging, unlike :local and :other $ hg up -C 2 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????" 1 other heads for branch "default" $ printf "\n\nEnd of file\n" >> a $ hg ci -m "Add some stuff at the end" $ hg up -r 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ printf "Start of file\n\n\n" > tmp $ cat a >> tmp $ mv tmp a $ hg ci -m "Add some stuff at the beginning" Now test :merge-other and :merge-local $ hg merge merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ hg resolve --tool :merge-other a merging a (no more unresolved files) $ cat a Start of file Small Mathematical Series. 1 2 3 6 8 Hop we are done. End of file $ hg up -C 1 files updated, 0 files merged, 1 files removed, 0 files unresolved updated to "18b51d585961: Add some stuff at the beginning" 1 other heads for branch "default" $ hg merge --tool :merge-local merging a 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cat a Start of file Small Mathematical Series. 1 2 3 4 5 Hop we are done. End of file