##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

File last commit:

r22046:7a9cbb31 default
r23524:a1a7c94d default
Show More
test-update-issue1456.t
45 lines | 858 B | text/troff | Tads3Lexer
/ tests / test-update-issue1456.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require execbit
Mads Kiilerich
tests: use 'hghave execbit' for tests that manipulate x bit in file system
r15442
Adrian Buehlmann
combine tests
r12279 $ rm -rf a
$ hg init a
$ cd a
$ echo foo > foo
$ hg ci -qAm0
Siddharth Agarwal
manifestmerge: handle workdir removed, remote removed with flags...
r18895 $ echo toremove > toremove
$ echo todelete > todelete
$ chmod +x foo toremove todelete
$ hg ci -qAm1
Test that local removed/deleted, remote removed works with flags
$ hg rm toremove
$ rm todelete
Adrian Buehlmann
combine tests
r12279 $ hg co -q 0
Siddharth Agarwal
manifestmerge: handle workdir removed, remote removed with flags...
r18895
Adrian Buehlmann
combine tests
r12279 $ echo dirty > foo
$ hg up -c
Siddharth Agarwal
update: standardize error message for dirty update --check...
r19801 abort: uncommitted changes
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
combine tests
r12279 $ hg up -q
$ cat foo
dirty
$ hg st -A
M foo
Siddharth Agarwal
manifestmerge: handle workdir removed, remote removed with flags...
r18895 C todelete
C toremove
Adrian Buehlmann
combine tests
r12279
Validate update of standalone execute bit change:
$ hg up -C 0
Siddharth Agarwal
manifestmerge: handle workdir removed, remote removed with flags...
r18895 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Adrian Buehlmann
combine tests
r12279 $ chmod -x foo
$ hg ci -m removeexec
nothing changed
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Adrian Buehlmann
combine tests
r12279 $ hg up -C 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up
Siddharth Agarwal
manifestmerge: handle workdir removed, remote removed with flags...
r18895 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
combine tests
r12279 $ hg st
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..