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

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

largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.
Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default
r22285:85bded43 default
Show More
test-http-branchmap.t
96 lines | 2.9 KiB | text/troff | Tads3Lexer
/ tests / test-http-branchmap.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: replace exit 80 with #require
 r22046 #require killdaemons
Matt Mackall
tests: unify test-http-branchmap
 r12447
$ hgserve() {
Patrick Mezard
test-http-branchmap: enable on Windows...
 r17467 > hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid \
> -E errors.log -v $@ > startup.log
> # Grepping hg serve stdout would hang on Windows
> grep -v 'listening at' startup.log
Matt Mackall
tests: unify test-http-branchmap
 r12447 > cat hg.pid >> "$DAEMON_PIDS"
> }
$ hg init a
$ hg --encoding utf-8 -R a branch æ
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
 r12942 marked working directory as branch \xc3\xa6 (esc)
Matt Mackall
branch: warn on branching
 r15615 (branches are permanent and global, did you want a bookmark?)
Matt Mackall
tests: unify test-http-branchmap
 r12447 $ echo foo > a/foo
$ hg -R a ci -Am foo
adding foo
$ hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1
$ hg --encoding utf-8 clone http://localhost:$HGPORT1 b
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
 r12942 updating to branch \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
 r12447 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --encoding utf-8 -R b log
changeset: 0:867c11ce77b8
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
 r12942 branch: \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
 r12447 tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ echo bar >> b/foo
$ hg -R b ci -m bar
$ hg --encoding utf-8 -R b push
Brodie Rao
url: add trailing slashes to URLs with hostnames that don't have one...
 r13815 pushing to http://localhost:$HGPORT1/
Matt Mackall
tests: unify test-http-branchmap
 r12447 searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
$ hg -R a --encoding utf-8 log
changeset: 1:58e7c90d67cb
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
 r12942 branch: \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
 r12447 tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: bar
changeset: 0:867c11ce77b8
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
 r12942 branch: \xc3\xa6 (esc)
Matt Mackall
tests: unify test-http-branchmap
 r12447 user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
Patrick Mezard
test-http-branchmap: enable on Windows...
 r17467 $ "$TESTDIR/killdaemons.py" hg.pid
Matt Mackall
tests: unify test-http-branchmap
 r12447
verify 7e7d56fe4833 (encoding fallback in branchmap to maintain compatibility with 1.3.x)
$ cat <<EOF > oldhg
> import sys
> from mercurial import ui, hg, commands
>
> class StdoutWrapper(object):
> def __init__(self, stdout):
> self._file = stdout
>
> def write(self, data):
> if data == '47\n':
> # latin1 encoding is one %xx (3 bytes) shorter
> data = '44\n'
> elif data.startswith('%C3%A6 '):
> # translate to latin1 encoding
> data = '%%E6 %s' % data[7:]
> self._file.write(data)
>
> def __getattr__(self, name):
> return getattr(self._file, name)
>
> sys.stdout = StdoutWrapper(sys.stdout)
> sys.stderr = StdoutWrapper(sys.stderr)
>
> myui = ui.ui()
> repo = hg.repository(myui, 'a')
Idan Kamara
serve: add --cmdserver option to communicate with hg over a pipe
 r14647 > commands.serve(myui, repo, stdio=True, cmdserver=False)
Matt Mackall
tests: unify test-http-branchmap
 r12447 > EOF
$ echo baz >> b/foo
$ hg -R b ci -m baz
$ hg push -R b -e 'python oldhg' ssh://dummy/ --encoding latin1
pushing to ssh://dummy/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files