Mercurial > hg
annotate tests/cgienv @ 22288:4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 24 Aug 2014 23:47:26 +0900 |
parents | aa3f726a2bdb |
children |
rev | line source |
---|---|
13269
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
1 DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
2 GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
3 HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
4 HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
5 HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
6 HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
7 HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
8 HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
9 HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
10 HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
11 HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
12 PATH_INFO="/"; export PATH_INFO |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
13 PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
14 QUERY_STRING=""; export QUERY_STRING |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
15 REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
16 REMOTE_PORT="44703"; export REMOTE_PORT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
17 REQUEST_METHOD="GET"; export REQUEST_METHOD |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
18 REQUEST_URI="/test/"; export REQUEST_URI |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
19 SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
20 SCRIPT_NAME="/test"; export SCRIPT_NAME |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
21 SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
22 SCRIPT_URL="/test/"; export SCRIPT_URL |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
23 SERVER_ADDR="127.0.0.1"; export SERVER_ADDR |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
24 SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
25 SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
26 SERVER_PORT="80"; export SERVER_PORT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
27 SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
28 SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
29 SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE |