strip: introduce a soft strip option
This is the first user-accessible way to use the archived phase introduced in
4.8. This implements a feature discussed during the Stockholm sprint, using
the archived phase for hiding changesets.
The archived phase behaves exactly as stripping: changesets are no longer
visible, but pulling/unbundling them will make then reappear. The only notable
difference is that unlike hard stripping, soft stripping does not affect
obsmarkers.
The next changeset will make use of the archived phase for history rewriting
command. However, having a way to manually trigger the feature first seems a
necessary step before exposing users to this phase; there is a way to
un-archived changesets (unbundling), so there must be a way to archive them
again.
Adding a flag to strip is a good way to provide access to the feature without
taking a too big risk on the final UI we want. The flag is experimental so it
won't be exposed by default.
Using the archived phase is faster and less traumatic for the repository than
actually stripping changesets.
Test adding .hgeol
$ cat >> $HGRCPATH <<EOF
> [diff]
> git = 1
> EOF
$ seteol () {
> if [ $1 = "LF" ]; then
> EOL='\n'
> else
> EOL='\r\n'
> fi
> }
$ makerepo () {
> echo
> echo "# ==== setup repository ===="
> echo '% hg init'
> hg init repo
> cd repo
> printf "first\nsecond\nthird\n" > a.txt
> hg commit -d '100 0' --addremove -m 'LF commit'
> cd ..
> }
$ dotest () {
> seteol $1
> echo
> echo "% hg clone repo repo-$1"
> hg clone repo repo-$1
> cd repo-$1
> cat > .hg/hgrc <<EOF
> [extensions]
> eol =
> [eol]
> native = LF
> EOF
> cat > .hgeol <<EOF
> [patterns]
> **.txt = native
> [repository]
> native = $1
> EOF
> echo '% hg add .hgeol'
> hg add .hgeol
> echo '% hg status'
> hg status
> echo '% hg commit'
> hg commit -d '200 0' -m 'Added .hgeol file'
> echo '% hg status'
> hg status
> echo '% hg tip -p'
> hg tip -p
> cd ..
> rm -r repo-$1
> }
$ makerepo
# ==== setup repository ====
% hg init
adding a.txt
$ dotest LF
% hg clone repo repo-LF
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% hg add .hgeol
% hg status
A .hgeol
% hg commit
% hg status
% hg tip -p
changeset: 1:33503edb53b0
tag: tip
user: test
date: Thu Jan 01 00:03:20 1970 +0000
summary: Added .hgeol file
diff --git a/.hgeol b/.hgeol
new file mode 100644
--- /dev/null
+++ b/.hgeol
@@ -0,0 +1,4 @@
+[patterns]
+**.txt = native
+[repository]
+native = LF
$ dotest CRLF
% hg clone repo repo-CRLF
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% hg add .hgeol
% hg status
M a.txt
A .hgeol
% hg commit
% hg status
% hg tip -p
changeset: 1:6e64eaa9eb23
tag: tip
user: test
date: Thu Jan 01 00:03:20 1970 +0000
summary: Added .hgeol file
diff --git a/.hgeol b/.hgeol
new file mode 100644
--- /dev/null
+++ b/.hgeol
@@ -0,0 +1,4 @@
+[patterns]
+**.txt = native
+[repository]
+native = CRLF
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,3 @@
-first
-second
-third
+first\r (esc)
+second\r (esc)
+third\r (esc)
$ rm -r repo