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

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

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.
Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default
r23524:a1a7c94d default
Show More
test-pull.t
92 lines | 2.3 KiB | text/troff | Tads3Lexer
/ tests / test-pull.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: replace exit 80 with #require
 r22046 #require serve
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
 r15446
Martin Geisler
tests: remove redundant mkdir...
 r13956 $ hg init test
Adrian Buehlmann
combine tests
 r12279 $ cd test
$ echo foo>foo
$ hg addremove
adding foo
$ hg commit -m 1
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
$ hg serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ cd ..
Matt Mackall
tests: drop a bunch of sed calls from unified tests
 r12366 $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
Adrian Buehlmann
combine tests
 r12279 requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd copy
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
$ hg co
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat foo
foo
$ hg manifest --debug
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
Matt Mackall
tests: drop a bunch of sed calls from unified tests
 r12366 $ hg pull
Augie Fackler
clone: don't save user's password in .hg/hgrc (Issue3122)
 r15552 pulling from http://foo@localhost:$HGPORT/
Adrian Buehlmann
combine tests
 r12279 searching for changes
no changes found
Matt Mackall
tests: drop a bunch of sed calls from unified tests
 r12366 $ hg rollback --dry-run --verbose
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
 r13446 repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
Adrian Buehlmann
combine tests
 r12279
Martin Geisler
tests: added a short description to issue numbers...
 r12399 Issue622: hg init && hg pull -u URL doesn't checkout default branch
Adrian Buehlmann
combine tests
 r12279
$ cd ..
$ hg init empty
$ cd empty
$ hg pull -u ../test
pulling from ../test
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test 'file:' uri handling:
timeless@mozdev.org
spelling: doesn't/does not
 r17486 $ hg pull -q file://../test-does-not-exist
Brodie Rao
hg: look up schemes using url.url
 r13823 abort: file:// URLs can only refer to localhost
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
combine tests
 r12279
Brodie Rao
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()...
 r13826 $ hg pull -q file://../test
abort: file:// URLs can only refer to localhost
[255]
Adrian Buehlmann
combine tests
 r12279 $ hg pull -q file:../test
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
 r12328 It's tricky to make file:// URLs working on every platform with
regular shell commands.
Adrian Buehlmann
combine tests
 r12279
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
 r22947 $ URL=`$PYTHON -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
Adrian Buehlmann
combine tests
 r12279 $ hg pull -q "$URL"
Brodie Rao
url: abort on file:// URLs with non-localhost hosts
 r13817 abort: file:// URLs can only refer to localhost
[255]
Adrian Buehlmann
combine tests
 r12279
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
 r22947 $ URL=`$PYTHON -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
Brodie Rao
url: abort on file:// URLs with non-localhost hosts
 r13817 $ hg pull -q "$URL"
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..